[josm] 01/07: Imported Upstream version 0.0.svn10161+dfsg
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Apr 29 20:43:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 213bf80997f55d0114c8b09972171f135ce2f88c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Apr 29 21:31:53 2016 +0200
Imported Upstream version 0.0.svn10161+dfsg
---
.classpath | 3 +-
REVISION | 10 +-
build.xml | 5 +-
data/defaultpresets.xml | 116 +-
data/security/DST_Root_CA_X3.pem | 20 +
data/security/StartCom_Certification_Authority.pem | 44 +
data/validator/addresses.mapcss | 14 +-
data/validator/combinations.mapcss | 6 +-
data/validator/deprecated.mapcss | 35 +
data/validator/geometry.mapcss | 31 +-
data/validator/ignoretags.cfg | 12 +-
.../projection-regression-test-data-java9 | 18950 -----------------
data_nodist/trans/ast.lang | Bin 8727 -> 8985 bytes
data_nodist/trans/be.lang | Bin 15876 -> 17233 bytes
data_nodist/trans/bg.lang | Bin 2401 -> 2409 bytes
data_nodist/trans/ca-valencia.lang | Bin 7811 -> 7819 bytes
data_nodist/trans/ca.lang | Bin 10330 -> 10610 bytes
data_nodist/trans/cs.lang | Bin 10150 -> 10579 bytes
data_nodist/trans/da.lang | Bin 9384 -> 9889 bytes
data_nodist/trans/de.lang | Bin 10469 -> 11011 bytes
data_nodist/trans/el.lang | Bin 1403 -> 1411 bytes
data_nodist/trans/en.lang | Bin 8672 -> 9069 bytes
data_nodist/trans/en_AU.lang | Bin 1488 -> 1496 bytes
data_nodist/trans/en_GB.lang | Bin 1954 -> 2128 bytes
data_nodist/trans/es.lang | Bin 11288 -> 11696 bytes
data_nodist/trans/et.lang | Bin 1436 -> 1444 bytes
data_nodist/trans/fi.lang | Bin 3074 -> 3082 bytes
data_nodist/trans/fr.lang | Bin 10586 -> 10961 bytes
data_nodist/trans/gl.lang | Bin 2951 -> 2959 bytes
data_nodist/trans/hu.lang | Bin 10819 -> 11195 bytes
data_nodist/trans/id.lang | Bin 6723 -> 6731 bytes
data_nodist/trans/it.lang | Bin 9875 -> 10154 bytes
data_nodist/trans/ja.lang | Bin 11391 -> 11831 bytes
data_nodist/trans/km.lang | Bin 16178 -> 16921 bytes
data_nodist/trans/lt.lang | Bin 1952 -> 2074 bytes
data_nodist/trans/nb.lang | Bin 1679 -> 1687 bytes
data_nodist/trans/nl.lang | Bin 10987 -> 11587 bytes
data_nodist/trans/pl.lang | Bin 2781 -> 2789 bytes
data_nodist/trans/pt.lang | Bin 13220 -> 13343 bytes
data_nodist/trans/pt_BR.lang | Bin 9740 -> 10058 bytes
data_nodist/trans/ru.lang | Bin 16502 -> 17259 bytes
data_nodist/trans/sk.lang | Bin 9452 -> 9906 bytes
data_nodist/trans/sv.lang | Bin 1340 -> 1348 bytes
data_nodist/trans/uk.lang | Bin 16801 -> 17662 bytes
data_nodist/trans/vi.lang | Bin 10530 -> 10845 bytes
data_nodist/trans/zh_CN.lang | Bin 5854 -> 6037 bytes
data_nodist/trans/zh_TW.lang | Bin 4647 -> 4655 bytes
geticons.pl | 22 +-
i18n/po/af.po | 622 +-
i18n/po/am.po | 622 +-
i18n/po/ar.po | 628 +-
i18n/po/ast.po | 703 +-
i18n/po/az.po | 622 +-
i18n/po/be.po | 3160 +--
i18n/po/bg.po | 689 +-
i18n/po/bn.po | 624 +-
i18n/po/br.po | 624 +-
i18n/po/bs.po | 622 +-
i18n/po/ca.po | 755 +-
i18n/po/ca at valencia.po | 677 +-
i18n/po/cs.po | 732 +-
i18n/po/cy.po | 622 +-
i18n/po/da.po | 736 +-
i18n/po/de.po | 1233 +-
i18n/po/de_DE.po | 624 +-
i18n/po/el.po | 689 +-
i18n/po/en_AU.po | 670 +-
i18n/po/en_CA.po | 622 +-
i18n/po/en_GB.po | 1081 +-
i18n/po/eo.po | 624 +-
i18n/po/es.po | 727 +-
i18n/po/et.po | 690 +-
i18n/po/eu.po | 628 +-
i18n/po/fa.po | 622 +-
i18n/po/fi.po | 665 +-
i18n/po/fil.po | 622 +-
i18n/po/fo.po | 622 +-
i18n/po/fr.po | 717 +-
i18n/po/ga.po | 622 +-
i18n/po/gl.po | 680 +-
i18n/po/he.po | 628 +-
i18n/po/hi.po | 622 +-
i18n/po/hr.po | 627 +-
i18n/po/ht.po | 622 +-
i18n/po/hu.po | 1262 +-
i18n/po/hy.po | 624 +-
i18n/po/ia.po | 622 +-
i18n/po/id.po | 665 +-
i18n/po/is.po | 626 +-
i18n/po/it.po | 893 +-
i18n/po/ja.po | 778 +-
i18n/po/ka.po | 624 +-
i18n/po/km.po | 683 +-
i18n/po/ko.po | 626 +-
i18n/po/ky.po | 622 +-
i18n/po/{wae.po => lb.po} | 640 +-
i18n/po/lo.po | 624 +-
i18n/po/lt.po | 1104 +-
i18n/po/lv.po | 624 +-
i18n/po/mk.po | 624 +-
i18n/po/mr.po | 625 +-
i18n/po/ms.po | 624 +-
i18n/po/nb.po | 628 +-
i18n/po/nds.po | 622 +-
i18n/po/nl.po | 793 +-
i18n/po/nn.po | 622 +-
i18n/po/oc.po | 624 +-
i18n/po/pa.po | 622 +-
i18n/po/pl.po | 754 +-
i18n/po/pt.po | 791 +-
i18n/po/pt_BR.po | 720 +-
i18n/po/rm.po | 622 +-
i18n/po/ro.po | 624 +-
i18n/po/ru.po | 787 +-
i18n/po/sk.po | 730 +-
i18n/po/sl.po | 626 +-
i18n/po/sq.po | 624 +-
i18n/po/sr.po | 622 +-
i18n/po/sv.po | 689 +-
i18n/po/ta.po | 626 +-
i18n/po/te.po | 622 +-
i18n/po/th.po | 622 +-
i18n/po/tr.po | 628 +-
i18n/po/ug.po | 622 +-
i18n/po/uk.po | 730 +-
i18n/po/ur.po | 622 +-
i18n/po/vi.po | 700 +-
i18n/po/wae.po | 622 +-
i18n/po/zh_CN.po | 703 +-
i18n/po/zh_TW.po | 1113 +-
images/dialogs/layerlist/colorfulness.png | Bin 0 -> 1318 bytes
images/dialogs/layerlist/gamma.png | Bin 489 -> 1282 bytes
images/dialogs/layerlist/sharpness.png | Bin 0 -> 1247 bytes
images/dialogs/layerlist/transparency.png | Bin 337 -> 1371 bytes
images/dialogs/layerlist/visibility.png | Bin 0 -> 880 bytes
images/dialogs/mappaint/josm_small.png | Bin 808 -> 0 bytes
images/misc/showhide.png | Bin 693 -> 0 bytes
images/presets/bicycle_road.svg | 121 -
images/presets/level_crossing.png | Bin 442 -> 0 bytes
.../icons/hicolor/128x128/apps/josm-latest.png | Bin 0 -> 18674 bytes
.../icons/hicolor/192x192/apps/josm-latest.png | Bin 0 -> 31922 bytes
.../share/icons/hicolor/22x22/apps/josm-latest.png | Bin 0 -> 1693 bytes
.../share/icons/hicolor/24x24/apps/josm-latest.png | Bin 0 -> 1886 bytes
.../icons/hicolor/256x256/apps/josm-latest.png | Bin 0 -> 46400 bytes
.../share/icons/hicolor/36x36/apps/josm-latest.png | Bin 0 -> 3293 bytes
.../share/icons/hicolor/40x40/apps/josm-latest.png | Bin 0 -> 3779 bytes
.../share/icons/hicolor/42x42/apps/josm-latest.png | Bin 0 -> 4140 bytes
.../icons/hicolor/512x512/apps/josm-latest.png | Bin 0 -> 92544 bytes
.../share/icons/hicolor/64x64/apps/josm-latest.png | Bin 0 -> 7221 bytes
.../share/icons/hicolor/72x72/apps/josm-latest.png | Bin 0 -> 8436 bytes
.../share/icons/hicolor/80x80/apps/josm-latest.png | Bin 0 -> 9884 bytes
.../share/icons/hicolor/8x8/apps/josm-latest.png | Bin 0 -> 614 bytes
.../share/icons/hicolor/96x96/apps/josm-latest.png | Bin 0 -> 12503 bytes
.../usr/share/icons/hicolor/128x128/apps/josm.png | Bin 0 -> 18674 bytes
.../usr/share/icons/hicolor/192x192/apps/josm.png | Bin 0 -> 31922 bytes
.../usr/share/icons/hicolor/22x22/apps/josm.png | Bin 0 -> 1693 bytes
.../usr/share/icons/hicolor/24x24/apps/josm.png | Bin 0 -> 1886 bytes
.../usr/share/icons/hicolor/256x256/apps/josm.png | Bin 0 -> 46400 bytes
.../usr/share/icons/hicolor/36x36/apps/josm.png | Bin 0 -> 3293 bytes
.../usr/share/icons/hicolor/40x40/apps/josm.png | Bin 0 -> 3779 bytes
.../usr/share/icons/hicolor/42x42/apps/josm.png | Bin 0 -> 4140 bytes
.../usr/share/icons/hicolor/512x512/apps/josm.png | Bin 0 -> 92544 bytes
.../usr/share/icons/hicolor/64x64/apps/josm.png | Bin 0 -> 7221 bytes
.../usr/share/icons/hicolor/72x72/apps/josm.png | Bin 0 -> 8436 bytes
.../usr/share/icons/hicolor/80x80/apps/josm.png | Bin 0 -> 9884 bytes
.../usr/share/icons/hicolor/8x8/apps/josm.png | Bin 0 -> 614 bytes
.../usr/share/icons/hicolor/96x96/apps/josm.png | Bin 0 -> 12503 bytes
scripts/SyncEditorImageryIndex.groovy | 21 +-
.../commons/jcs/access/PartitionedCacheAccess.java | 15 +-
.../disk/jdbc/hsql/HSQLDiskCacheFactory.java | 2 -
.../lateral/socket/tcp/LateralTCPSender.java | 27 +-
.../remote/AbstractRemoteCacheListener.java | 51 +-
.../remote/AbstractRemoteCacheNoWaitFacade.java | 200 +-
.../commons/jcs/auxiliary/remote/RemoteCache.java | 4 +-
.../auxiliary/remote/RemoteCacheAttributes.java | 14 +-
.../jcs/auxiliary/remote/RemoteCacheFactory.java | 31 +-
.../remote/RemoteCacheFailoverRunner.java | 263 +-
.../jcs/auxiliary/remote/RemoteCacheListener.java | 13 +-
.../jcs/auxiliary/remote/RemoteCacheManager.java | 2 +-
.../auxiliary/remote/RemoteCacheNoWaitFacade.java | 20 +-
.../remote/behavior/IRemoteCacheAttributes.java | 8 +-
.../remote/http/client/RemoteHttpCacheFactory.java | 11 +-
.../remote/http/client/RemoteHttpCacheManager.java | 8 +-
.../http/client/RemoteHttpClientListener.java | 13 +-
.../http/server/AbstractRemoteCacheService.java | 16 +-
.../http/server/RemoteCacheServiceAdaptor.java | 172 -
.../remote/http/server/RemoteHttpCacheService.java | 11 +-
.../remote/http/server/RemoteHttpCacheServlet.java | 226 +-
.../http/server/RemoteHttpCacheSeviceFactory.java | 91 -
.../remote/util/RemoteCacheRequestFactory.java | 118 +-
.../jcs/engine/memory/fifo/FIFOMemoryCache.java | 7 +-
.../apache/commons/jcs/utils/access/JCSWorker.java | 3 +-
src/org/openstreetmap/josm/Main.java | 19 +-
.../openstreetmap/josm/actions/AboutAction.java | 20 +-
.../josm/actions/AbstractMergeAction.java | 42 +-
.../josm/actions/AutoScaleAction.java | 6 +-
.../josm/actions/CombineWayAction.java | 16 -
.../josm/actions/CopyCoordinatesAction.java | 2 +-
.../josm/actions/CreateCircleAction.java | 2 +-
.../josm/actions/CreateMultipolygonAction.java | 6 +
.../josm/actions/DialogsToggleAction.java | 9 -
.../josm/actions/DownloadAlongAction.java | 13 +-
.../josm/actions/ImageryAdjustAction.java | 20 +-
.../josm/actions/JoinAreasAction.java | 20 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 20 +-
.../josm/actions/OrthogonalizeAction.java | 40 +-
.../josm/actions/OverpassDownloadAction.java | 12 +-
.../josm/actions/ReportBugAction.java | 35 +-
.../openstreetmap/josm/actions/SaveActionBase.java | 4 +-
.../actions/SelectNonBranchingWaySequences.java | 5 +-
.../josm/actions/ShowStatusReportAction.java | 127 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 73 +-
.../josm/actions/UnJoinNodeWayAction.java | 2 +-
.../josm/actions/UpdateDataAction.java | 15 +-
.../josm/actions/UpdateModifiedAction.java | 4 +-
.../AbstractChangesetDownloadTask.java | 146 +
.../downloadtasks/AbstractDownloadTask.java | 35 +-
.../ChangesetContentDownloadTask.java | 159 +
.../ChangesetHeaderDownloadTask.java | 225 +-
.../actions/downloadtasks/ChangesetQueryTask.java | 139 +
.../actions/downloadtasks/DownloadNotesTask.java | 13 +-
.../DownloadOsmChangeCompressedTask.java | 6 +-
.../downloadtasks/DownloadOsmChangeTask.java | 5 +-
.../downloadtasks/DownloadOsmCompressedTask.java | 6 +-
.../actions/downloadtasks/DownloadTaskList.java | 13 +-
.../josm/actions/mapmode/AddNoteAction.java | 1 +
.../josm/actions/mapmode/DrawAction.java | 30 +-
.../josm/actions/mapmode/ExtrudeAction.java | 22 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 33 +-
.../josm/actions/mapmode/ParallelWayAction.java | 3 +-
.../josm/actions/mapmode/ParallelWays.java | 24 +-
.../josm/actions/mapmode/SelectAction.java | 3 +-
.../openstreetmap/josm/actions/package-info.java | 7 +
.../actions/relation/AddSelectionToRelations.java | 4 +-
.../actions/relation/RecentRelationsAction.java | 2 +-
.../josm/actions/search/SearchAction.java | 30 +-
.../josm/actions/search/SearchCompiler.java | 6 +-
.../josm/actions/upload/UploadNotesTask.java | 8 +-
.../openstreetmap/josm/command/DeleteCommand.java | 4 +-
.../openstreetmap/josm/command/PurgeCommand.java | 1 +
.../openstreetmap/josm/command/SelectCommand.java | 1 +
.../openstreetmap/josm/command/package-info.java | 7 +
.../openstreetmap/josm/corrector/Correction.java | 6 -
.../josm/corrector/ReverseWayTagCorrector.java | 2 +
.../josm/corrector/RoleCorrection.java | 21 -
.../josm/corrector/RoleCorrectionTable.java | 13 -
.../josm/corrector/TagCorrection.java | 30 -
.../josm/corrector/TagCorrectionTable.java | 13 -
.../openstreetmap/josm/corrector/TagCorrector.java | 4 +
src/org/openstreetmap/josm/data/AutosaveTask.java | 2 +-
.../josm/data/CustomConfigurator.java | 4 -
src/org/openstreetmap/josm/data/Preferences.java | 32 +-
.../josm/data/cache/ICachedLoaderJob.java | 7 +-
.../josm/data/cache/ICachedLoaderListener.java | 4 +
.../josm/data/cache/JCSCachedTileLoaderJob.java | 3 +-
.../openstreetmap/josm/data/coor/Coordinate.java | 10 -
src/org/openstreetmap/josm/data/coor/LatLon.java | 37 +-
.../openstreetmap/josm/data/coor/QuadTiling.java | 25 +-
.../josm/data/correction/Correction.java | 10 +
.../josm/data/correction/RoleCorrection.java | 35 +
.../josm/data/correction/TagCorrection.java | 49 +
.../josm/data/correction/package-info.java | 6 +
.../openstreetmap/josm/data/gpx/Extensions.java | 9 +-
src/org/openstreetmap/josm/data/gpx/GpxData.java | 86 +-
.../josm/data/imagery/ImageryInfo.java | 2 +-
.../josm/data/imagery/ImageryLayerInfo.java | 4 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 15 +-
.../josm/data/imagery/WMTSTileSource.java | 8 +-
src/org/openstreetmap/josm/data/notes/Note.java | 42 +-
.../openstreetmap/josm/data/notes/NoteComment.java | 20 +-
.../josm/data/notes/package-info.java | 6 +
src/org/openstreetmap/josm/data/osm/BBox.java | 22 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 5 +-
src/org/openstreetmap/josm/data/osm/Filter.java | 71 +-
src/org/openstreetmap/josm/data/osm/Node.java | 1 +
src/org/openstreetmap/josm/data/osm/NoteData.java | 24 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 110 +-
.../openstreetmap/josm/data/osm/PrimitiveData.java | 25 +-
.../openstreetmap/josm/data/osm/QuadBuckets.java | 46 +-
src/org/openstreetmap/josm/data/osm/Storage.java | 21 +-
.../josm/data/osm/event/DatasetEventManager.java | 4 +-
.../josm/data/osm/event/SelectionEventManager.java | 3 +-
.../josm/data/osm/history/HistoryOsmPrimitive.java | 8 +
.../osm/visitor/MergeSourceBuildingVisitor.java | 18 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 2 +-
.../visitor/paint/relations/MultipolygonCache.java | 2 +-
src/org/openstreetmap/josm/data/package-info.java | 6 +
.../josm/data/preferences/LongProperty.java | 35 +
.../josm/data/projection/AbstractProjection.java | 4 +-
.../josm/data/projection/CustomProjection.java | 42 +-
.../josm/data/projection/Ellipsoid.java | 9 +-
.../ProjectionConfigurationException.java | 7 -
.../josm/data/projection/datum/NTV2GridShift.java | 17 -
.../data/projection/datum/NTV2GridShiftFile.java | 23 +-
.../josm/data/projection/datum/NTV2SubGrid.java | 28 +-
.../josm/data/projection/datum/NTV2Util.java | 17 -
.../josm/data/projection/package-info.java | 6 +
.../josm/data/projection/proj/AbstractProj.java | 24 +-
.../josm/data/projection/proj/AlbersEqualArea.java | 23 +-
.../data/projection/proj/DoubleStereographic.java | 27 +-
.../projection/proj/LambertAzimuthalEqualArea.java | 3 +-
.../projection/proj/LambertConformalConic.java | 48 +-
.../josm/data/projection/proj/LonLat.java | 4 +-
.../josm/data/projection/proj/ObliqueMercator.java | 27 +-
.../data/projection/proj/PolarStereographic.java | 13 +-
.../josm/data/projection/proj/Proj.java | 6 +-
.../data/projection/proj/SwissObliqueMercator.java | 8 +-
.../josm/data/validation/OsmValidator.java | 2 +
.../josm/data/validation/PaintVisitor.java | 30 +-
.../openstreetmap/josm/data/validation/Test.java | 12 +-
.../josm/data/validation/TestError.java | 28 +-
.../josm/data/validation/package-info.java | 6 +
.../data/validation/routines/DomainValidator.java | 46 +-
.../data/validation/routines/EmailValidator.java | 11 -
.../data/validation/routines/UrlValidator.java | 8 -
.../josm/data/validation/tests/LongSegment.java | 3 +
.../data/validation/tests/MultipolygonTest.java | 2 +-
.../data/validation/tests/OpeningHourTest.java | 2 +-
.../data/validation/tests/OverlappingWays.java | 6 +-
.../validation/tests/PublicTransportRouteTest.java | 17 +-
.../data/validation/tests/RelationChecker.java | 4 +-
.../data/validation/tests/SimilarNamedWays.java | 10 +-
.../josm/data/validation/tests/TagChecker.java | 5 +-
.../data/validation/tests/UnconnectedWays.java | 6 +-
.../josm/data/validation/tests/UntaggedNode.java | 4 +-
.../josm/data/validation/util/Entities.java | 11 +-
.../data/validation/util/MultipleNameVisitor.java | 3 +
.../josm/data/validation/util/NameVisitor.java | 15 +-
.../josm/gui/DefaultNameFormatter.java | 12 +-
.../josm/gui/ExceptionDialogUtil.java | 2 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 18 +-
src/org/openstreetmap/josm/gui/FileDrop.java | 48 +-
.../josm/gui/HelpAwareOptionPane.java | 21 +-
.../openstreetmap/josm/gui/MainApplication.java | 56 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 17 +-
src/org/openstreetmap/josm/gui/MapMover.java | 11 +-
src/org/openstreetmap/josm/gui/MapScaler.java | 93 +-
src/org/openstreetmap/josm/gui/MapSlider.java | 6 +-
src/org/openstreetmap/josm/gui/MapView.java | 168 +-
.../josm/gui/NavigatableComponent.java | 40 +-
.../josm/gui/NotificationManager.java | 10 +-
.../openstreetmap/josm/gui/PleaseWaitDialog.java | 4 +-
.../openstreetmap/josm/gui/PleaseWaitRunnable.java | 2 +-
.../openstreetmap/josm/gui/SelectionManager.java | 11 +-
src/org/openstreetmap/josm/gui/SplashScreen.java | 15 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 12 +-
.../josm/gui/bbox/SlippyMapControler.java | 4 +-
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 23 +-
.../josm/gui/conflict/ConflictColors.java | 35 +
.../josm/gui/conflict/pair/ListMerger.java | 12 +-
.../gui/conflict/pair/nodes/NodeListMerger.java | 3 +-
.../conflict/pair/properties/PropertiesMerger.java | 3 +-
.../pair/relation/RelationMemberMerger.java | 3 +-
.../tags/CombinePrimitiveResolverDialog.java | 2 +-
.../tags/PasteTagsConflictResolverDialog.java | 4 +-
.../correction}/CorrectionTable.java | 34 +-
.../correction}/CorrectionTableModel.java | 40 +-
.../josm/gui/correction/RoleCorrectionTable.java | 21 +
.../correction}/RoleCorrectionTableModel.java | 21 +-
.../josm/gui/correction/TagCorrectionTable.java | 21 +
.../correction}/TagCorrectionTableModel.java | 21 +-
.../josm/gui/correction/package-info.java | 6 +
.../josm/gui/dialogs/ChangesetDialog.java | 31 +-
.../josm/gui/dialogs/ConflictResolutionDialog.java | 3 +-
.../DeleteFromRelationConfirmationDialog.java | 4 +-
.../josm/gui/dialogs/DialogsPanel.java | 54 +-
.../josm/gui/dialogs/FilterDialog.java | 36 +-
.../josm/gui/dialogs/LayerListDialog.java | 767 +-
.../josm/gui/dialogs/MapPaintDialog.java | 6 +-
.../josm/gui/dialogs/NotesDialog.java | 6 +-
.../josm/gui/dialogs/OsmIdSelectionDialog.java | 4 +-
.../josm/gui/dialogs/ToggleDialog.java | 5 +-
.../dialogs/changeset/ChangesetCacheManager.java | 27 +-
.../changeset/ChangesetContentDownloadTask.java | 220 -
.../dialogs/changeset/ChangesetContentPanel.java | 3 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 17 +-
.../changeset/ChangesetDiscussionPanel.java | 16 +-
.../dialogs/changeset/ChangesetDownloadTask.java | 14 -
.../changeset/DownloadChangesetContentAction.java | 1 +
.../changeset/SingleChangesetDownloadPanel.java | 1 +
.../query/AdvancedChangesetQueryPanel.java | 31 +-
.../changeset/query/ChangesetQueryTask.java | 212 -
.../gui/dialogs/layer/ActivateLayerAction.java | 139 +
.../josm/gui/dialogs/layer/DeleteLayerAction.java | 76 +
.../josm/gui/dialogs/layer/DuplicateAction.java | 96 +
.../gui/dialogs/layer/IEnabledStateUpdating.java | 13 +
.../gui/dialogs/layer/LayerVisibilityAction.java | 437 +
.../josm/gui/dialogs/layer/MergeAction.java | 124 +
.../josm/gui/dialogs/layer/MoveDownAction.java | 40 +
.../josm/gui/dialogs/layer/MoveUpAction.java | 40 +
.../gui/dialogs/layer/ShowHideLayerAction.java | 111 +
.../josm/gui/dialogs/layer/package-info.java | 6 +
.../dialogs/properties/PropertiesCellRenderer.java | 2 +-
.../gui/dialogs/properties/PropertiesDialog.java | 15 +-
.../dialogs/properties/RecentTagCollection.java | 4 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 8 +-
.../dialogs/relation/GenericRelationEditor.java | 457 +-
.../josm/gui/dialogs/relation/IRelationEditor.java | 8 +
.../josm/gui/dialogs/relation/MemberTable.java | 13 +-
.../dialogs/relation/MemberTableCellRenderer.java | 7 -
.../relation/MemberTableMemberCellRenderer.java | 1 +
.../gui/dialogs/relation/MemberTableModel.java | 20 +-
.../dialogs/relation/MemberTransferHandler.java | 2 +-
.../relation/ParentRelationLoadingTask.java | 8 +-
.../josm/gui/dialogs/relation/RelationEditor.java | 12 +-
.../josm/gui/dialogs/relation/RunnableAction.java | 17 -
.../josm/gui/dialogs/relation/SelectionTable.java | 33 +-
.../relation/SelectionTableCellRenderer.java | 62 +-
.../relation/SelectionTableColumnModel.java | 18 +-
.../gui/dialogs/relation/SelectionTableModel.java | 9 +-
.../gui/dialogs/relation/actions/ApplyAction.java | 3 +-
.../DownloadSelectedIncompleteMembersAction.java | 4 +-
.../dialogs/relation/actions/ReverseAction.java | 1 -
.../gui/dialogs/relation/sort/RelationNodeMap.java | 2 +-
.../relation/sort/WayConnectionTypeCalculator.java | 32 +-
.../josm/gui/download/DownloadDialog.java | 3 +-
.../josm/gui/help/HelpContentReader.java | 10 +-
.../josm/gui/help/HelpContentReaderException.java | 37 +-
src/org/openstreetmap/josm/gui/help/Helpful.java | 9 +
.../josm/gui/help/MissingHelpContentException.java | 18 +-
.../josm/gui/history/CoordinateInfoViewer.java | 41 +-
.../josm/gui/history/HistoryBrowserDialog.java | 4 +-
.../gui/history/HistoryBrowserDialogManager.java | 2 +-
.../josm/gui/history/HistoryBrowserModel.java | 31 +-
.../josm/gui/history/HistoryLoadTask.java | 107 +-
.../gui/history/NodeListTableCellRenderer.java | 4 +-
.../RelationMemberListTableCellRenderer.java | 6 +-
.../josm/gui/history/VersionTable.java | 5 +
.../josm/gui/history/VersionTableColumnModel.java | 15 +-
.../openstreetmap/josm/gui/io/AbstractIOTask.java | 6 -
.../josm/gui/io/AbstractPrimitiveTask.java | 196 +
.../josm/gui/io/CloseChangesetDialog.java | 4 +-
.../josm/gui/io/DownloadOpenChangesetsTask.java | 3 +-
.../josm/gui/io/DownloadPrimitivesTask.java | 140 +-
.../josm/gui/io/LayerNameAndFilePathTableCell.java | 1 +
.../josm/gui/io/SaveLayersDialog.java | 2 +-
.../josm/gui/io/UpdatePrimitivesTask.java | 109 +-
.../josm/gui/io/UploadAndSaveProgressRenderer.java | 30 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 20 +-
.../josm/gui/io/UploadParameterSummaryPanel.java | 1 +
.../josm/gui/io/UploadPrimitivesTask.java | 4 +-
.../josm/gui/io/UploadSelectionDialog.java | 4 +-
.../josm/gui/layer/AbstractMapViewPaintable.java | 43 +
.../josm/gui/layer/AbstractTileSourceLayer.java | 36 +-
.../josm/gui/layer/AlignImageryPanel.java | 2 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 9 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 382 +-
src/org/openstreetmap/josm/gui/layer/Layer.java | 34 +-
.../josm/gui/layer/LayerPositionStrategy.java | 113 +
.../josm/gui/layer/MapViewPaintable.java | 52 +
.../openstreetmap/josm/gui/layer/NoteLayer.java | 4 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 10 +-
.../josm/gui/layer/ValidatorLayer.java | 5 +
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 3 -
.../openstreetmap/josm/gui/layer/WMTSLayer.java | 7 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 8 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 13 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 32 +-
.../gui/layer/gpx/DownloadAlongTrackAction.java | 16 +-
.../gui/layer/gpx/DownloadWmsAlongTrackAction.java | 30 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 15 +-
.../openstreetmap/josm/gui/mappaint/Cascade.java | 5 +-
.../josm/gui/mappaint/DividedScale.java | 6 +-
.../josm/gui/mappaint/StyleCache.java | 16 +-
.../josm/gui/mappaint/mapcss/CSSColors.java | 5 +-
.../josm/gui/mappaint/mapcss/Condition.java | 46 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 120 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 2 +-
.../josm/gui/mappaint/mapcss/Selector.java | 8 +-
.../gui/mappaint/styleelement/LineElement.java | 22 +-
.../gui/mappaint/styleelement/NodeElement.java | 20 +-
.../gui/mappaint/styleelement/StyleElement.java | 18 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 42 +-
.../gui/oauth/FullyAutomaticPropertiesPanel.java | 24 +-
.../josm/gui/oauth/ManualAuthorizationUI.java | 41 +-
.../josm/gui/oauth/OAuthAuthorizationWizard.java | 3 +-
.../gui/oauth/SemiAutomaticAuthorizationUI.java | 20 +-
src/org/openstreetmap/josm/gui/package-info.java | 6 +
.../josm/gui/preferences/PreferenceDialog.java | 3 +-
.../josm/gui/preferences/PreferenceTabbedPane.java | 2 +-
.../josm/gui/preferences/SourceEditor.java | 26 +-
.../josm/gui/preferences/ToolbarPreferences.java | 8 -
.../josm/gui/preferences/advanced/ListEditor.java | 26 +-
.../gui/preferences/advanced/PreferencesTable.java | 215 +-
.../gui/preferences/display/ColorPreference.java | 12 +-
.../gui/preferences/display/GPXSettingsPanel.java | 4 +-
.../gui/preferences/display/LafPreference.java | 6 +-
.../preferences/display/LanguagePreference.java | 15 +-
.../preferences/imagery/CacheContentsPanel.java | 6 +-
.../gui/preferences/imagery/ImageryPreference.java | 19 +-
.../gui/preferences/map/MapPaintPreference.java | 21 +-
.../preferences/map/TaggingPresetPreference.java | 23 +-
.../gui/preferences/plugin/PluginListPanel.java | 14 +-
.../gui/preferences/plugin/PluginPreference.java | 16 +-
.../LambertCC9ZonesProjectionChoice.java | 2 +-
.../projection/LambertProjectionChoice.java | 2 +-
.../projection/ListProjectionChoice.java | 2 +-
.../OAuthAuthenticationPreferencesPanel.java | 37 +-
.../preferences/server/OsmApiUrlInputPanel.java | 23 +-
.../gui/preferences/server/UserNameValidator.java | 20 +-
.../josm/gui/preferences/shortcut/PrefJPanel.java | 86 +-
.../josm/gui/progress/NullProgressMonitor.java | 17 +
.../gui/progress/PleaseWaitProgressMonitor.java | 6 +-
.../openstreetmap/josm/gui/tagging/TagTable.java | 65 +-
.../gui/tagging/ac/AutoCompletingComboBox.java | 8 +-
.../gui/tagging/ac/AutoCompletionItemPriority.java | 43 +-
.../josm/gui/tagging/ac/AutoCompletionList.java | 25 +-
.../josm/gui/tagging/presets/TaggingPreset.java | 2 +-
.../gui/tagging/presets/TaggingPresetItem.java | 6 +-
.../gui/tagging/presets/TaggingPresetMenu.java | 49 +-
.../presets/TaggingPresetNameTemplateList.java | 4 +-
.../tagging/presets/items/ComboMultiSelect.java | 2 +-
.../josm/gui/tagging/presets/items/Roles.java | 4 +-
.../josm/gui/tagging/presets/items/Text.java | 1 +
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 52 +
.../josm/gui/widgets/ComboBoxHistory.java | 18 -
.../gui/widgets/CompileSearchTextDecorator.java | 2 +-
.../gui/widgets/DefaultTextComponentValidator.java | 40 +
.../josm/gui/widgets/FileChooserManager.java | 2 +-
.../josm/gui/widgets/JosmImageView.java | 24 +-
.../openstreetmap/josm/gui/widgets/JosmTable.java | 16 +
.../josm/gui/widgets/MultiSplitLayout.java | 15 +-
.../josm/gui/widgets/NativeFileChooser.java | 5 +-
src/org/openstreetmap/josm/io/CachedFile.java | 19 +
.../josm/io/CertificateAmendment.java | 159 +
src/org/openstreetmap/josm/io/ChangesetQuery.java | 9 +
src/org/openstreetmap/josm/io/GpxReader.java | 2 +-
src/org/openstreetmap/josm/io/NMEAImporter.java | 2 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 6 +-
src/org/openstreetmap/josm/io/NoteReader.java | 11 +-
src/org/openstreetmap/josm/io/OsmApi.java | 8 +-
.../openstreetmap/josm/io/OsmChangesetParser.java | 26 +-
.../josm/io/OsmServerChangesetReader.java | 2 +-
.../josm/io/OsmServerLocationReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmServerWriter.java | 24 +-
src/org/openstreetmap/josm/io/OsmWriter.java | 5 +-
.../josm/io/StreamProgressUpdater.java | 2 +-
src/org/openstreetmap/josm/io/package-info.java | 6 +
.../io/remotecontrol/RemoteControlHttpsServer.java | 2 +-
.../josm/io/remotecontrol/RequestProcessor.java | 13 +-
.../io/remotecontrol/handler/AddWayHandler.java | 2 +-
.../io/remotecontrol/handler/ImageryHandler.java | 6 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 10 +-
.../io/remotecontrol/handler/LoadDataHandler.java | 2 +-
.../remotecontrol/handler/LoadObjectHandler.java | 2 +-
.../josm/io/session/GeoImageSessionExporter.java | 2 +-
.../josm/io/session/GpxTracksSessionExporter.java | 2 +-
.../josm/io/session/ImagerySessionExporter.java | 8 +-
.../josm/io/session/MarkerSessionExporter.java | 2 +-
.../josm/io/session/NoteSessionExporter.java | 2 +-
.../josm/io/session/OsmDataSessionExporter.java | 2 +-
src/org/openstreetmap/josm/package-info.java | 6 +
.../josm/plugins/PluginException.java | 25 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 107 +-
.../josm/plugins/PluginInformation.java | 4 +-
.../josm/plugins/PluginListParseException.java | 29 +-
.../josm/plugins/PluginListParser.java | 2 +-
.../openstreetmap/josm/plugins/PluginProxy.java | 2 +-
.../plugins/ReadLocalPluginInformationTask.java | 8 +-
.../plugins/ReadRemotePluginInformationTask.java | 2 +-
.../openstreetmap/josm/plugins/package-info.java | 6 +
.../josm/tools/BugReportExceptionHandler.java | 301 -
src/org/openstreetmap/josm/tools/CopyList.java | 2 +-
src/org/openstreetmap/josm/tools/Diff.java | 40 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 6 +-
src/org/openstreetmap/josm/tools/I18n.java | 2 -
.../openstreetmap/josm/tools/ImageProvider.java | 27 +-
.../josm/tools/OverpassTurboQueryWizard.java | 7 +-
src/org/openstreetmap/josm/tools/Pair.java | 15 -
.../openstreetmap/josm/tools/PlatformHookOsx.java | 2 +-
.../josm/tools/PlatformHookUnixoid.java | 13 +-
.../josm/tools/PlatformHookWindows.java | 2 +-
src/org/openstreetmap/josm/tools/Predicates.java | 45 +
src/org/openstreetmap/josm/tools/Utils.java | 6 +-
.../openstreetmap/josm/tools/WindowGeometry.java | 14 +-
.../openstreetmap/josm/tools/XmlObjectParser.java | 4 -
.../tools/bugreport/BugReportExceptionHandler.java | 251 +
.../josm/tools/bugreport/BugReportSender.java | 182 +
.../josm/tools/bugreport/DebugTextDisplay.java | 39 +
.../openstreetmap/josm/tools/date/DateUtils.java | 13 +-
src/org/openstreetmap/josm/tools/package-info.java | 6 +
.../template_engine/ContextSwitchTemplate.java | 12 +-
styles/standard/elemstyles.mapcss | 748 +-
test/data/regress/12639/history.xml | 21137 +++++++++++++++++++
.../josm/data/osm/KeyValuePerformanceTest.java | 12 +-
test/unit/org/openstreetmap/josm/JOSMFixture.java | 8 +
.../josm/actions/OrthogonalizeActionTest.java | 24 +-
.../downloadtasks/DownloadReferrersTaskTest.java | 53 +
.../downloadtasks/DownloadTaskListTest.java | 30 +
.../josm/data/notes/NoteCommentTest.java | 38 +
.../openstreetmap/josm/data/notes/NoteTest.java | 69 +
.../openstreetmap/josm/data/osm/NodeDataTest.java | 31 +
.../openstreetmap/josm/data/osm/WayDataTest.java | 31 +
.../data/projection/ProjectionRegressionTest.java | 23 +-
.../validation/routines/DomainValidatorTest.java | 9 +
.../validation/routines/EmailValidatorTest.java | 8 +
.../routines/InetAddressValidatorTest.java | 9 +
.../validation/routines/RegexValidatorTest.java | 8 +
.../data/validation/routines/UrlValidatorTest.java | 8 +
.../data/validation/tests/LongSegmentTest.java | 59 +
.../tests/PublicTransportRouteTestTest.java | 9 +
.../josm/gui/MainApplicationTest.java | 78 +
.../josm/gui/TableCellRendererTest.java | 116 +
.../gui/correction/RoleCorrectionTableTest.java | 77 +
.../gui/correction/TagCorrectionTableTest.java | 88 +
.../josm/gui/dialogs/LayerListDialogTest.java | 71 -
.../josm/gui/dialogs/MapPaintDialogTest.java | 29 +
.../dialogs/layer/LayerVisibilityActionTest.java | 90 +
.../dialogs/properties/PropertiesDialogTest.java | 21 +-
.../relation/GenericRelationEditorTest.java | 104 +-
.../relation/SelectionTableCellRendererTest.java | 3 +-
.../gui/dialogs/relation/SelectionTableTest.java | 89 +
.../actions/RelationEditorActionsTest.java | 32 +-
.../josm/gui/help/HelpBrowserTest.java | 6 +-
.../josm/gui/help/HelpContentReaderTest.java | 41 +
.../josm/gui/history/CoordinateInfoViewerTest.java | 10 +
.../josm/gui/history/HistoryBrowserDialogTest.java | 10 +
.../josm/gui/history/HistoryBrowserModelTest.java | 91 +
.../josm/gui/history/HistoryLoadTaskTest.java | 73 +
.../gui/io/UploadAndSaveProgressRendererTest.java | 48 +
.../josm/gui/io/UploadDialogTest.java | 17 +
.../gui/layer/markerlayer/MarkerLayerTest.java | 67 +
.../josm/gui/preferences/PreferencesTestUtils.java | 1 +
.../gui/preferences/advanced/ListEditorTest.java | 48 +
.../preferences/advanced/PreferencesTableTest.java | 68 +
.../gui/preferences/audio/AudioPreferenceTest.java | 4 +
.../gui/tagging/presets/items/CheckGroupTest.java | 42 +
.../josm/gui/tagging/presets/items/CheckTest.java | 39 +
.../josm/gui/tagging/presets/items/ComboTest.java | 39 +
.../tagging/presets/items/ItemSeparatorTest.java | 40 +
.../josm/gui/tagging/presets/items/KeyTest.java | 39 +
.../josm/gui/tagging/presets/items/LabelTest.java | 39 +
.../josm/gui/tagging/presets/items/LinkTest.java | 50 +
.../gui/tagging/presets/items/MultiSelectTest.java | 39 +
.../gui/tagging/presets/items/OptionalTest.java | 40 +
.../gui/tagging/presets/items/PresetLinkTest.java | 44 +
.../josm/gui/tagging/presets/items/RolesTest.java | 40 +
.../josm/gui/tagging/presets/items/SpaceTest.java | 40 +
.../josm/gui/tagging/presets/items/TextTest.java | 39 +
.../josm/io/CertificateAmendmentTest.java | 98 +
.../openstreetmap/josm/io/NoteImporterTest.java | 10 +-
.../org/openstreetmap/josm/io/NoteReaderTest.java | 6 +-
.../unit/org/openstreetmap/josm/io/OsmApiTest.java | 50 +
.../remotecontrol/handler/AddWayHandlerTest.java | 104 +
.../remotecontrol/handler/ImageryHandlerTest.java | 78 +
.../handler/LoadAndZoomHandlerTest.java | 78 +
.../handler/LoadObjectHandlerTest.java | 76 +
.../josm/plugins/PluginDownloadExceptionTest.java | 37 +
.../josm/plugins/PluginExceptionTest.java | 38 +
.../josm/plugins/PluginHandlerTest.java | 26 +
.../josm/plugins/PluginHandlerTestIT.java | 26 +-
.../josm/plugins/PluginListParseExceptionTest.java | 35 +
.../josm/tools/BugReportExceptionHandlerTest.java | 56 -
.../bugreport/BugReportExceptionHandlerTest.java | 48 +
.../josm/tools/bugreport/BugReportSenderTest.java | 42 +
.../josm/tools/date/DateUtilsTest.java | 109 +
656 files changed, 67480 insertions(+), 48913 deletions(-)
diff --git a/.classpath b/.classpath
index 1d3f357..28a5cbd 100644
--- a/.classpath
+++ b/.classpath
@@ -17,7 +17,8 @@
<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
- <classpathentry kind="lib" path="test/lib/equalsverifier-2.0.jar"/>
+ <classpathentry kind="lib" path="test/lib/equalsverifier-2.0.2.jar"/>
+ <classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
diff --git a/REVISION b/REVISION
index 1c65fef..dce997b 100644
--- a/REVISION
+++ b/REVISION
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
+ kind="dir"
path="trunk"
- revision="9979"
- kind="dir">
+ revision="10161">
<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="9979">
-<author>Don-vip</author>
-<date>2016-03-13T00:17:21.257948Z</date>
+ revision="10161">
+<author>bastiK</author>
+<date>2016-04-28T10:48:16.310400Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index b0a4203..f4069ab 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
** https://josm.openstreetmap.de/wiki/DevelopersGuide/CreateBuild
**
-->
-<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" xmlns:jacoco="antlib:org.jacoco.ant">
+<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if">
<target name="init-properties">
<!-- Load properties in a target and not at top level, so this build file can be
imported from an IDE ant file (Netbeans) without messing up IDE properties.
@@ -387,6 +387,7 @@ Build-Date: ${build.tstamp}
<jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec">
<junit printsummary="yes" fork="true" forkmode="once">
<jvmarg value="-Dfile.encoding=UTF-8"/>
+ <jvmarg value="-XaddExports:java.base/sun.security.util=ALL-UNNAMED,java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
<sysproperty key="josm.home" value="${test.dir}/config/@{testfamily}-josm.home"/>
<sysproperty key="josm.test.data" value="${test.dir}/data"/>
<sysproperty key="java.awt.headless" value="true"/>
@@ -651,7 +652,7 @@ Build-Date: ${build.tstamp}
<target name="checkstyle" depends="init-properties">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
- classpath="tools/checkstyle/checkstyle-6.16.1-all.jar"/>
+ classpath="tools/checkstyle/checkstyle-6.17-all.jar"/>
<checkstyle config="tools/checkstyle/josm_checks.xml">
<fileset dir="${base.dir}/src/org/openstreetmap/josm" includes="**/*.java"
excludes="gui/mappaint/mapcss/parsergen/*.java"/>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 2d0c88e..cbce922 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -413,6 +413,8 @@
<optional>
<text key="name" text="Name" />
<reference ref="highway_base" />
+ <text key="destination" text="Destination" />
+ <text key="destination:ref" text="Destination reference" />
<text key="width" text="Width (meters)" />
<combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<checkgroup columns="4">
@@ -440,6 +442,8 @@
<key key="highway" value="motorway_link" />
<optional>
<reference ref="highway_base" />
+ <text key="destination" text="Destination" />
+ <text key="destination:ref" text="Destination reference" />
<text key="width" text="Width (meters)" />
<combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<checkgroup columns="4">
@@ -474,6 +478,8 @@
<optional>
<text key="name" text="Name" />
<reference ref="highway_base" />
+ <text key="destination" text="Destination" />
+ <text key="destination:ref" text="Destination reference" />
<text key="width" text="Width (meters)" />
<combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<checkgroup columns="4">
@@ -497,6 +503,8 @@
<text key="ref" text="Reference" />
<optional>
<reference ref="highway_base" />
+ <text key="destination" text="Destination" />
+ <text key="destination:ref" text="Destination reference" />
<text key="width" text="Width (meters)" />
<combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
<checkgroup columns="4">
@@ -1194,7 +1202,6 @@
<key key="highway" value="motorway_junction" />
<text key="name" text="Name" />
<text key="ref" text="Number" />
- <text key="exit_to" text="Exit to" />
</item> <!-- Motorway Junction -->
<item name="Services" icon="styles/standard/vehicle/services.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services"
@@ -2075,6 +2082,7 @@
<space />
<key key="waterway" value="waterfall" />
<reference ref="name_wikipedia" />
+ <text key="height" text="Height (meters)" />
</item> <!-- Waterfall -->
<item name="Weir" icon="styles/standard/nautical/weir.svg" type="node,way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
@@ -2244,7 +2252,7 @@
<space />
<key key="natural" value="wetland" />
<text key="name" text="Name" />
- <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
+ <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove,wet_meadow,string_bog,saltern" values_searchable="true" />
<check key="seasonal" text="Seasonal" disable_off="true" />
</item> <!-- Wetland -->
<item name="Mud" icon="styles/standard/misc/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
@@ -2847,6 +2855,7 @@
</checkgroup>
</optional>
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Fuel -->
<item name="Charging Station" icon="styles/standard/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
@@ -3091,9 +3100,9 @@
<role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
<role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
<role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
- <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
- <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
- <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (train=yes OR subway=yes OR monorail=yes OR tram=yes OR light_rail=yes)" />
+ <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
+ <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+ <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
<role key="" text="route segment" requisite="required" type="way,closedway" member_expression="railway" />
</roles>
</item> <!-- Public Transport Route (Rail) -->
@@ -3111,9 +3120,9 @@
<role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR trolleybus=yes)" />
<role key="stop_exit_only" text="stop position (exit only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR trolleybus=yes)" />
<role key="stop_entry_only" text="stop position (entry only)" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR trolleybus=yes)" />
- <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform (bus=yes OR trolleybus=yes)" />
- <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (bus=yes OR trolleybus=yes)" />
- <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform (bus=yes OR trolleybus=yes)" />
+ <role key="platform" text="platform" requisite="optional" type="node,way,closedway,multipolygon" member_expression="public_transport=platform" />
+ <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+ <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
<role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway" />
</roles>
</item> <!-- Public Transport Route (Bus) -->
@@ -3520,6 +3529,7 @@
<reference ref="internet_smoking" />
<space />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Residential Building" />
</item> <!-- Hotel -->
<item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
@@ -3541,6 +3551,7 @@
<reference ref="internet_smoking" />
<space />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Motel -->
<item name="Guest House/Bed & Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
@@ -3561,6 +3572,7 @@
<reference ref="internet_smoking" />
<space />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Guest House/Bed & Breakfast -->
<item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
@@ -3582,6 +3594,7 @@
<reference ref="internet_smoking" />
<space />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Chalet -->
<item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
@@ -3603,6 +3616,7 @@
<reference ref="internet_smoking" />
<space />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Hostel -->
<item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
@@ -3622,6 +3636,7 @@
<reference ref="internet_smoking" />
<space />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Alpine Hut -->
<item name="Wilderness Hut" icon="styles/standard/accommodation/wilderness_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=wilderness_hut"
@@ -3642,6 +3657,7 @@
<text key="description" text="Closer Description" />
<space />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Wilderness Hut -->
<separator/>
<item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3733,6 +3749,7 @@
<reference ref="internet_smoking" />
<space />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Fast Food -->
<item name="Food Court" icon="presets/restaurant.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
@@ -4023,6 +4040,7 @@
<text key="screen" text="Number of screens" />
<text key="min_age" text="Minimum age" />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Movie Theater/Cinema -->
<item name="Zoo" icon="presets/zoo.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
@@ -4199,6 +4217,12 @@
<key key="leisure" value="fishing" />
<text key="name" text="Name" />
</item> <!-- Fishing -->
+ <item name="Bird Hide" icon="styles/standard/leisure/bird_hide.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=bird_hide" />
+ <space />
+ <key key="leisure" value="bird_hide" />
+ <reference ref="name_ref_operator" />
+ </item> <!-- Bird Hide -->
<separator/>
<item name="Night Club" icon="styles/standard/leisure/discoball.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
@@ -4277,6 +4301,7 @@
<reference ref="name_operator_oh_wheelchair" />
<text key="wikipedia" text="Wikipedia" />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Museum -->
<item name="Theatre" icon="presets/theater.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
@@ -4290,6 +4315,7 @@
<reference ref="name_operator" />
<reference ref="wheelchair" />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Theatre -->
<item name="Library" icon="styles/standard/shop/library.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
@@ -4305,6 +4331,7 @@
<key key="amenity" value="library" />
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Library -->
<item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
@@ -4316,6 +4343,7 @@
<key key="amenity" value="arts_centre" />
<text key="name" text="Name" />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Arts Centre -->
<item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork"
@@ -4373,6 +4401,7 @@
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Church -->
<item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4397,6 +4426,7 @@
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Mosque -->
<item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4421,6 +4451,7 @@
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Synagogue -->
<item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4444,6 +4475,7 @@
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Buddhist Temple -->
<item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4467,6 +4499,7 @@
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Hindu Temple -->
<item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4489,6 +4522,7 @@
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Shinto Shrine -->
<item name="Other Place of Worship" icon="styles/standard/religion.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -4511,20 +4545,10 @@
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Other Place of Worship -->
</group> <!-- Place of Worship -->
<group name="Public Building" icon="presets/townhall.png">
- <item name="Public Building" icon="styles/standard/service.png" type="node,closedway,multipolygon" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building"
- es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=public_building"
- ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=public_building"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=public_building"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=public_building" />
- <space />
- <key key="amenity" value="public_building" />
- <reference ref="name_oh_wheelchair" />
- <reference ref="link_contact_address" />
- </item> <!-- Public Building -->
<item name="Town Hall" icon="presets/townhall.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=townhall"
@@ -4537,6 +4561,7 @@
<key key="amenity" value="townhall" />
<reference ref="name_oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Town Hall -->
<item name="Community Centre" icon="presets/community_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
@@ -4551,6 +4576,7 @@
<key key="amenity" value="community_centre" />
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Community Centre -->
<item name="Embassy" icon="presets/embassy.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
@@ -4576,6 +4602,7 @@
<key key="amenity" value="courthouse" />
<reference ref="name_oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Courthouse -->
<item name="Prison" icon="styles/standard/service/administration/prison.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
@@ -4602,6 +4629,7 @@
<key key="amenity" value="police" />
<reference ref="name_oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Police -->
<item name="Ranger Station" icon="styles/standard/service/ranger_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ranger_station" />
@@ -4623,6 +4651,7 @@
<key key="amenity" value="fire_station" />
<text key="name" text="Name" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Fire Station -->
<item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office"
@@ -4656,6 +4685,7 @@
<key key="amenity" value="kindergarten" />
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Kindergarten -->
<item name="School" icon="presets/school.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school"
@@ -4674,6 +4704,7 @@
<key key="amenity" value="school" />
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- School -->
<item name="University" icon="styles/standard/education/university.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university"
@@ -5051,7 +5082,7 @@
zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=toilets" />
<space />
<key key="amenity" value="toilets" />
- <combo key="access" text="Access rights" values="public,permissive,customers" />
+ <combo key="access" text="Access rights" values="yes,permissive,customers" />
<optional>
<checkgroup columns="3">
<check key="female" text="Female" text_context="restroom" />
@@ -5074,7 +5105,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=shower" />
<space />
<key key="amenity" value="shower" />
- <combo key="access" text="Access rights" values="public,permissive,customers" />
+ <combo key="access" text="Access rights" values="yes,permissive,customers" />
<optional>
<text key="description" text="Description" />
<combo key="fee" text="Fee" values="yes,no" />
@@ -5158,6 +5189,7 @@
<space />
<key key="amenity" value="recycling" />
<key key="recycling_type" value="container" />
+ <text key="operator" text="Operator" />
<reference ref="oh_wheelchair" />
<space />
<checkgroup columns="4">
@@ -5247,7 +5279,7 @@
<check key="sanitary_dump_station:pump-out" text="Suction pumpout" />
<check key="sanitary_dump_station:round_drain" text="Gravity drain for hose" />
<check key="sanitary_dump_station:basin" text="Casette or Elsan Disposal" />
- <combo key="access" text="Access" values="yes,public,customers,no" />
+ <combo key="access" text="Access" values="yes,customers,no" />
<reference ref="fee" />
<text key="operator" text="Operator" />
<combo key="opening_hours" text="Operation times" values="24/7" values_no_i18n="true" />
@@ -5394,6 +5426,7 @@
<text key="name" text="Name" />
<reference ref="sport" />
<reference ref="link_contact_address_payment" />
+ <preset_link preset_name="Building" />
</item> <!-- Sports Centre -->
<item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=pitch"
@@ -5971,10 +6004,12 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
<space />
- <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
- <text key="name" text="Name" />
- <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
- <text key="height" text="Height (meters)" />
+ <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower,public" values_context="building" default="yes" match="keyvalue!" values_searchable [...]
+ <optional>
+ <text key="name" text="Name" />
+ <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
+ <text key="height" text="Height (meters)" />
+ </optional>
<preset_link preset_name="Addresses" />
</item> <!-- Building -->
<item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5993,9 +6028,11 @@
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
<space />
<combo key="building" text="Building" values="yes,residential,apartments,house,hotel,hut,dormitory,terrace,detached,farm,roof" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
- <text key="name" text="Name" />
- <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
- <text key="height" text="Height (meters)" />
+ <optional>
+ <text key="name" text="Name" />
+ <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
+ <text key="height" text="Height (meters)" />
+ </optional>
<preset_link preset_name="Addresses" />
</item> <!-- Residential Building -->
<item name="Building part" icon="styles/standard/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
@@ -7520,6 +7557,7 @@
<check key="atm" text="Automated Teller Machine" default="on" />
<text key="ref" text="Reference" />
<reference ref="link_contact_address" />
+ <preset_link preset_name="Building" />
</item> <!-- Bank -->
<item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
@@ -8068,7 +8106,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
<space />
<key key="amenity" value="vending_machine" />
- <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
+ <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;newspapers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM_cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
<text key="operator" text="Operator" />
<text key="ref" text="Reference number" />
<preset_link preset_name="Payment Methods" />
@@ -9799,7 +9837,7 @@
</roles>
</item> <!-- Enforcement -->
<separator/>
- <group name="Routes">
+ <group name="Routes" icon="presets/path.png">
<item name="Bicycle Route" icon="presets/path.png" type="relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
de.href="http://wiki.openstreetmap.org/wiki/DE:Cycle_routes"
@@ -9885,6 +9923,22 @@
<role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
</roles>
</item> <!-- Walking Route -->
+ <item name="Riding Route" icon="presets/path.png" type="relation" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:route=horse" />
+ <space/>
+ <key key="type" value="route"/>
+ <key key="route" value="horse"/>
+ <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" match="keyvalue!" />
+ <reference ref="name_ref_operator"/>
+ <optional>
+ <reference ref="route_hikebike_optionals" />
+ </optional>
+ <roles>
+ <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
+ <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
+ <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
+ </roles>
+ </item> <!-- Riding Route -->
<item name="Piste Route" icon="presets/path.png" type="relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=piste"
diff --git a/data/security/DST_Root_CA_X3.pem b/data/security/DST_Root_CA_X3.pem
new file mode 100644
index 0000000..b2e43c9
--- /dev/null
+++ b/data/security/DST_Root_CA_X3.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
diff --git a/data/security/StartCom_Certification_Authority.pem b/data/security/StartCom_Certification_Authority.pem
new file mode 100644
index 0000000..960f265
--- /dev/null
+++ b/data/security/StartCom_Certification_Authority.pem
@@ -0,0 +1,44 @@
+-----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/validator/addresses.mapcss b/data/validator/addresses.mapcss
index 9116c4e..596a904 100644
--- a/data/validator/addresses.mapcss
+++ b/data/validator/addresses.mapcss
@@ -1,6 +1,10 @@
-/* see #9667 - Verify interpolation range/values
- Matches nodes with a decrease of addr:housenumber within addr:interpolation=even/odd.
-*/
-*[tag("addr:housenumber") > child_tag("addr:housenumber")][regexp_test("even|odd", parent_tag("addr:interpolation"))] + *[addr:housenumber] {
- throwWarning: tr("Decreasing house numbers in addresses interpolation");
+/* see #10232 */
+way[addr:interpolation=odd] > node[addr:housenumber][get(split(".", tag("addr:housenumber")/2), 1)=0] {
+ throwWarning: tr("Even housenumber in odd address interpolation.");
}
+way[addr:interpolation=even] > node[addr:housenumber][get(split(".", tag("addr:housenumber")/2), 1)=5] {
+ throwWarning: tr("Odd housenumber in even address interpolation.");
+}
+way[addr:interpolation] {
+ throwOther: tr("Way with {0}. Tag each housenumber separately if possible.", "{0.key}");
+}
\ No newline at end of file
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index dad5ce1..9666d85 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -154,7 +154,7 @@ way[power=cable ][!voltage],
}
/* {0.key} without {1.key} or {2.tag} */
-*[smoothness ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
+*[smoothness ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking)$/],
*[segregated ][!highway][railway!=crossing] {
throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}");
}
@@ -292,8 +292,8 @@ way[highway][natural],
fixRemove: "natural";
}
-/* see #9593, #11183, #12418 */
-*[sport][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink)$/][natural !~ /^(beach|bare_rock|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
+/* see #9593, #11183, #12418, #12761 */
+*[sport][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
throwWarning: tr("sport without physical feature");
assertMatch: "node sport=tennis";
assertNoMatch: "node sport=tennis leisure=pitch";
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 6ab9945..8151e61 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -274,6 +274,10 @@
assertNoMatch: "node name=valid name";
}
+*[note][note=~/^(?i)fixme$/] {
+ throwWarning: tr("{0} is unspecific. Instead use the key fixme with the information what exactly should be fixed in the value of fixme.", "{0.tag}");
+}
+
/* see #10107, #10108, #10929 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
*[wood=deciduous],
*[type=broad_leaved],
@@ -797,4 +801,35 @@ relation[/^..$/][!to] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "sport=ice_skating";
suggestAlternative: "sport=roller_skating";
+}
+
+way[barrier=wall][type=noise_barrier][!wall],
+way[barrier=wall][type=noise_barrier][wall=noise_barrier] {
+ throwWarning: tr("{0} is deprecated", "{1.tag}");
+ suggestAlternative: "wall=noise_barrier";
+ fixChangeKey: "type => wall";
+}
+way[barrier=wall][type=noise_barrier][wall][wall!=noise_barrier] {
+ throwWarning: tr("{0} is deprecated", "{1.tag}");
+ suggestAlternative: "wall=noise_barrier";
+}
+
+/* #8978, 12588 */
+*[amenity=public_building] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "amenity=townhall";
+ suggestAlternative: "amenity=community_centre";
+ suggestAlternative: "amenity=hospital";
+ suggestAlternative: "leisure=sports_centre";
+ suggestAlternative: "office=government";
+ suggestAlternative: "building=hospital";
+ suggestAlternative: "building=public";
+ suggestAlternative: "...";
+}
+
+/* #12708 */
+*[vending=news_papers] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "vending=newspapers";
+ fixAdd: "vending=newspapers";
}
\ No newline at end of file
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index 59b7f99..8dd7678 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -221,6 +221,20 @@ way[waterway] > node.node_in_bridge {
throwWarning: tr("node connects waterway and bridge");
}
+/*see #11128*/
+way[highway] > node[tourism=information][information=guidepost] {
+ set guidepost;
+ throwOther: tr("{0} node connected to a highway", "{1.tag}");
+}
+way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station)$/],
+way[highway] > node[building][!entrance],
+way[highway] > node[leisure][!entrance],
+way[highway] > node[office][!entrance],
+way[highway] > node[shop][!entrance],
+way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost {
+ throwWarning: tr("{0} node connected to a highway", "{0.key}");
+}
+
way[junction=roundabout]:righthandtraffic:clockwise,
way[junction=roundabout]!:righthandtraffic:anticlockwise {
throwWarning: tr("suspicious roundabout direction");
@@ -237,4 +251,19 @@ area:closed[place=island][eval(areasize()) < 500] {
throwWarning: tr("{0} on a small area", "{1.tag}");
suggestAlternative: "place=islet";
fixAdd: "place=islet";
-}
\ No newline at end of file
+}
+
+/* 12561 - building larger than Aalsmeer Flower Auction */
+area:closed[building][eval(areasize()) > 500000] {
+ throwWarning: tr("Too large building");
+}
+
+/* #12577 */
+way[power=line] > node,
+way[power=minor_line] > node,
+way[power=cable] > node {
+ set node_in_power_way;
+}
+way[!power][!building] > node.node_in_power_way {
+ throwWarning: tr("Node connects a power line or cable with an object which is not related to the power infrastructure.");
+}
diff --git a/data/validator/ignoretags.cfg b/data/validator/ignoretags.cfg
index 5c29ac5..c927f97 100644
--- a/data/validator/ignoretags.cfg
+++ b/data/validator/ignoretags.cfg
@@ -101,6 +101,8 @@ E:denotation
E:seamark:type
E:traffic_sign
E:building:levels
+E:exit_to
+E:distance
;
; Ignore valid and semi-valid keys that end with...
;
@@ -123,6 +125,7 @@ K:bicycle=dismount
K:wall=no
K:man_made=petroleum_well
K:railway=construction
+K:railway=razed
K:railway=stop
K:office=yes
K:pilgrimage=yes
@@ -134,7 +137,6 @@ K:toilets:wheelchair=no
K:locality=townland
K:place=allotments
K:building=civic
-K:building=public
K:building=houseboat
K:building=static_caravan
K:leisure=recreation_ground
@@ -145,7 +147,14 @@ K:location:transition=yes
; Highway Key/Value Pairs
;
K:highway=proposed
+E:proposed
K:living_street=yes
+K:priority_road=designated
+K:priority_road=yes_unposted
+K:priority_road=end
+K:hazmat=no
+K:hazmat:water=no
+K:hazmat:water=permissive
;
; Amenity Key/Value Pairs
;
@@ -166,7 +175,6 @@ K:historic=wreck
; Lifecycle Tags
;
;K:historic=yes
-K:proposed=yes
K:planned=yes
K:construction=yes
;K:disused=yes
diff --git a/data_nodist/projection/projection-regression-test-data-java9 b/data_nodist/projection/projection-regression-test-data-java9
deleted file mode 100644
index fe26c0e..0000000
--- a/data_nodist/projection/projection-regression-test-data-java9
+++ /dev/null
@@ -1,18950 +0,0 @@
-# Data for test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
-# Format: 1. Projection code; 2. lat/lon; 3. lat/lon projected -> east/north; 4. east/north (3.) inverse projected
-EPSG:2000
- ll -24.152091201868316 -60.006596390075025
- en 602524.7501910079 -2672018.6090738215
- ll2 -24.152091201867155 -60.00659639007285
-EPSG:20004
- ll 16.839228937794445 21.46001740819547
- en 4549154.942307135 1862674.7479888746
- ll2 16.83922894362953 21.460017419580687
-EPSG:20005
- ll 76.00228308839232 30.202392460738437
- en 5586588.960278155 8441288.770062318
- ll2 76.00228308770002 30.20239247464603
-EPSG:20006
- ll -11.828596070852598 39.66375096363792
- en 7227797.13939559 -1316758.073601282
- ll2 -11.828596061704578 39.66375096798346
-EPSG:20007
- ll -39.18269141068387 41.97748662504277
- en 7757406.450497731 -4342982.437711784
- ll2 -39.18269139424922 41.97748664681464
-EPSG:20008
- ll 17.013525850856297 51.11656331154035
- en 9152422.020226156 1892108.0076232143
- ll2 17.013525850114977 51.11656331076538
-EPSG:20009
- ll -38.67408190442802 48.56834584169316
- en 9288472.71863055 -4285085.743645531
- ll2 -38.67408188865113 48.568345859559685
-EPSG:2001
- ll 46.264847102331714 -59.031528521809406
- en 628957.9414631542 5127156.009360882
- ll2 46.26484707178977 -59.031528567988914
-EPSG:20010
- ll -82.1814835973415 52.863921853698834
- en 1.0437300865094576E7 -9131035.460654926
- ll2 -82.18148357228904 52.863922034284535
-EPSG:20011
- ll -8.830582934653933 61.54901636516548
- en 1.1340439720621632E7 -976742.7858380136
- ll2 -8.8305829322932 61.54901636720494
-EPSG:20012
- ll 81.96965451167452 63.851629323905186
- en 1.2419846180633489E7 9108710.407042187
- ll2 81.96965450980667 63.8516293371318
-EPSG:20013
- ll 35.782897874171965 71.4323515768824
- en 1.3177437943300901E7 3967394.8147957386
- ll2 35.78289787426942 71.432351572884
-EPSG:20014
- ll -64.46025073066559 80.15711267194538
- en 1.4459478805504292E7 -7151406.645765394
- ll2 -64.4602507035959 80.15711269137412
-EPSG:20015
- ll 49.429206820925515 88.44324972810618
- en 1.5604721146492304E7 5478411.422734861
- ll2 49.42920682354638 88.44324972579022
-EPSG:20016
- ll -34.326636709757615 90.15819946242206
- en 1.6238443051092314E7 -3803476.5592719223
- ll2 -34.32663670048854 90.15819946425086
-EPSG:20017
- ll -2.502310078261658 92.13570143767126
- en 1.6734757644557446E7 -278618.37057895854
- ll2 -2.5023100805904965 92.13570145043141
-EPSG:20018
- ll 0.4894394746035431 98.10217720815146
- en 1.773028063895454E7 54598.61289571699
- ll2 0.4894394714202682 98.10217722206234
-EPSG:20019
- ll -69.11351056901628 115.6800816984009
- en 1.96861092334577E7 -7677174.462607934
- ll2 -69.11351053904588 115.68008167857138
-EPSG:2002
- ll 85.3951847429534 -57.97141843090161
- en 435116.74291835283 9483782.198586658
- ll2 85.3951846705995 -57.97142325962548
-EPSG:20020
- ll 60.41547211444228 110.93665485674174
- en 2.0166198381657258E7 6715786.198825355
- ll2 60.41547211336289 110.93665486582655
-EPSG:20021
- ll -31.6458565767577 129.11022448974745
- en 2.2080029633036677E7 -3518775.402462105
- ll2 -31.64585656525282 129.11022448673526
-EPSG:20022
- ll 12.61204683517768 131.77248512514555
- en 2.280127139440267E7 1396462.6479068806
- ll2 12.612046833469144 131.77248512733183
-EPSG:20023
- ll 43.20027533882387 138.27324210395304
- en 2.3765964820642497E7 4790240.391015104
- ll2 43.200275339254205 138.27324210790113
-EPSG:20024
- ll -12.584134927670732 140.39562001835992
- en 2.4434234901175614E7 -1391701.6894167184
- ll2 -12.584134924042749 140.39562001533557
-EPSG:20025
- ll -7.986196267609117 152.6424921470433
- en 2.612294552319019E7 -887318.837228833
- ll2 -7.986196262456878 152.6424921385678
-EPSG:20026
- ll 66.55342422255211 153.6347037053164
- en 2.6528085183759525E7 7384780.022038975
- ll2 66.55342422241213 153.63470370450156
-EPSG:20027
- ll 28.560775463943344 165.4816645469856
- en 2.813484114231003E7 3177899.322300964
- ll2 28.5607754629015 165.48166454656797
-EPSG:20028
- ll -40.398806881019695 163.6839847902714
- en 2.8388150062010705E7 -4474620.678979582
- ll2 -40.39880686414972 163.6839847651606
-EPSG:20029
- ll -67.15281825466914 168.85803521872285
- en 2.940704021371834E7 -7453050.838025116
- ll2 -67.15281823636452 168.85803514515854
-EPSG:2003
- ll 87.08597257115792 -62.13703324298892
- en 399058.495249942 9671406.59694133
- ll2 87.0859725974734 -62.13703256143978
-EPSG:20030
- ll 5.949885955586183 177.32844322257282
- en 3.053623363456618E7 658027.9257552874
- ll2 5.949885963071759 177.3284432101402
-EPSG:20031
- ll 2.3637139615766642 -175.42374186975653
- en 3.1675208528062046E7 261552.19022892613
- ll2 2.3637139718612348 -175.42374188642106
-EPSG:20032
- ll 64.46023588430472 -169.1703495596359
- en 3.258790874584478E7 7152584.441854268
- ll2 64.46023588596455 -169.17034957496404
-EPSG:2004
- ll 80.47322188057908 -65.79251298004215
- en 329657.2782251808 8935446.406108506
- ll2 80.47322185560417 -65.79251321218402
-EPSG:2005
- ll 31.112801310091243 -56.249279179999725
- en 948635.2096275802 3455778.3741251817
- ll2 31.11280130942795 -56.249279180865145
-EPSG:2006
- ll -49.32142560140231 -57.23113931769262
- en 746509.6670514308 -5473674.53460987
- ll2 -49.321425356866484 -57.23113937044382
-EPSG:2007
- ll 82.4703147578243 -60.36727329202266
- en 423552.07048129383 9156447.841154533
- ll2 82.47031475484683 -60.36727334810997
-EPSG:2009
- ll 23.99435670264367 -64.08456953276009
- en -264024.34906691103 2665542.2466658712
- ll2 23.994356702021825 -64.08456953385337
-EPSG:2010
- ll -22.102666995982716 -67.0072630543377
- en -264066.159578103 -2455090.161010696
- ll2 -22.102666995481137 -67.00726305503774
-EPSG:2011
- ll -62.369755901071805 -62.48532066688426
- en 409065.59177688375 -6918871.396914359
- ll2 -62.36975590106676 -62.485320666884164
-EPSG:2012
- ll 64.47892585234246 -70.38829296331612
- en 165939.90850352647 7155494.568093124
- ll2 64.47892585230423 -70.38829296330738
-EPSG:2013
- ll 0.9965980675782191 -76.37545367013071
- en -350252.1743293322 110765.89879467181
- ll2 0.9965980675298911 -76.37545366500557
-EPSG:20135
- ll 28.027038464336812 27.17037660452722
- en 516685.70129133086 3099998.4724592846
- ll2 28.027038464055966 27.170376605061605
-EPSG:20136
- ll 10.680333998843338 34.570691638936616
- en 671712.8127643769 1180863.082809163
- ll2 10.680333999516781 34.57069163948521
-EPSG:20137
- ll -51.134049950061765 36.62885114190551
- en 334023.5471534163 -5667455.154283627
- ll2 -51.13404977408364 36.6288512094824
-EPSG:20138
- ll 28.630362876132452 46.9871412070585
- en 694146.9942137946 3168450.5771538704
- ll2 28.630362877754436 46.98714120335181
-EPSG:2014
- ll -61.30030158940133 -74.18779703877978
- en 267939.5848921464 -6798267.247821435
- ll2 -61.30030158940132 -74.18779703877978
-EPSG:2015
- ll 16.68452616278354 -74.67926761072904
- en 499014.4242083467 1845983.8790009045
- ll2 16.684526162783182 -74.67926761073123
-EPSG:2016
- ll 19.538026994399644 -76.90001530665549
- en 577715.7806740638 2162951.9830235294
- ll2 19.538026994395718 -76.9000153066581
-EPSG:2017
- ll 43.812639429567476 -74.58089147744877
- en 217839.43427186878 4852871.214810534
- ll2 43.81263942956735 -74.58089147744896
-EPSG:2018
- ll 48.803785465994984 -78.18447205264873
- en 181071.4773434844 5408415.933975799
- ll2 48.803785465992796 -78.18447205264998
-EPSG:2019
- ll 44.43461549887944 -79.86979039760281
- en 275359.9650727559 4921472.898663564
- ll2 44.434615498879445 -79.86979039760281
-EPSG:2020
- ll 45.38253264176999 -83.65709974996614
- en 214181.89884822507 5027388.384212246
- ll2 45.38253264176977 -83.65709974996638
-EPSG:2021
- ll 51.26977312143731 -82.4879236815456
- en 200967.49358611403 5682363.2867626725
- ll2 51.26977312143624 -82.48792368154612
-EPSG:2022
- ll 57.85997255684093 -83.44573038107055
- en 337701.1222242475 6414969.128196347
- ll2 57.85997255684091 -83.44573038107055
-EPSG:2023
- ll 44.003261285030206 -88.86828553888091
- en 154969.82932996436 4875178.385488359
- ll2 44.00326128502667 -88.86828553888394
-EPSG:2024
- ll 59.90880361237657 -89.52946578553404
- en 331126.2804360868 6643134.803862813
- ll2 59.908803612376566 -89.52946578553404
-EPSG:20249
- ll 29.524950480595876 113.70409099215577
- en 761960.3885573529 1.3269071998795843E7
- ll2 29.5249504654822 113.70409097392609
-EPSG:2025
- ll 48.14679476148006 -94.65152793199783
- en 181914.44170341894 5335316.870053867
- ll2 48.14679476147814 -94.65152793199903
-EPSG:20250
- ll -46.60613605561535 122.4905869688604
- en 920302.6715216355 4823809.104140321
- ll2 -46.606136042979465 122.49058698519502
-EPSG:20251
- ll 51.16646197523673 118.9436552823746
- en 216305.44601134164 1.5676096769769724E7
- ll2 51.16646196022958 118.94365524388763
-EPSG:20252
- ll -55.73596938312179 131.12192384758345
- en 633095.9420653256 3821122.634050224
- ll2 -55.7359693719691 131.12192386928083
-EPSG:20253
- ll 87.16258906533642 128.14857021045844
- en 462105.28994988615 1.9683489512824558E7
- ll2 87.16258907116554 128.14856968497995
-EPSG:20254
- ll 35.766402312208484 140.07797532017497
- en 416533.3913999355 1.3958352112427088E7
- ll2 35.76640229588717 140.07797529083945
-EPSG:20255
- ll 31.856430889331975 147.74305919157808
- en 570183.9746063474 1.3524679304816468E7
- ll2 31.85643087207112 147.74305916437675
-EPSG:20256
- ll 10.730350560075749 159.49626079666012
- en 1211651.1804025327 1.1193568072320247E7
- ll2 10.730350536145295 159.4962607734134
-EPSG:20257
- ll -76.79131959459292 164.2591946893412
- en 633888.4505927246 1470355.8627122417
- ll2 -76.7913195779638 164.2591947311449
-EPSG:20258
- ll 25.02378261023182 165.1143673878456
- en 511449.77175060543 1.2767498003059063E7
- ll2 25.02378259042818 165.11436736662858
-EPSG:2026
- ll 54.992681769602285 -95.5752395427661
- en 331985.2953917513 6095673.140041424
- ll2 54.992681769602285 -95.5752395427661
-EPSG:2027
- ll 27.002601829396966 -86.1012337744193
- en 1185438.6986901397 3005351.485734743
- ll2 27.00260182657324 -86.10123377027692
-EPSG:2028
- ll 60.948868309460664 -82.04579845384941
- en 768216.413228083 6767034.080273428
- ll2 60.94886830828409 -82.04579845501142
-EPSG:2029
- ll -38.44398671770679 -76.11774127846465
- en 926180.6988286243 -4266176.340469957
- ll2 -38.44398671686185 -76.11774127793123
-EPSG:2030
- ll -26.350108894405153 -70.65931730695968
- en 933370.4763104068 -2921588.353884801
- ll2 -26.350108894245686 -70.65931730663465
-EPSG:2031
- ll -12.53732206701919 -75.4302604503394
- en 1105967.8660425916 -1392293.1470969284
- ll2 -12.537322066682803 -75.43026045201596
-EPSG:2032
- ll 35.15038488277811 -79.61286178205324
- en 79676.41003812652 3899276.081830987
- ll2 35.15038488229682 -79.61286178257872
-EPSG:2033
- ll -19.659201276417036 -63.75724476388065
- en 1050196.6312056659 -2182124.9072313686
- ll2 -19.65920127609943 -63.757244763730306
-EPSG:2034
- ll -27.126716781845694 -67.04728719840217
- en 98694.92769113102 -3006772.3233368313
- ll2 -27.126716781734178 -67.04728719863104
-EPSG:20349
- ll 68.08374457986454 108.77813128167556
- en 407323.16845890926 1.7553840364203174E7
- ll2 68.08374456699899 108.7781311963244
-EPSG:2035
- ll 28.796334512013857 -50.6123513441162
- en 1124081.4542079717 3202048.428411403
- ll2 28.796334509977623 -50.61235134107412
-EPSG:20350
- ll -58.31171193778919 112.22387129902593
- en 220152.7385606584 3526539.2276406176
- ll2 -58.31171192480688 112.22387133805508
-EPSG:20351
- ll 61.75660481068246 125.13033866527678
- en 612320.6822076435 1.684889117413085E7
- ll2 61.756604801827855 125.13033859551807
-EPSG:20352
- ll -79.62184441392903 123.50414331869828
- en 389500.2640986342 1155306.1386557817
- ll2 -79.62184440375646 123.50414344972874
-EPSG:20353
- ll -53.158383237332885 129.4056061509446
- en 125975.75301348901 4095322.613753734
- ll2 -53.15838322215632 129.40560617453858
-EPSG:20354
- ll -20.554142515266932 141.13463921728385
- en 513912.5389237013 7727015.913356898
- ll2 -20.55414252474378 141.13463920996344
-EPSG:20355
- ll -29.70900698152436 150.896705742915
- en 876957.0004209547 6706913.128302505
- ll2 -29.709006989034748 150.89670573784684
-EPSG:20356
- ll 11.0032314890056 157.92139276416628
- en 1038152.9318072931 1.1220633335989214E7
- ll2 11.00323146095638 157.92139274201867
-EPSG:2039
- ll -48.11867815465852 41.52860806986737
- en 690206.5625039891 -8236585.563305399
- ll2 -48.118678147001425 41.52860807092371
-EPSG:2040
- ll -48.33869717635815 -8.854564118275386
- en 66218.96135971916 -5370779.099259536
- ll2 -48.338696762824384 -8.854564079812553
-EPSG:2041
- ll -84.62166617740932 -5.637957595839276
- en 472360.61385473155 -9397969.144094724
- ll2 -84.62166619690525 -5.637957166111218
-EPSG:2042
- ll 55.05261082313072 -9.297532372290354
- en 480958.9013639934 6100333.082014285
- ll2 55.052610810881866 -9.297532386814366
-EPSG:2043
- ll -78.68581710928726 -15.740211885686541
- en 352676.8579689504 -8743325.266916715
- ll2 -78.68581701475865 -15.740211772242022
-EPSG:20436
- ll 77.06419510809303 36.071016359318676
- en 576831.4992419686 8555983.472159615
- ll2 77.06419507459479 36.07101643527672
-EPSG:20437
- ll -24.915870429086027 37.90680925675501
- en 389700.5299168978 -2756079.661530402
- ll2 -24.915870429175985 37.906809256457855
-EPSG:20438
- ll 21.667077381828477 38.82435893920623
- en -139772.76127910765 2408731.074800461
- ll2 21.66707738082364 38.824358938078014
-EPSG:20439
- ll -88.84443690203383 45.89255831868856
- en 488552.2531459525 -9869505.565687928
- ll2 -88.84443684743096 45.89255894982368
-EPSG:2044
- ll -52.69189969279504 102.68076946738961
- en 1.8343151117382493E7 -5842841.200034324
- ll2 -52.6918996760761 102.68076945815734
-EPSG:20440
- ll 61.043801929350934 58.35886688188201
- en 573399.7908911789 6768421.197892254
- ll2 61.04380191674021 58.35886688220211
-EPSG:2045
- ll -42.027384490770224 115.80346047755798
- en 1.9897798310752783E7 -4665827.100872707
- ll2 -42.02738447684112 115.80346046781146
-EPSG:2046
- ll -69.36720040806796 18.12887534596293
- en 123050.16371348963 -7701532.180873478
- ll2 -69.3672004080288 18.128875345939964
-EPSG:2047
- ll 15.231480625220115 10.215880402097689
- en -730326.2970198313 1696000.8374614855
- ll2 15.231480623820476 10.215880405429957
-EPSG:2048
- ll 61.40528558499818 22.719349931490378
- en 198599.90211753527 6816318.230678535
- ll2 61.40528558479331 22.71934993140858
-EPSG:2049
- ll 83.8535999684766 16.789820482500016
- en -50303.30810574556 9317314.81253391
- ll2 83.85359996846879 16.789820482895454
-EPSG:20499
- ll 46.19571057280879 44.40381034378895
- en -8871.135110751493 5136966.416179022
- ll2 46.19571056220169 44.4038103529551
-EPSG:2050
- ll -86.1049258483307 27.293094099004556
- en 32542.3744908496 -9568133.101757484
- ll2 -86.10492584832895 27.293094098528176
-EPSG:2051
- ll -50.80936923888461 27.491934341945836
- en 175632.72345649387 -5633839.748483128
- ll2 -50.80936923886181 27.491934341952188
-EPSG:2052
- ll -15.431158072482404 27.450332899151704
- en 48335.540970409565 -1706748.1211290052
- ll2 -15.431158072482404 27.4503328991517
-EPSG:2053
- ll -79.92494821378824 28.426251952013605
- en -11209.432292132984 -8876814.872467985
- ll2 -79.92494821378904 28.426251952013605
-EPSG:20538
- ll -68.34641253352561 42.87475740946594
- en 412583.7859727001 -7583006.724926188
- ll2 -68.34641253088903 42.87475741492857
-EPSG:20539
- ll 51.459540154536285 55.17018676530747
- en 789734.545669517 5709130.309144975
- ll2 51.45954014396978 55.170186771253235
-EPSG:2054
- ll 44.71836975863346 31.07055805195192
- en 5590.465104189283 4953649.505697161
- ll2 44.71836975863355 31.070558051951917
-EPSG:2055
- ll -40.97821142341192 31.672055937013994
- en -111765.02554503367 -4539003.019707206
- ll2 -40.978211423411565 31.672055937013404
-EPSG:2056
- ll 83.1085029958378 116.84063637775435
- en 3627290.4812526656 6827965.316905305
- ll2 83.10850314764791 116.84063420014162
-EPSG:2057
- ll 27.395915538436984 52.37247701610036
- en 635516.175124729 3031491.838429557
- ll2 27.39591553424857 52.37247701647539
-EPSG:2058
- ll -60.84243236124101 40.93768015626828
- en 279298.11025342706 -6752077.813903801
- ll2 -60.842432308814715 40.93768017232181
-EPSG:2059
- ll -54.431308609343624 45.80485768998473
- en 163120.64298759343 -6043926.0035450775
- ll2 -54.43130856000708 45.80485769557153
-EPSG:2060
- ll 63.35994965868505 52.42980252696543
- en 271483.2176004627 7034009.17825556
- ll2 63.35994965874056 52.429802529388375
-EPSG:2061
- ll 13.576760983794301 68.35060224885997
- en 1079571.9572162805 1507464.7682730495
- ll2 13.576760994216071 68.35060224375422
-EPSG:2062
- ll 10.025113489108996 -38.47032422015185
- en -3609185.996156429 -2030744.7258775225
- ll2 10.025113489109033 -38.470324220151845
-EPSG:2066
- ll 53.424046924613776 -60.87179296835466
- en 126102.35352674258 2.343117406893364E7
- ll2 53.42404692461556 -60.871792968355145
-EPSG:2067
- ll -49.75555258724323 -62.49546663843551
- en 536172.077077852 -5511633.192788796
- ll2 -49.755552597785375 -62.49546658386155
-EPSG:2068
- ll 20.98589836743578 14.703855999434667
- en 793848.3061330917 2332079.591030046
- ll2 20.985898379280464 14.703856005687838
-EPSG:2069
- ll 61.702333109135424 11.649629804009301
- en 234442.2878908027 6843440.8631729875
- ll2 61.70233310837844 11.649629800245764
-EPSG:2070
- ll 47.49706567749877 8.552302256645907
- en -134990.84236353263 5271775.865522103
- ll2 47.49706567702475 8.552302256920507
-EPSG:2071
- ll 65.79416851367753 15.053655876406008
- en 202521.2872027036 7299348.756083438
- ll2 65.7941685135207 15.053655871827436
-EPSG:2072
- ll -60.553171366746895 18.77941111126441
- en 297675.62986312923 -6716393.974617166
- ll2 -60.553171325469656 18.779411150699964
-EPSG:2073
- ll -25.64687387311553 14.541880632263656
- en -247858.58870788693 -2844892.6784447078
- ll2 -25.646873841434033 14.541880650296493
-EPSG:2074
- ll -83.16528082424585 17.090177477092514
- en 148125.21864284246 -9239583.85181324
- ll2 -83.16528076824599 17.090177688061544
-EPSG:2075
- ll 47.63798677613906 16.64227032799929
- en -277572.4146369109 5297456.540734914
- ll2 47.6379867695441 16.64227033211506
-EPSG:2076
- ll 43.7312856356053 28.754213724880746
- en 502487.0605181813 4850524.18508327
- ll2 43.731285634570526 28.754213724625266
-EPSG:2077
- ll 82.67643375608324 3.166466840609454
- en 417198.88555627293 9184719.882475866
- ll2 82.67643375660036 3.1664668423803572
-EPSG:2078
- ll -1.39186475287336 21.86340062584914
- en 1265423.3472088422 -154810.0346591866
- ll2 -1.391864728829665 21.863400619775817
-EPSG:2079
- ll 52.40514305201961 22.90667100592659
- en 629753.60038323 5808000.206994615
- ll2 52.40514305054574 22.90667100426018
-EPSG:20790
- ll -76.09544846305192 -3.2902607790231695
- en 329893.66073770367 -1.2547160064721797E7
- ll2 -76.09544846528694 -3.2902607838729145
-EPSG:20791
- ll 43.701472941258174 -10.849063655664263
- en -218925.79181909488 451551.77817423904
- ll2 43.70147292283687 -10.849063639496055
-EPSG:2080
- ll 11.676353454254325 28.282362513626516
- en 639809.1349483674 1291252.6259311808
- ll2 11.676353469874519 28.282362516905284
-EPSG:2081
- ll 9.669074954069956 -63.633576943752104
- en 3089799.870238841 1.1076201953089286E7
- ll2 9.669074953853464 -63.63357694565951
-EPSG:2082
- ll 31.22167900924299 -74.2501450299185
- en 1999370.4474841442 1.3469720680161463E7
- ll2 31.221678971622698 -74.25014504686638
-EPSG:20822
- ll -23.13005368545636 -48.26391197419635
- en 780140.8496422811 7439615.267079668
- ll2 -23.130053684116717 -48.26391197475996
-EPSG:20823
- ll -45.31044435552 -48.821197428294006
- en 200364.40817626152 4975595.19253576
- ll2 -45.3104443259727 -48.82119744138626
-EPSG:20824
- ll -78.41213198938316 -35.9121690433603
- en 569086.0217449688 1293840.3451067004
- ll2 -78.41213189200057 -35.91216929222208
-EPSG:2083
- ll 77.85101693374702 -70.05836978740162
- en 2475040.4172891574 1.8647809643263485E7
- ll2 77.85101688615683 -70.05836990554498
-EPSG:2084
- ll 0.6633848720982911 -71.57402159623926
- en 213409.39245537075 1.0073306344989477E7
- ll2 0.6633848626506579 -71.57402160392537
-EPSG:2087
- ll -26.551132713216525 9.52655733077581
- en 253649.58822069177 -2939016.3030677014
- ll2 -26.55113268131985 9.526557353488133
-EPSG:2088
- ll -38.04204071092166 10.003530560104958
- en 412512.18215483055 -4211172.418608677
- ll2 -38.042040351052314 10.003530605110246
-EPSG:2089
- ll 75.84098048362591 44.079693130022214
- en 474871.53982945305 8417637.25267819
- ll2 75.84098048362686 44.0796931300222
-EPSG:2090
- ll -88.91488591492835 53.95952310326768
- en 506254.7654337686 -9876974.406286526
- ll2 -88.91488591492845 53.9595231032509
-EPSG:2093
- ll 56.01334751289855 108.81257514018193
- en 675350.8551338303 6213678.7010464715
- ll2 56.01334751258514 108.81257513967115
-EPSG:20934
- ll 2.6888269652216934 14.817897368062026
- en -188461.25234104227 1.029923889382061E7
- ll2 2.6888269361398764 14.8178973704653
-EPSG:20935
- ll 5.462982911260653 22.46210695579905
- en -3173.8123883285443 1.060603035998764E7
- ll2 5.462982869723425 22.462106953345508
-EPSG:20936
- ll 76.2546554996 35.666666395902226
- en 570698.5532500168 1.8465062493833832E7
- ll2 76.25465544797962 35.666666428723715
-EPSG:2094
- ll 17.93700992244402 106.61288800212441
- en 564881.9765739724 1983320.9867133356
- ll2 17.93700992219149 106.61288800221033
-EPSG:2095
- ll 20.20654055575004 -21.072039800702203
- en -135448.81075397984 2245975.8937672824
- ll2 20.206540553960437 -21.072039804525065
-EPSG:2096
- ll 21.563224223055528 128.75248404684734
- en 174366.39429270694 -1321851.8498458695
- ll2 21.56322422305553 128.75248404684734
-EPSG:2097
- ll 37.87235267175083 128.1588322681193
- en 301948.7787639922 486466.2412519914
- ll2 37.87235267175068 128.15883226811962
-EPSG:2098
- ll -71.48138922126786 120.4282268579265
- en 38027.13555469981 -1.1646618779585512E7
- ll2 -71.48138922096722 120.42822685865956
-EPSG:2099
- ll -9.452090155416826 51.36252902484826
- en 166016.65582361008 -3753761.624200605
- ll2 -9.452090155423331 51.362529024873794
-EPSG:2100
- ll 30.79391192216538 20.28950154600674
- en 144745.5623275878 3412364.2346325363
- ll2 30.793911927305953 20.289501548700116
-EPSG:2101
- ll -25.525766887755704 -49.630920168035374
- en 2691869.890196577 -4182898.2104512914
- ll2 -25.525766887755662 -49.630920168035374
-EPSG:2102
- ll 61.95007165489493 -130.98411776029553
- en -5032014.098508785 7437658.158199007
- ll2 61.9500716548949 -130.98411776029553
-EPSG:2103
- ll -38.74538396181825 -6.8360143451926945
- en 8775960.414795674 -4904578.411635304
- ll2 -38.74538396181819 -6.8360143451926945
-EPSG:21035
- ll 28.375181442644674 22.658038477266892
- en 74298.88906261098 1.314667802726166E7
- ll2 28.37518127520259 22.65803849859517
-EPSG:21036
- ll 51.192895243438215 32.92166730152587
- en 494444.53760819655 1.5671390470966915E7
- ll2 51.19289499170304 32.92166737878411
-EPSG:21037
- ll 8.599648931608158 40.44003386027512
- en 658368.4264131105 1.0951184651985053E7
- ll2 8.599648896063892 40.44003386946759
-EPSG:2104
- ll 28.858094552074945 -101.97374552348194
- en -3143284.9807573883 2230591.5504353642
- ll2 28.858094552074913 -101.97374552348194
-EPSG:2105
- ll 86.75288264703218 168.75559114922126
- en 362059.3493183478 1.4523064961036762E7
- ll2 86.75288264703434 168.75559115917616
-EPSG:2106
- ll -7.264038874941804 178.6819529002577
- en 644759.1965549085 4177125.157436555
- ll2 -7.264038874941276 178.68195290023962
-EPSG:2107
- ll 21.03533290925178 174.51820670540008
- en 49827.1768913109 7407498.188275045
- ll2 21.035332909230444 174.51820670538262
-EPSG:2108
- ll 11.256416078186803 171.98146809297944
- en -112877.919757283 6439696.4027455645
- ll2 11.256416078088424 171.98146809369925
-EPSG:2109
- ll -57.19513652360461 170.37007964809496
- en 166860.45737104543 -1214692.5482616804
- ll2 -57.1951365233071 170.37007964817593
-EPSG:21095
- ll -27.324475575258383 31.777393992586855
- en 972877.5575097341 -3031145.70497565
- ll2 -27.324475571305847 31.77739398647717
-EPSG:21096
- ll 44.71726758545876 36.99821819283779
- en 816568.9652285165 4959480.241680186
- ll2 44.717267340848984 36.99821825917604
-EPSG:21097
- ll -76.02971597813931 37.88592310808029
- en 469882.28941041284 -8438545.384215629
- ll2 -76.02971597595918 37.88592308380601
-EPSG:2110
- ll -86.35083816341523 179.0934142010803
- en 424535.1369155488 -4419748.935553131
- ll2 -86.35083816341505 179.09341420101353
-EPSG:2111
- ll -2.382361205571655 171.44799326726204
- en -49725.59994380985 4992304.496664562
- ll2 -2.3823612055623893 171.44799326779685
-EPSG:2112
- ll 65.72464096647445 171.6232331134478
- en 215424.54078161647 1.2630322001285011E7
- ll2 65.72464096622366 171.62323311365287
-EPSG:2113
- ll -58.1174519989175 173.31572430491244
- en 313913.8422638817 -1071282.432033917
- ll2 -58.11745199891708 173.31572430491235
-EPSG:2114
- ll 61.28460883718057 170.0222757187431
- en 257944.88221404946 1.2108982285742598E7
- ll2 61.284608837154046 170.02227571874533
-EPSG:21148
- ll -36.521383119929325 109.80574381824486
- en 930216.3079671247 5947519.438277382
- ll2 -36.52138308465639 109.80574383378438
-EPSG:21149
- ll -81.78222522639587 109.6648515835306
- en 478589.93501828355 919492.3409997337
- ll2 -81.78222469661301 109.6648522186128
-EPSG:2115
- ll 25.95887736188824 169.75532033862282
- en 44934.16609874251 8248141.449560183
- ll2 25.958877361843673 169.75532033853142
-EPSG:21150
- ll 80.71493828367053 118.41491906788913
- en 525454.8668999515 1.896147113909603E7
- ll2 80.71493765069798 118.414919106976
-EPSG:2116
- ll -68.38200430303458 170.92034676701388
- en 351116.504531955 -2216213.2543107173
- ll2 -68.38200430303533 170.92034676701397
-EPSG:2117
- ll -12.786819741092017 175.11859966159292
- en 784310.2679461152 4013840.0396428606
- ll2 -12.786819741074662 175.1185996614697
-EPSG:2118
- ll 6.173558090908855 173.6627816064038
- en 633921.7645705326 6171820.45973937
- ll2 6.173558090908496 173.6627816063893
-EPSG:2119
- ll -59.93575734084145 175.8277712003271
- en 557504.7554018062 -1122109.7453218468
- ll2 -59.93575734080042 175.8277712003238
-EPSG:2120
- ll 14.042869916653387 169.07873109099438
- en -110686.77770085627 6959243.658255659
- ll2 14.04286991653342 169.07873109146996
-EPSG:2121
- ll 24.29137192536696 173.67698686583833
- en 673897.3891950354 8240282.362031938
- ll2 24.29137192535951 173.6769868658518
-EPSG:2122
- ll 67.64311627969113 173.53405206594715
- en 538942.9947679257 1.308469020841509E7
- ll2 67.64311627962974 173.53405206591407
-EPSG:2123
- ll -78.3084285959083 173.01127697332925
- en 499602.7188851227 -3028667.571523375
- ll2 -78.30842859583645 173.01127697275874
-EPSG:2124
- ll 40.8164613177307 168.1188726777028
- en 11163.993725777545 1.015875302370369E7
- ll2 40.81646131705356 168.11887267739684
-EPSG:2125
- ll 87.49519683166139 171.7990692760576
- en 402140.51639741875 1.5368094883260123E7
- ll2 87.49519683166162 171.79906927605754
-EPSG:2126
- ll 54.2180527801668 167.9065232230046
- en 194504.44693114868 1.1733257322709119E7
- ll2 54.21805278007382 167.9065232230027
-EPSG:2127
- ll 3.812470618001342 164.23445494186032
- en -182067.42695034062 6178833.721256652
- ll2 3.8124706179204204 164.23445494420378
-EPSG:2128
- ll -60.69626503692717 166.32849712016102
- en 286936.2536439521 -933730.4551663282
- ll2 -60.69626503692138 166.3284971201608
-EPSG:2129
- ll 7.176549225886035 163.5489402120432
- en -63165.18878317304 6643284.245073052
- ll2 7.176549225853186 163.54894021258784
-EPSG:21291
- ll -34.58447750922239 -58.22899764895362
- en 745702.0035089746 -3833295.479564142
- ll2 -34.584477178602064 -58.228997510927506
-EPSG:21292
- ll -9.364677676696488 -63.80216007843975
- en -436584.1552512359 -2420882.4021814778
- ll2 -9.364677526253763 -63.8021600277002
-EPSG:2130
- ll 19.386844152598115 174.34061106122917
- en 790175.348653814 8024336.287862087
- ll2 19.38684415256344 174.34061106122894
-EPSG:2131
- ll 54.04927460546051 167.28829618836005
- en 203920.25639974012 1.1875786121117963E7
- ll2 54.04927460539193 167.28829618835601
-EPSG:2132
- ll -26.924236800607865 172.70436374627738
- en 833447.1104830012 2976064.8239109637
- ll2 -26.92423680043701 172.7043637466217
-EPSG:2133
- ll 63.52024130285068 170.08346576728312
- en 752697.5718794239 1.705359838097709E7
- ll2 63.520241301670325 170.08346576567428
-EPSG:2134
- ll 47.28326643600201 175.95105179426963
- en 874375.5882409135 1.5248541816111801E7
- ll2 47.2832664346761 175.95105179407676
-EPSG:2135
- ll 12.206030829901039 173.17880337261892
- en 84063.84938233881 1.1352271986423912E7
- ll2 12.206030829873567 173.17880337282125
-EPSG:2136
- ll -69.3748912512753 3.5548413127237364
- en 1486967.883144136 -2.6968252505716458E7
- ll2 -69.37489123241534 3.554841373793569
-EPSG:2137
- ll 46.168388977482834 2.034228031674459
- en 734207.024952417 5116972.536255464
- ll2 46.168388927923395 2.034228017988508
-EPSG:2138
- ll 14.62662453077148 6.494247531714905
- en 8049981.0491059655 1127048.6987112535
- ll2 14.626624530771503 6.494247531714905
-EPSG:21413
- ll -43.643021979916966 75.26876374778625
- en 1.3521740778110147E7 -4834117.039992687
- ll2 -43.64302196591424 75.2687637542337
-EPSG:21414
- ll -5.671636399877855 79.58263063959065
- en 1.4343011194595017E7 -627263.5344321652
- ll2 -5.671636404329951 79.5826306376177
-EPSG:21415
- ll -6.650531033712852 86.7376362744918
- en 1.5471012947003061E7 -735331.4511664333
- ll2 -6.650531038663728 86.7376362732851
-EPSG:21416
- ll 61.75229865874519 90.08433390800278
- en 1.6346030571859332E7 6852798.164614177
- ll2 61.752298663653285 90.08433390637406
-EPSG:21417
- ll 25.048066196864312 98.31098913361133
- en 1.7430462471840214E7 2771611.857023553
- ll2 25.04806619621375 98.31098913430502
-EPSG:21418
- ll -73.58661715514747 108.18770026404945
- en 1.860051352144012E7 -8171841.592628833
- ll2 -73.58661712016936 108.18770023992468
-EPSG:21419
- ll -48.82474018279559 115.87565929688485
- en 1.9857916839902468E7 -5421539.554451338
- ll2 -48.82474016380192 115.87565928806708
-EPSG:21420
- ll 83.39297117187314 115.25542199054051
- en 2.0477528043057516E7 9264397.08046682
- ll2 83.39297116956696 115.25542198296897
-EPSG:21421
- ll 86.11675658520755 119.41564994125693
- en 2.1472833887362137E7 9569115.439914845
- ll2 86.1167565815831 119.4156499170606
-EPSG:21422
- ll 34.45064402218459 134.9164491073602
- en 2.3043947911077548E7 3829632.6922588614
- ll2 34.450644020344875 134.91644911517648
-EPSG:21423
- ll -14.572998727378916 136.29090364173513
- en 2.363902160663962E7 -1612055.2370753102
- ll2 -14.572998725080529 136.2909036396012
-EPSG:21453
- ll -52.03707436627811 71.03526137832799
- en 228038.95282566786 -5774827.549605646
- ll2 -52.03707434554444 71.0352613914129
-EPSG:21454
- ll 57.14298930138227 79.09175962570139
- en 384526.4633640653 6337480.499554387
- ll2 57.142989306015494 79.09175962109371
-EPSG:21455
- ll -18.129343880404505 82.54634065728465
- en 28319.393755812373 -2010918.529307532
- ll2 -18.12934388205197 82.54634065682944
-EPSG:21456
- ll 16.94437152548818 86.41326549024278
- en -202880.16298113135 1886028.7933634832
- ll2 16.94437152137596 86.4132654893557
-EPSG:21457
- ll 57.01796363604103 105.39548554181525
- en 888139.6321522327 6340139.148237958
- ll2 57.01796363512947 105.39548553431703
-EPSG:21458
- ll 86.15318958467492 99.29782620199835
- en 457316.76117184537 9574443.364819456
- ll2 86.15318958086954 99.29782620465456
-EPSG:21459
- ll -62.99803043106117 105.20264723391085
- en 206461.10164549644 -7001359.557579583
- ll2 -62.99803040023141 105.20264723026521
-EPSG:21460
- ll -62.41602074692325 111.93645555664955
- en 238438.00164451532 -6933499.465609363
- ll2 -62.41602071805726 111.93645554330902
-EPSG:21461
- ll 60.451282342690604 116.0715275564625
- en 119078.1837315929 6724456.600959181
- ll2 60.45128233821815 116.0715275860181
-EPSG:21462
- ll 20.335145184237277 124.49819847488065
- en 29453.20237256534 2255971.5222289297
- ll2 20.335145182194562 124.4981984801476
-EPSG:21463
- ll 28.512663116587305 135.21920903883827
- en 521360.80588895193 3155345.2345422003
- ll2 28.512663115930778 135.21920904452602
-EPSG:21500
- ll 34.63413283469458 73.26767293538526
- en 5793945.500688889 1172550.1658262126
- ll2 34.63413283469475 73.26767293538526
-EPSG:2154
- ll 44.35373092260113 1.9299510493135594
- en 614710.6274961736 6362211.136518341
- ll2 44.35373092260116 1.9299510493135592
-EPSG:2157
- ll -5.751020777053228 -9.215351004729513
- en 465398.45523248496 -5815163.371912344
- ll2 -5.75102077705321 -9.215351004728644
-EPSG:2158
- ll -50.97844630648193 -11.323674705726056
- en 336882.3756651749 -5649998.442295333
- ll2 -50.978446306467 -11.32367470573062
-EPSG:2159
- ll -6.361943206854562 -5.70209508787454
- en 2790654.5483069266 -4740554.812764277
- ll2 -6.3619432063938826 -5.702095094542285
-EPSG:2160
- ll 21.040434302078395 -8.974951175480577
- en 1831986.0251842993 5827394.157126937
- ll2 21.040434302067283 -8.974951175472999
-EPSG:2161
- ll -10.089312746137566 -17.1474818632898
- en 264677.05001473275 -1116163.726082323
- ll2 -10.089312746081017 -17.147481863283176
-EPSG:2162
- ll -86.29992623088759 -8.515390793827331
- en 503501.20662491606 -9584711.243928792
- ll2 -86.29992624801255 -8.515390861170399
-EPSG:2163
- ll 44.66749717782338 6.692235817635861
- en 5277450.324284445 4969949.446091989
- ll2 44.667497177823364 6.692235817635876
-EPSG:2164
- ll 60.077506967696365 -9.97848825360347
- en 223086.44452795933 6670143.571787083
- ll2 60.07750695452536 -9.9784882686103
-EPSG:2165
- ll -20.090029967247318 -0.022264286261782118
- en 1020845.4837172672 -2229660.4531230754
- ll2 -20.090029784518972 -0.022264269715535075
-EPSG:2169
- ll -25.331769936718317 10.159692917009927
- en 482119.35373289685 -8231309.9117593
- ll2 -25.331769926208146 10.159692901403039
-EPSG:2172
- ll -51.69233290935715 -13.166140956198703
- en -2011985.0422287472 -1.0590271159121497E7
- ll2 -51.69233290953135 -13.16614089368341
-EPSG:2173
- ll 52.943076476888365 7.993225020308358
- en 2896338.056056614 5966004.455788725
- ll2 52.94307648025427 7.993225038453287
-EPSG:2174
- ll 25.035256161176065 5.275425805569483
- en 2489852.166793732 2693906.710931456
- ll2 25.035256170665715 5.275425826351201
-EPSG:2175
- ll -63.86497464859961 23.58436139590041
- en 464450.07758284995 -1.1792995939565321E7
- ll2 -63.864974634110844 23.584361471094034
-EPSG:2176
- ll 53.07258325461326 14.905633369804125
- en 5493675.603954346 5882249.140582492
- ll2 53.07258325461325 14.90563336980413
-EPSG:2177
- ll 52.68437294746797 18.521841170172493
- en 6535287.077942027 5839174.5192899695
- ll2 52.68437294746796 18.521841170172493
-EPSG:2178
- ll 52.19269518832873 20.583978066870035
- en 7471553.531709745 5784420.752842553
- ll2 52.19269518832871 20.583978066870028
-EPSG:21780
- ll 53.069652353015584 -27.44982411724837
- en -2283748.1928997706 1197581.450703109
- ll2 53.06965234881374 -27.449824103601596
-EPSG:21781
- ll 46.10539428035796 10.09189020217092
- en 805122.6285901767 109456.51907998892
- ll2 46.105394289534146 10.091890212399738
-EPSG:21782
- ll -7.026443814174314 -80.46913838032242
- en -1.0422466675605848E7 -682780.029292994
- ll2 -7.026443420856668 -80.4691377243229
-EPSG:2179
- ll 51.215449887260874 22.58214163169756
- en 8400941.08821489 5676573.045220528
- ll2 51.21544988726007 22.582141631697148
-EPSG:2180
- ll 50.07820346969967 21.404973549201806
- en 672017.1666306946 248430.389107964
- ll2 50.07820346968121 21.404973549207817
-EPSG:21818
- ll 19.212422082454978 -77.67456305692676
- en 218408.93231620913 2126805.7530227355
- ll2 19.212422049621058 -77.67456301228755
-EPSG:2188
- ll -54.48090709261176 -36.52230598261329
- en 272204.53240329516 -6042789.837617826
- ll2 -54.48090709378816 -36.52230599704183
-EPSG:2189
- ll -52.376914339248685 -23.81084399039327
- en 716967.8475138976 -5807801.203213731
- ll2 -52.37691432798964 -23.810844022103016
-EPSG:21896
- ll -23.917950349534536 -78.8440209784989
- en 820096.6778701241 -2155593.5605035494
- ll2 -23.917950282804828 -78.84402105971695
-EPSG:21897
- ll 59.401440382580205 -69.75845949080912
- en 1245038.1977216315 7087025.799822189
- ll2 59.40144035957998 -69.75845929463455
-EPSG:21898
- ll 68.03249767662211 -76.28875216400228
- en 782339.2290909835 8050324.23976341
- ll2 68.03249768254936 -76.28875187657042
-EPSG:21899
- ll 25.736902272780114 -73.67165284330443
- en 438075.31615601084 3351380.6751176594
- ll2 25.736902237949437 -73.6716527916094
-EPSG:2190
- ll 26.06372480690625 -30.680185819390577
- en 131702.41995050653 2887898.28614226
- ll2 26.06372480264318 -30.680185820483015
-EPSG:2193
- ll -27.110449955793825 170.7813734539947
- en 1380061.6513656338 6999390.157026701
- ll2 -27.110449955790354 170.78137345398795
-EPSG:2195
- ll -22.37001261779804 -167.04481103711694
- en 907421.8008656071 7520859.1118347915
- ll2 -22.37001261773415 -167.0448110370224
-EPSG:2196
- ll -43.704419003270445 9.503165091182925
- en 200255.1040523406 -4840738.5110666
- ll2 -43.70441900327051 9.503165091182927
-EPSG:2197
- ll -73.72643264707537 9.753321637151355
- en 429717.79303946596 -8185705.941638974
- ll2 -73.72643264707321 9.753321637152602
-EPSG:2198
- ll 34.08664842738884 10.643619269575883
- en 497800.70875422825 3781852.014855246
- ll2 34.08664842707734 10.643619269180165
-EPSG:2200
- ll -82.2903222982444 -105.8433916046175
- en -2791797.125667985 -2.65434173684042E7
- ll2 -82.29032229824435 -105.84339160461747
-EPSG:2201
- ll -33.10482120870478 -69.92602447445725
- en 973679.7517164008 -3674381.1342126373
- ll2 -33.104821207986376 -69.92602447355631
-EPSG:2202
- ll -6.270085675817128 -72.14366429986917
- en 152095.93761812028 -694103.7469929807
- ll2 -6.27008567581254 -72.14366429975216
-EPSG:2203
- ll 37.960417331092174 -69.15386882276509
- en -40837.73898311437 4219327.899086797
- ll2 37.96041732789142 -69.15386882356358
-EPSG:22032
- ll 65.90859092032136 4.641191915421465
- en 301937.1942600148 1.731660728150122E7
- ll2 65.90859075206006 4.641191420140437
-EPSG:22033
- ll 62.75495457683746 12.361205345748367
- en 365578.4105871623 1.6961031619209636E7
- ll2 62.754954408926636 12.361204917211747
-EPSG:2205
- ll 62.970529890368056 -133.94499958084594
- en -2179179.55049314 3671139.7377187773
- ll2 62.97052989036802 -133.94499958084594
-EPSG:2206
- ll -37.38090236084918 23.129466833831778
- en 9157171.843408845 -4145806.858286882
- ll2 -37.3809023383544 23.129466853098272
-EPSG:2207
- ll 33.62584668597728 30.618047723314355
- en 1.0557389601311704E7 3722505.4919642922
- ll2 33.62584669454254 30.61804772683674
-EPSG:2208
- ll 62.22058469934237 35.95213646624305
- en 1.1653563941430524E7 6905201.497394327
- ll2 62.220584699630116 35.95213646732437
-EPSG:2209
- ll -74.35537141283429 39.45379773217381
- en 1.2603983024482371E7 -8258127.91030876
- ll2 -74.35537137469913 39.45379775834071
-EPSG:22091
- ll -19.950418956345032 8.322365185101045
- en 167695.4561091435 7791079.255690349
- ll2 -19.950418954116866 8.322365213193702
-EPSG:22092
- ll -80.59365870831749 18.357402157376807
- en 616099.4490249708 1046026.0942724477
- ll2 -80.59365871091777 18.357402071410547
-EPSG:2210
- ll 12.614147004396756 42.246985495902486
- en 1.3852983361222075E7 1397355.1603448384
- ll2 12.614147021438425 42.246985497708664
-EPSG:2211
- ll -25.465057535066855 41.96518477885279
- en 1.4496513266519045E7 -2817515.7633876107
- ll2 -25.46505751241875 41.96518478271255
-EPSG:2212
- ll -67.4812334954718 50.03243389773279
- en 1.571498733489097E7 -7496842.812886256
- ll2 -67.48123346088076 50.032433892913794
-EPSG:2213
- ll -70.18231904508299 29.055331977380284
- en 464257.2619059797 -7786482.303389978
- ll2 -70.1823190450839 29.055331977380266
-EPSG:2215
- ll 58.18876978956817 14.357537151327053
- en 814934.9233927925 6462205.408119309
- ll2 58.18876970776343 14.357537069612372
-EPSG:2216
- ll -44.177236245092466 -47.111093545103174
- en 810669.1924844069 -4898959.3075461555
- ll2 -44.177236226759646 -47.11109368996147
-EPSG:2217
- ll 38.6459281842623 -38.82734893494482
- en 1037180.0008622071 4295923.808439902
- ll2 38.645928229026815 -38.82734898342052
-EPSG:22171
- ll 75.95326519773462 -72.49440330880937
- en 1486599.725613071 1.8435365710161075E7
- ll2 75.95326519773558 -72.49440330880937
-EPSG:22172
- ll -55.554335144566025 -73.38106204530436
- en 2223613.3129933234 3834301.003443685
- ll2 -55.554335143906975 -73.38106204505222
-EPSG:22173
- ll 52.04866716535031 -69.34079076290591
- en 3270841.585044858 1.577599508359756E7
- ll2 52.04866716521678 -69.34079076291381
-EPSG:22174
- ll 9.653882045974328 -64.74662964719617
- en 4308273.239569552 1.107002780008821E7
- ll2 9.653882045974159 -64.74662964719175
-EPSG:22175
- ll 74.19422346725904 -63.861560515095654
- en 5382625.218107888 1.8242774545366257E7
- ll2 74.19422346718528 -63.86156051492928
-EPSG:22176
- ll -10.42858427421261 -57.60566507650588
- en 6433682.96687862 8848642.081707187
- ll2 -10.428584274212614 -57.60566507650588
-EPSG:22177
- ll 19.009755074407778 -53.283479770356486
- en 7575441.016667621 1.2104867316505563E7
- ll2 19.00975507440774 -53.28347977035649
-EPSG:22181
- ll 30.8068450623218 -66.13048119638263
- en 2062161.0650040687 1.3426304739786487E7
- ll2 30.80684506089554 -66.13048119442077
-EPSG:22182
- ll -19.636871050492474 -75.09112291204207
- en 1860193.3748161732 7818339.244402799
- ll2 -19.636871049673953 -75.0911229123638
-EPSG:22183
- ll 58.253323808075265 -68.1479488954621
- en 3373897.0700026946 1.6463474011810143E7
- ll2 58.253323808067066 -68.14794889546287
-EPSG:22184
- ll 65.19028385474229 -56.90901297829567
- en 4784951.328477707 1.7248286273942556E7
- ll2 65.19028385167081 -56.90901298694793
-EPSG:22185
- ll -12.457264236455686 -53.68733073051621
- en 6187556.916068984 8616101.951276388
- ll2 -12.457264235690815 -53.6873307341757
-EPSG:22186
- ll -5.0978059572240255 -54.66083887083186
- en 6759442.504219738 9437793.833055662
- ll2 -5.097805957223447 -54.66083887085744
-EPSG:22187
- ll 59.63061327581795 -52.105019739485414
- en 7606906.909196248 1.6616411017969074E7
- ll2 59.630613275814575 -52.10501973948504
-EPSG:2219
- ll -40.2793010615588 -64.39496270401956
- en 891548.0154388745 -4468941.0652551465
- ll2 -40.27930106090324 -64.39496270368954
-EPSG:22191
- ll -53.69228939308403 -72.26232007567121
- en 1482770.255937192 4050462.7036025194
- ll2 -53.69228939308102 -72.26232007194471
-EPSG:22192
- ll 57.208872769672894 -69.47989430844237
- en 2471088.1869876436 1.6345590503008159E7
- ll2 57.20887274269913 -69.47989426959091
-EPSG:22193
- ll 17.639306727489625 -67.07810796007442
- en 3385665.7722966867 1.1953610245029045E7
- ll2 17.63930671542525 -67.07810794830598
-EPSG:22194
- ll 35.24793659647342 -60.75035844731445
- en 4704835.9263783675 1.3906674254410712E7
- ll2 35.24793658031474 -60.75035843472707
-EPSG:22195
- ll -39.399157285924545 -63.18641310601228
- en 5225562.105199387 5634511.183769193
- ll2 -39.39915728651639 -63.186413104562774
-EPSG:22196
- ll 69.76157592023898 -60.624038985779386
- en 6360147.693848273 1.7748874425895836E7
- ll2 69.76157588014559 -60.624038938087985
-EPSG:22197
- ll -57.49140505093366 -58.399666827795286
- en 7236305.911816453 3618994.580758934
- ll2 -57.491405050003415 -58.39966682658842
-EPSG:2220
- ll -35.40019932566316 -67.21102782964711
- en 117503.06388777716 -3925574.9424165534
- ll2 -35.40019932538233 -67.21102782996486
-EPSG:2222
- ll -12.763351397105737 -115.3782301564776
- en -1158791.2101464916 -1.590460855162457E7
- ll2 -12.763351396890993 -115.37823015541076
-EPSG:2223
- ll 35.16838839775083 -104.9191393477405
- en 2793019.3312142896 1590413.117384974
- ll2 35.16838839212364 -104.9191393463758
-EPSG:22234
- ll -45.33348318666987 26.330813411189496
- en 917752.2729237496 4966447.903320664
- ll2 -45.33348318548068 26.330813412669592
-EPSG:22235
- ll -43.37379803061062 28.148143523840712
- en 593049.1882324546 5197323.212594636
- ll2 -43.37379803126275 28.14814352527755
-EPSG:2224
- ll 30.33335487211251 -111.35225333204043
- en 1456530.0863201527 -234462.67430662725
- ll2 30.333354872106252 -111.35225333202708
-EPSG:2225
- ll 15.332155565357134 -104.9434637463373
- en 1.3101547254359495E7 -6739382.738089621
- ll2 15.33215556535714 -104.9434637463373
-EPSG:2226
- ll 88.88436651838292 -102.55565597624482
- en 7033938.067397726 2.5778511867862917E7
- ll2 88.88436651838302 -102.55565597624481
-EPSG:2227
- ll 22.812570160135934 -101.15751848716701
- en 1.3241240890110865E7 -2703653.726227021
- ll2 22.812570160135945 -101.15751848716701
-EPSG:22275
- ll -36.965343117479925 10.546281811223688
- en -396657.18130332656 -4101662.1695132744
- ll2 -36.965343117583174 10.546281816394695
-EPSG:22277
- ll 19.940590928937397 13.147580315875029
- en -403455.54852312105 2210675.3845710442
- ll2 19.94059081774888 13.147580296345359
-EPSG:22279
- ll -37.58372512080264 12.776351149293554
- en -549936.930810728 -4179266.6640651543
- ll2 -37.583725117960576 12.776351153167232
-EPSG:2228
- ll 27.16912731177669 -90.55757362958285
- en 1.5794753637333356E7 32907.67638112905
- ll2 27.169127311776695 -90.55757362958283
-EPSG:22281
- ll -54.52716380495047 18.1928330078629
- en -181673.38583013212 -6047940.079521176
- ll2 -54.527163805864305 18.192833011327426
-EPSG:22283
- ll 61.68675472087634 18.23750218229558
- en -251879.2025016328 6851244.332980787
- ll2 61.68675452088348 18.237502095749075
-EPSG:22285
- ll -38.60408149734718 18.90664344458118
- en -530959.12482666 -4291916.452569639
- ll2 -38.604081494598624 18.906643447090534
-EPSG:22287
- ll 5.483595748189487 23.34749804718799
- en -404977.4216267404 607883.8006885241
- ll2 5.483595706405691 23.347498041974525
-EPSG:22289
- ll 87.98100605020124 31.367686491617818
- en 9342.068247880474 9776398.901989222
- ll2 87.98100615288709 31.367686036679334
-EPSG:2229
- ll 2.819430876795966 -125.03363111684806
- en 3598545.6037729685 -9987323.780532748
- ll2 2.819430876796016 -125.03363111684806
-EPSG:22291
- ll -55.758714829465944 26.561805874422582
- en -278509.96625819406 -6190337.552694183
- ll2 -55.75871482930988 26.56180587643683
-EPSG:22293
- ll -38.345203782478194 28.473152351072684
- en -395813.635124865 -4255234.998919626
- ll2 -38.34520378210723 28.473152352021287
-EPSG:2230
- ll 38.355103816165254 -55.12999135437619
- en 2.3166232948588092E7 8906351.18113657
- ll2 38.35510381616535 -55.12999135437618
-EPSG:2231
- ll 50.915354134102486 -34.44005965289844
- en 1.796866368909745E7 1.1586971143583156E7
- ll2 50.91535413410248 -34.44005965289844
-EPSG:2232
- ll 67.59551717646309 -25.70629754379192
- en 1.442915585292427E7 1.7762172276848868E7
- ll2 67.5955171764631 -25.706297543791905
-EPSG:2233
- ll 59.11084019067334 -91.87052134722518
- en 5764330.946961471 9590747.576381816
- ll2 59.110840190673315 -91.87052134722518
-EPSG:22332
- ll 66.1239700718618 15.752072498271874
- en 804447.9611016758 7349741.386936734
- ll2 66.1239700436704 15.75207244585151
-EPSG:2234
- ll 65.03883981336904 -131.52789583979032
- en -8304298.490555784 1.291291588521626E7
- ll2 65.03883981336904 -131.52789583979032
-EPSG:2235
- ll 86.71396388138851 -77.66765085519751
- en 608897.2773600431 1.7807368511254746E7
- ll2 86.7139638813885 -77.6676508551961
-EPSG:2236
- ll 15.732162580414382 -82.08900290698196
- en 273247.7055766159 -3122851.4416079456
- ll2 15.732162580414368 -82.08900290698176
-EPSG:2237
- ll -26.51629160024001 -85.5117042364798
- en -492600.38815061055 -1.8473414423845448E7
- ll2 -26.516291600196034 -85.51170423657163
-EPSG:2238
- ll 65.61919048119145 -112.62110606098511
- en -3415599.046355243 1.506911245835736E7
- ll2 65.61919048119145 -112.62110606098513
-EPSG:2239
- ll -47.912507444542236 -83.65617852847491
- en 290908.9553276582 -2.831038931474761E7
- ll2 -47.91250744454122 -83.65617852847562
-EPSG:22391
- ll 73.27841741086128 60.5504959105335
- en 2603641.3974965117 5407931.265439697
- ll2 73.2784173991137 60.55049572007269
-EPSG:22392
- ll -11.323042152919378 66.30326620209814
- en 8302914.651809111 -2987692.397844944
- ll2 -11.323042088459188 66.30326623148488
-EPSG:2240
- ll -47.355842780697735 -85.66560895467248
- en 1925087.7752329088 -2.810740413410382E7
- ll2 -47.35584278069669 -85.66560895467325
-EPSG:2241
- ll 87.27003886201604 -108.11335223427565
- en 726848.3491481342 1.6676240622106286E7
- ll2 87.2700388620156 -108.1133522345603
-EPSG:2242
- ll 53.51559496964637 -115.29598220144887
- en 1358389.9192292553 4324467.620423065
- ll2 53.51559496964591 -115.29598220144906
-EPSG:2243
- ll 64.43144065203774 -122.15579539472321
- en 1613578.8782886683 8361964.095231803
- ll2 64.43144064767891 -122.15579538131686
-EPSG:2246
- ll 10.63983862462667 -80.97755268377837
- en 2950051.3006774015 -1.01217277974245E7
- ll2 10.639838624626687 -80.97755268377837
-EPSG:2247
- ll 29.331385824131445 -143.1829040018168
- en -1.5716054909140555E7 4528007.494084357
- ll2 29.33138582413145 -143.1829040018168
-EPSG:2248
- ll 43.62378774433168 -45.307964935605725
- en 9565297.150027439 3619404.2299481425
- ll2 43.6237877443317 -45.307964935605725
-EPSG:2249
- ll 86.44362576118863 10.26260911617797
- en 3832160.903926445 2.377918727624136E7
- ll2 86.44362576118867 10.262609116177984
-EPSG:2250
- ll 12.263805199451546 -150.26979267936704
- en -2.6061254965215623E7 2847768.327922252
- ll2 12.263805199451575 -150.26979267936701
-EPSG:2251
- ll 80.08296854906888 -129.73464785510632
- en 2.2840681222652406E7 1.4894328875907026E7
- ll2 80.08296854906891 -129.73464785510632
-EPSG:2252
- ll 19.211740285073965 -40.30588310802736
- en 3.553305487336423E7 -4652424.084380555
- ll2 19.21174028507398 -40.30588310802735
-EPSG:22521
- ll 20.831511661424855 -55.53719657323321
- en 652290.2964091094 1.2304195365167752E7
- ll2 20.83151166145332 -55.537196573318234
-EPSG:22522
- ll 37.107259186698656 -51.598917385140076
- en 446838.82914515946 1.4106939965428313E7
- ll2 37.107259185952636 -51.59891738434584
-EPSG:22523
- ll 46.27341564496575 -42.6415280130184
- en 681744.633362316 1.512713025446536E7
- ll2 46.273415642625935 -42.6415280124937
-EPSG:22524
- ll -49.689973249678886 -40.250552950221774
- en 409800.4770827426 4495092.750988216
- ll2 -49.68997324495614 -40.250552949969155
-EPSG:22525
- ll 14.764275694092419 -36.26668233376684
- en 148229.59100734687 1.1634812231048506E7
- ll2 14.764275694422974 -36.26668233343936
-EPSG:2253
- ll 87.28113473768533 -5.564636463900655
- en 1.5633040588055117E7 2.1219668505255215E7
- ll2 87.28113473768533 -5.564636463900641
-EPSG:2254
- ll -78.57925559046853 -88.12628317705585
- en 1035544.0454163358 -3.93394587774514E7
- ll2 -78.57925559046855 -88.12628317705585
-EPSG:2255
- ll 84.37752009314048 -93.07066061182935
- en 2198351.8094550236 2.0044927395092443E7
- ll2 84.37752009313996 -93.07066061182118
-EPSG:2256
- ll 87.11231341000213 -173.40196277612182
- en 61739.905153846456 1.8741123057235185E7
- ll2 87.11231341000219 -173.40196277612188
-EPSG:2257
- ll -61.49657815004569 -104.4886950457754
- en 514192.1272885014 -3.363143225774102E7
- ll2 -61.496578150045664 -104.4886950457754
-EPSG:2258
- ll -77.13033493360825 -106.98810747251746
- en 1580189.3918856743 -3.9352393485416904E7
- ll2 -77.13033493360825 -106.98810747251746
-EPSG:2259
- ll 62.71432543306511 -101.53037780363232
- en 3779851.3227800378 1.1617573147371812E7
- ll2 62.71432542864605 -101.53037781470012
-EPSG:2260
- ll -0.9306651342020444 -75.83052681540983
- en 6257.390285569859 -1.444385899115477E7
- ll2 -0.9306651342020458 -75.8305268154083
-EPSG:2261
- ll 75.76399129461609 -80.34860135556418
- en 481202.49087162036 1.307651654047681E7
- ll2 75.7639912945671 -80.34860135542915
-EPSG:2262
- ll 86.73032567198314 -82.38345099878646
- en 1068930.3607703766 1.7085639971591707E7
- ll2 86.73032567198253 -82.38345099862765
-EPSG:2263
- ll 79.86048213607751 -129.3369497587286
- en -3918783.6010645665 1.7782942561614368E7
- ll2 79.86048213607751 -129.33694975872857
-EPSG:2264
- ll 22.52762702924948 -151.90573014695264
- en -2.0986079296104766E7 4725030.609946425
- ll2 22.527627029249505 -151.90573014695264
-EPSG:2265
- ll 70.47493390459411 -121.63130651919292
- en -846008.8011071506 9218432.366116997
- ll2 70.47493390459411 -121.63130651919292
-EPSG:2266
- ll 2.5173585191193926 -32.710776865253735
- en 3.0326303143088847E7 -4181167.0562277213
- ll2 2.5173585191194174 -32.710776865253735
-EPSG:2267
- ll 12.250189916482142 -163.42973637956814
- en -2.1491704758713547E7 -292083.638493773
- ll2 12.25018991648216 -163.42973637956814
-EPSG:2268
- ll 73.63387346057772 -166.31539881155564
- en -7166912.295506647 1.9465828997635495E7
- ll2 73.63387346057772 -166.31539881155567
-EPSG:2269
- ll 25.078917220047828 -172.23413965535394
- en -8700137.843085261 -1301790.0862781794
- ll2 25.07891722004783 -172.23413965535394
-EPSG:2270
- ll 3.8027567005536227 -106.90548483316951
- en 1.1020362172449991E7 -1.4354253897840664E7
- ll2 3.8027567005536427 -106.90548483316951
-EPSG:22700
- ll 62.87991361560676 102.16127406419503
- en 3865231.3376126303 4777690.036413209
- ll2 62.879913637107194 102.16127402451548
-EPSG:2271
- ll 73.4348772501343 -88.94629367720324
- en 517961.9692659143 1.30522459833055E7
- ll2 73.43487725013432 -88.94629367720324
-EPSG:2272
- ll 61.34725226560157 -104.33595431301461
- en -3000638.607557957 8979741.603545263
- ll2 61.34725226560153 -104.33595431301461
-EPSG:2273
- ll 85.41549758431678 -54.75695893821329
- en 3878407.252501023 2.4869294943979617E7
- ll2 85.41549758431678 -54.7569589382133
-EPSG:2274
- ll 30.36302165380922 -49.09358563742481
- en 1.338477561284088E7 731123.7488393282
- ll2 30.363021653809227 -49.0935856374248
-EPSG:2275
- ll -13.744912862360811 -44.33445726714277
- en 2.775439221473335E7 -8268756.980181258
- ll2 -13.744912862360781 -44.33445726714277
-EPSG:2276
- ll 72.9566699084769 -143.866744805727
- en -4720768.686997792 2.473766746390768E7
- ll2 72.9566699084769 -143.866744805727
-EPSG:2277
- ll 5.534973449386804 -147.81216077617157
- en -1.6082459085853843E7 4764566.647417592
- ll2 5.534973449386837 -147.81216077617157
-EPSG:22770
- ll -0.23931093581083474 99.73424281971006
- en 8035844.9157893285 -1322672.4317793055
- ll2 -0.23931098820253205 99.7342427798945
-EPSG:2278
- ll 55.68850158641304 -120.29325223472955
- en -2969151.0924969935 2.4110842464855336E7
- ll2 55.68850158641311 -120.29325223472955
-EPSG:22780
- ll -31.526069654206687 -41.30351730983756
- en -1.3024501439552873E7 -7863808.9417510405
- ll2 -31.526069508667778 -41.30351735600385
-EPSG:2279
- ll 58.444718852778365 -154.4040082051441
- en -1.1424120650851188E7 3.1825606455460366E7
- ll2 58.444718852778344 -154.4040082051441
-EPSG:2280
- ll 14.80156600036564 -72.30631493648661
- en 1.639040862544189E7 -2944692.983350245
- ll2 14.801566000365654 -72.30631493648661
-EPSG:2281
- ll 17.02292632462909 -151.17698560671448
- en -1.27893787112125E7 1858313.4596804292
- ll2 17.02292632462912 -151.17698560671448
-EPSG:2282
- ll 43.28097217016652 -133.4589657511162
- en -4180763.8836446423 1.2941666397744192E7
- ll2 43.28097217016655 -133.4589657511162
-EPSG:2283
- ll -0.3225107575243342 -161.59108267160545
- en -2.1115719467332788E7 7538825.409416439
- ll2 -0.3225107575243052 -161.59108267160548
-EPSG:2284
- ll 53.841212572716046 -159.06481168093555
- en -4595491.243511058 1.7063801611447994E7
- ll2 53.84121257271606 -159.06481168093555
-EPSG:2285
- ll -5.906059558728053 -100.41984471036918
- en 1.2474767884291416E7 -2.0676559733008E7
- ll2 -5.906059558727994 -100.41984471036918
-EPSG:2286
- ll 80.86818231843499 -157.42267162406415
- en -1148949.0814357148 1.4771410514403652E7
- ll2 80.86818231843499 -157.42267162406415
-EPSG:2287
- ll 33.108827806358995 -36.633627347491995
- en 1.7480229191007342E7 985520.3704213209
- ll2 33.1088278063592 -36.63362734749198
-EPSG:2288
- ll 16.632698362254363 -143.6088583426692
- en -1.748260087738663E7 -3623188.0933115194
- ll2 16.632698362254366 -143.60885834266918
-EPSG:2289
- ll 26.233010106412408 -64.68969839671551
- en 1.0486304397981834E7 -4524155.263537845
- ll2 26.23301010641242 -64.6896983967155
-EPSG:2290
- ll -5.447504182645488 -102.81825967564134
- en -4904847.354997274 -5072924.211858484
- ll2 -5.447504182645495 -102.81825967564134
-EPSG:2294
- ll 51.21432743506929 -57.4640288527328
- en 4781930.117389274 5683106.229352637
- ll2 51.214327434655566 -57.464028852764024
-EPSG:2295
- ll 17.232262122458252 -61.70130792666971
- en 5797719.94659608 1907975.8331544492
- ll2 17.232262122453065 -61.7013079266838
-EPSG:22991
- ll -34.91277573830744 31.04811930507172
- en -61408.577135686064 -6092205.095831293
- ll2 -34.91277573644148 31.04811929749908
-EPSG:22992
- ll -44.695483305134346 37.95569031655419
- en 1166186.854762162 -7484851.445902638
- ll2 -44.69548329346944 37.955690291973035
-EPSG:22993
- ll 49.498227011704074 25.736141211861643
- en 608291.066116261 2365669.893156385
- ll2 49.49822701105735 25.736141208593075
-EPSG:22994
- ll 37.18204191128763 26.31319240002201
- en 638854.6954344172 1996797.4587413042
- ll2 37.18204191118421 26.31319239941896
-EPSG:23028
- ll 1.9957163067846864 -9.525914535455337
- en 1109829.0383100044 221732.33515886558
- ll2 1.9957163382914818 -9.525914510978366
-EPSG:23029
- ll 82.04636839733078 -3.629778763626149
- en 582953.7127316394 9114099.96497168
- ll2 82.0463683956427 -3.629778735436076
-EPSG:23030
- ll 28.80237352522107 -8.402781893275202
- en -27555.907205049414 3198289.0423127334
- ll2 28.802373547409797 -8.402781875435823
-EPSG:23031
- ll 37.14114094157884 5.01447541678308
- en 679013.6130319445 4112625.3063400276
- ll2 37.14114095393733 5.01447542770249
-EPSG:23032
- ll -57.24186377384942 10.783526944054925
- en 607721.5170327474 -6345793.92610275
- ll2 -57.24186375115422 10.78352699213742
-EPSG:23033
- ll 70.99181421353396 21.62667874113077
- en 740539.4889754617 7889853.661187028
- ll2 70.99181421034103 21.626678724609256
-EPSG:23034
- ll 24.287889135951417 15.311932989868989
- en -77824.2206818019 2698092.45033451
- ll2 24.287889151528663 15.31193299809024
-EPSG:23035
- ll -78.12204357711907 21.105064013310656
- en 364811.7095672102 -8678949.106005711
- ll2 -78.12204353989075 21.105064126580206
-EPSG:23036
- ll -10.075760348124305 37.11169590881419
- en 950929.5662787857 -1116525.4367093807
- ll2 -10.075760325620038 37.11169591366438
-EPSG:23037
- ll -17.691823711607924 38.74693977038101
- en 473184.90482785366 -1956030.7518476546
- ll2 -17.69182368894581 38.74693977545586
-EPSG:23038
- ll -41.379128257253534 50.171806772493014
- en 932550.46030938 -4593762.198066712
- ll2 -41.379128232182495 50.17180677136849
-EPSG:2308
- ll 86.73408016967505 108.5473406437721
- en 496986.46444821765 1.963303931933407E7
- ll2 86.73407944703227 108.54734299501752
-EPSG:2309
- ll -50.14068623486568 118.97094429421938
- en 712279.9994490375 4441500.519440051
- ll2 -50.14068623480013 118.9709442942334
-EPSG:23090
- ll 13.28848119449215 3.5353010221759114
- en 883250.1590948619 1471913.5044967898
- ll2 13.288481219506806 3.535301039177179
-EPSG:23095
- ll -42.6176385971148 6.117881498108778
- en 591773.3040019664 -4718983.259402149
- ll2 -42.617638577327206 6.117881535079901
-EPSG:2310
- ll 8.944416175192544 136.26635056045825
- en 969418.7257656478 1.099142800506898E7
- ll2 8.94441617514818 136.2663505599275
-EPSG:2311
- ll 14.279670442769557 9.359014469247176
- en 862483.2514427258 1581279.843336061
- ll2 14.279670442755942 9.359014469173836
-EPSG:2312
- ll -40.83470582711628 16.52536066658536
- en 628612.6209808071 -4521224.104393872
- ll2 -40.83470582711537 16.525360666586607
-EPSG:2313
- ll -64.89368139335272 10.513990573893572
- en 287739.9994181646 -7203862.763482513
- ll2 -64.89368139283229 10.513990574431112
-EPSG:2314
- ll -14.757795796049336 -62.27613569700301
- en -49503.82712511214 -8930788.739009596
- ll2 -14.757795605213419 -62.276135668851964
-EPSG:2315
- ll 11.852952063551498 -75.33306443320616
- en -191001.47708658152 1.1318088384511735E7
- ll2 11.852952050472757 -75.33306441342157
-EPSG:2316
- ll -13.267396379992519 -67.2577930470368
- en 38462.70825358067 8529249.759680869
- ll2 -13.267396385818722 -67.25779304092491
-EPSG:2317
- ll 8.156691500040168 -68.05123191946211
- en 774296.1201370555 1239026.3851005095
- ll2 8.15669146340359 -68.05123193995816
-EPSG:2318
- ll 35.58662031681962 130.84155845204833
- en 7100225.88172014 3406419.096245281
- ll2 35.58662032368199 130.84155838171623
-EPSG:2319
- ll 33.90696215917926 28.51988640007039
- en 640622.5627463561 3754556.860425608
- ll2 33.90696216788898 28.519886404060745
-EPSG:2320
- ll -35.97139464841026 32.84311283816341
- en 756519.9882181004 -3986087.8182066763
- ll2 -35.97139462559487 32.843112849702074
-EPSG:2321
- ll 72.17400966764697 39.70667840974356
- en 728855.8649711933 8024501.895224437
- ll2 72.17400966443519 39.7066783873768
-EPSG:2322
- ll 13.52893266600816 32.860437405359804
- en 160011.63575203664 1498555.7358564301
- ll2 13.528932683539914 32.86043741024738
-EPSG:2323
- ll -41.187539638310845 37.771799820259
- en 396975.82346903806 -4562122.056574804
- ll2 -41.187539614853954 37.77179982901964
-EPSG:23239
- ll 9.133672850404366 54.662599671400386
- en 902410.8062616126 1011430.4927555047
- ll2 9.133672862723236 54.662599692982646
-EPSG:2324
- ll 21.933716795191458 44.12015184354689
- en 719086.4160492523 2428133.5490138605
- ll2 21.93371680814068 44.120151844614796
-EPSG:23240
- ll -16.14892053397783 61.82102926406577
- en 1015641.0979339113 -1791654.035254466
- ll2 -16.14892046262678 61.82102932206482
-EPSG:2325
- ll 55.73372432988964 45.33333237466885
- en 520948.08151128923 6179147.41641135
- ll2 55.73372433084201 45.33333237493069
-EPSG:2326
- ll -43.47048973067766 115.84429472912464
- en 971292.208783026 -6465570.370550672
- ll2 -43.47048969455037 115.84429463482172
-EPSG:2327
- ll -63.90971017772763 72.1449308590083
- en 1.3359881373429611E7 -7092928.46205762
- ll2 -63.90971017769099 72.14493085901576
-EPSG:2328
- ll -20.019982240261427 84.73143716122628
- en 1.4890647786617715E7 -2218938.609512903
- ll2 -20.019982240224085 84.731437161241
-EPSG:2329
- ll -55.08028951070227 88.40053180371056
- en 1.5589443732121037E7 -6107067.766906308
- ll2 -55.08028951070155 88.4005318037108
-EPSG:2330
- ll 1.5494349598624524 96.5613604392062
- en 1.6896561817563448E7 171661.7263071089
- ll2 1.549434959859774 96.56136043893933
-EPSG:2331
- ll 43.538850310049156 105.47453412201334
- en 1.802335995751772E7 4843001.579885224
- ll2 43.5388503042838 105.47453411899122
-EPSG:2332
- ll 46.81296048116454 108.53528140683368
- en 1.8769805686616655E7 5192529.27120431
- ll2 46.81296048098936 108.53528140688016
-EPSG:2333
- ll 66.64014555934378 113.36393941353609
- en 1.9604616520167626E7 7396208.237817184
- ll2 66.6401455593341 113.36393941353465
-EPSG:2334
- ll -78.30218813355711 117.60491960638154
- en 2.0513696850660898E7 -8695647.41109814
- ll2 -78.30218813355712 117.60491960638146
-EPSG:2335
- ll -17.089160801432513 121.86481016032201
- en 2.1379169029807754E7 -1890527.224113019
- ll2 -17.08916080143249 121.86481016032221
-EPSG:2336
- ll -76.94537998739055 133.4742970223249
- en 2.2612761546755366E7 -8548391.105582954
- ll2 -76.94537998728244 133.4742970216775
-EPSG:2337
- ll 63.814131355283905 141.86014719713344
- en 2.383741323339298E7 7097294.175052779
- ll2 63.814131348510244 141.86014717257126
-EPSG:2338
- ll -15.539188798395529 80.85437391196794
- en 1128979.7018085844 -1727282.73423032
- ll2 -15.539188797866851 80.85437391082786
-EPSG:2339
- ll 34.59864598503353 86.8084780194721
- en 1033147.8423186393 3845446.1817303193
- ll2 34.598645983229545 86.8084780209853
-EPSG:2340
- ll -73.12970657276024 82.95058988275653
- en 368869.34836307995 -8122636.715119595
- ll2 -73.12970657264344 82.9505898830082
-EPSG:2341
- ll -74.78593419834974 86.02049917024758
- en 295904.5822068831 -8315060.216023792
- ll2 -74.78593419623103 86.02049920530733
-EPSG:2342
- ll 54.616319691981175 93.30874288382633
- en 132525.26465367276 6069422.166611354
- ll2 54.616319688807046 93.30874288686991
-EPSG:2343
- ll 43.48451716760988 103.24665978080245
- en 358158.16130703525 4818044.502134826
- ll2 43.48451716760753 103.24665978080024
-EPSG:2344
- ll -83.77045644845131 114.5489277279391
- en 542984.9360383337 -9307519.058335533
- ll2 -83.77045644844806 114.54892772785445
-EPSG:2345
- ll -9.372308285608625 118.47162289417605
- en 661664.8434955257 -1036767.1733694116
- ll2 -9.372308285608565 118.47162289417416
-EPSG:2346
- ll 44.55080186660635 125.35905178195398
- en 687452.3645694125 4937736.495674227
- ll2 44.55080186659186 125.35905178196347
-EPSG:2347
- ll -11.99354627422251 127.62208520277507
- en 349924.47958048666 -1326746.2120441967
- ll2 -11.99354627422246 127.62208520277615
-EPSG:2348
- ll 23.698220928950562 129.39875440062735
- en -71878.84588233544 2633125.3828488667
- ll2 23.698220928339346 129.39875439958286
-EPSG:2349
- ll 57.86108291955034 72.14248179920035
- en 2.5330403303527195E7 6419395.832714629
- ll2 57.861082919501825 72.14248179920192
-EPSG:2350
- ll -88.40905964887362 80.48133576349834
- en 2.650769226570473E7 -9824438.867927438
- ll2 -88.40905964887361 80.48133576349542
-EPSG:2351
- ll -34.30599034567945 84.07865922974197
- en 2.778344765086895E7 -3801899.7313759862
- ll2 -34.30599034563998 84.07865922980066
-EPSG:2352
- ll -32.06334799898841 84.5556111324608
- en 2.85524656988529E7 -3549013.6260927427
- ll2 -32.06334799898841 84.5556111324608
-EPSG:2353
- ll 11.96540976830947 92.43262958683587
- en 3.0092520786094226E7 1329095.3575163635
- ll2 11.965409768038285 92.43262958528774
-EPSG:2354
- ll -57.1421390770658 88.60140040522552
- en 3.041533176902886E7 -6336613.748114727
- ll2 -57.1421390770651 88.60140040522532
-EPSG:2355
- ll 79.80668673374194 99.11208128691001
- en 3.162058686902687E7 8869895.531039722
- ll2 79.8066867334263 99.11208127576938
-EPSG:2356
- ll 18.661838052777924 93.58165459175727
- en 3.2244796808916025E7 2065962.0047961106
- ll2 18.6618380527756 93.58165459176124
-EPSG:2357
- ll -8.429758105681046 103.79636243575943
- en 3.402879383014443E7 -935432.4537787002
- ll2 -8.429758105589569 103.79636243467313
-EPSG:2358
- ll -23.348269821509774 95.06102279529296
- en 3.378923682969332E7 -2600222.7648321083
- ll2 -23.34826981923548 95.06102279236798
-EPSG:2359
- ll 44.207862752029456 108.47619761361008
- en 3.577784238554661E7 4902801.738908826
- ll2 44.20786275188348 108.47619761367442
-EPSG:2360
- ll -27.668542916370967 111.00496125080033
- en 3.679655107802371E7 -3065325.393713851
- ll2 -27.66854291635193 111.00496125084098
-EPSG:2361
- ll -68.29376840065873 110.29744976805694
- en 3.747099169142093E7 -7578817.691853811
- ll2 -68.29376840065872 110.297449768057
-EPSG:2362
- ll -8.125403448192628 111.61527683248056
- en 3.823710775386631E7 -899294.8664894996
- ll2 -8.125403448191612 111.61527683250497
-EPSG:2363
- ll -29.893023789148913 123.64978316811741
- en 4.014303083142926E7 -3326906.724905957
- ll2 -29.893023786362413 123.64978317157707
-EPSG:2364
- ll 16.307456123373385 114.83730017223031
- en 3.9947632215279765E7 1810668.6561423156
- ll2 16.307456123134237 114.83730017263497
-EPSG:2365
- ll -30.99997012643349 121.18913377231914
- en 4.1327040800147265E7 -3432380.623020176
- ll2 -30.99997012643226 121.18913377231618
-EPSG:2366
- ll -86.50077327212274 124.39067789708315
- en 4.248903041367757E7 -9611286.366160788
- ll2 -86.50077327212274 124.39067789708372
-EPSG:2367
- ll -73.19719208174492 122.66843258289086
- en 4.329596812692889E7 -8136536.4189549945
- ll2 -73.19719208014526 122.66843259709796
-EPSG:2368
- ll -72.24291151342824 127.83006888327786
- en 4.435809917249708E7 -8024159.3026961805
- ll2 -72.24291151327054 127.83006888360164
-EPSG:2369
- ll 35.62414979490623 132.07408626333768
- en 4.523490525497675E7 3947786.439387398
- ll2 35.62414979487407 132.0740862632938
-EPSG:2370
- ll 86.59177768733727 73.23383001007802
- en 488274.31732431165 9621477.283309625
- ll2 86.59177768733728 73.23383001007817
-EPSG:23700
- ll 45.97694629266108 22.878795465763712
- en 946830.7386146804 77526.12708727017
- ll2 45.976946293598196 22.878795470281045
-EPSG:2371
- ll 7.060681966204129 82.62625200961249
- en 1011655.7377991336 783312.989797766
- ll2 7.060681966141883 82.62625200864292
-EPSG:2372
- ll 40.04918481100833 81.64807162113026
- en 555301.8402801726 4435193.5875809435
- ll2 40.04918481100833 81.64807162113027
-EPSG:2373
- ll 38.88469429758416 86.69900671213365
- en 734202.8990924687 4309169.681334976
- ll2 38.88469429755947 86.6990067121598
-EPSG:2374
- ll -0.10387593747374524 84.38025969241701
- en 208269.8306396812 -11498.109924871282
- ll2 -0.10387593747371951 84.38025969246796
-EPSG:2375
- ll 2.2563906875287643 95.65203873877225
- en 1129723.6589603282 250726.08081158355
- ll2 2.2563906874468214 95.65203873487147
-EPSG:2376
- ll -22.09650751975478 93.64083597417547
- en 566130.2589439631 -2444627.1027148925
- ll2 -22.09650751975478 93.64083597417547
-EPSG:2377
- ll -68.17030909539767 102.9385553457855
- en 787537.0277497332 -7581069.212013685
- ll2 -68.17030909033399 102.93855531584545
-EPSG:2378
- ll 4.487642581331727 99.87313330542153
- en 596904.533363563 496286.01280245796
- ll2 4.487642581331725 99.87313330542136
-EPSG:2379
- ll -27.080343192793606 104.66463427899946
- en 764346.0762223911 -2999333.692294711
- ll2 -27.0803431927849 104.66463427901859
-EPSG:2380
- ll -70.94915822649696 105.3911477239544
- en 514255.14942428144 -7874926.0418409845
- ll2 -70.94915822649695 105.3911477239544
-EPSG:2381
- ll -85.23913578881691 109.02329920522487
- en 509485.56152326637 -9470307.070182636
- ll2 -85.23913578881692 109.02329920522487
-EPSG:2382
- ll -40.495749266480935 115.66153509548539
- en 895241.9039465176 -4495032.445222673
- ll2 -40.49574926576763 115.6615350958193
-EPSG:2383
- ll 18.80993340394049 107.712141848903
- en -163872.52663351328 2092409.383512705
- ll2 18.809933402971357 107.71214184894927
-EPSG:23830
- ll 8.662019759920426 88.22049626178188
- en -492374.6207984033 2463505.143367735
- ll2 8.662019759346322 88.22049626729344
-EPSG:23831
- ll -15.968309168576653 96.06636975433318
- en 46529.7691976318 -266488.0504478791
- ll2 -15.968309168576571 96.06636975433395
-EPSG:23832
- ll -4.537454799344019 100.30800115944217
- en 178695.4187748846 998311.0516783315
- ll2 -4.537454799344022 100.30800115944218
-EPSG:23833
- ll -88.84262255759633 99.69969115030244
- en 191433.3850058524 -8371990.6943778265
- ll2 -88.84262255759646 99.69969115046203
-EPSG:23834
- ll 81.30313813070575 102.83111841659296
- en 138088.08079479155 1.0531710758638388E7
- ll2 81.30313813069586 102.83111841670541
-EPSG:23835
- ll 47.01448404445074 106.94351045004831
- en 5640.082121520449 6711509.311470109
- ll2 47.01448404442563 106.9435104500369
-EPSG:23836
- ll 86.16684116293354 108.2349922907487
- en 168186.44452442764 1.1074056010163445E7
- ll2 86.16684116293196 108.2349922911978
-EPSG:23837
- ll 6.201790861102282 112.31044252300137
- en -153139.82841765584 2186779.4844648745
- ll2 6.201790861097301 112.31044252312836
-EPSG:23838
- ll -42.324731436237585 116.26432315870272
- en 15731.181119072106 -3189659.447118005
- ll2 -42.32473143622804 116.26432315869442
-EPSG:23839
- ll 86.61938600740154 117.58120754709938
- en 174211.97176331517 1.1124294195925573E7
- ll2 86.61938600740103 117.5812075473089
-EPSG:2384
- ll -29.281112264781314 113.93999456004583
- en 202572.31605915807 -3244315.7156353137
- ll2 -29.281112264756636 113.93999455999538
-EPSG:23840
- ll -80.33764961201076 121.92451470599092
- en 151742.38658431623 -7423019.313830296
- ll2 -80.33764961200981 121.92451470599552
-EPSG:23841
- ll -72.10377137285451 134.35478991851815
- en 434722.5198475738 -6516289.049523423
- ll2 -72.103771369903 134.35478988984084
-EPSG:23842
- ll 81.24805323140737 131.70758661509626
- en 220517.85355832265 1.052381371951889E7
- ll2 81.24805323140805 131.70758661509626
-EPSG:23843
- ll -56.363850498735765 130.60893778750872
- en 21364.114471235487 -4752204.654733547
- ll2 -56.3638504986822 130.6089377875085
-EPSG:23844
- ll 30.270934657019907 134.3405254889151
- en -7794.9446404888 4851787.319039529
- ll2 30.270934657015175 134.34052548890764
-EPSG:23845
- ll 35.582271922880835 143.86052621844232
- en 595308.6412674808 5447562.440829422
- ll2 35.58227192253015 143.86052621882075
-EPSG:23846
- ll -35.435175667714056 88.6207689803646
- en 102362.06558128365 -3930134.3738007043
- ll2 -35.43517566731555 88.62076897968414
-EPSG:23847
- ll 49.58638032888763 101.05761377190336
- en 648693.7607708735 5494685.933412352
- ll2 49.586380328597485 101.05761377077512
-EPSG:23848
- ll 67.00185786194737 102.60443146054061
- en 395549.05623600027 7433614.083595798
- ll2 67.00185786161111 102.60443145831827
-EPSG:23849
- ll -76.512467677579 108.9481720372949
- en 446561.6670845467 -8493325.640008867
- ll2 -76.51246767747466 108.94817203466827
-EPSG:2385
- ll -46.03178456872634 126.02936879701525
- en 966756.3581510121 -5117329.163414965
- ll2 -46.03178456459362 126.02936879490967
-EPSG:23850
- ll 69.7463648468071 115.43078641561598
- en 439351.1180697472 7738391.260840009
- ll2 69.7463648466535 115.43078641267574
-EPSG:23851
- ll -62.869164238804444 127.7503568682195
- en 741504.4865143631 -6979957.868965732
- ll2 -62.86916423813267 127.7503568657093
-EPSG:23852
- ll 57.958993235912146 129.2133360839486
- en 512596.50309789163 6424187.985292071
- ll2 57.95899323595625 129.21333608183141
-EPSG:2386
- ll 19.145565372579185 117.51982130885408
- en -77211.25926454656 2126855.066261336
- ll2 19.145565372175252 117.51982130876947
-EPSG:23866
- ll 61.29261079269111 91.58867946997273
- en 424374.83552404755 6796197.361529463
- ll2 61.292610792691114 91.58867946997265
-EPSG:23867
- ll -13.244010708503694 99.75809435291904
- en 582129.8868250481 -1464244.6857934005
- ll2 -13.24401070850369 99.75809435291899
-EPSG:23868
- ll 21.964872878850173 110.9156569278364
- en 1111557.1978109628 2440776.6114877164
- ll2 21.96487287808112 110.91565692882659
-EPSG:23869
- ll -23.406404765308807 111.70523229004456
- en 572056.3562331208 -2588685.9825178976
- ll2 -23.406404765308626 111.70523229004456
-EPSG:2387
- ll 10.031821195991725 127.61053143241318
- en 676582.5090895921 1109807.4241022207
- ll2 10.031821195991617 127.61053143241034
-EPSG:23870
- ll 65.91367579663876 113.5319703901269
- en 342130.49520104204 7314651.745099393
- ll2 65.91367579653767 113.53197039017986
-EPSG:23871
- ll -65.04588176769667 129.10827238979064
- en 787200.3347734995 -7227465.860991765
- ll2 -65.04588176454021 129.10827238094393
-EPSG:23872
- ll -39.5122651951032 128.11043035993833
- en 423528.5321267507 -4374003.427851042
- ll2 -39.5122651951032 128.11043035993825
-EPSG:23877
- ll 48.67892827891532 92.84489966905035
- en 47025.89796288003 1.5410070799597349E7
- ll2 48.678928273953765 92.84489967294861
-EPSG:23878
- ll 18.92201015576086 100.70575997444385
- en 47484.685597634874 1.2097704432562383E7
- ll2 18.92201015567677 100.70575997445064
-EPSG:23879
- ll 66.30494772980254 107.34138336084123
- en 336008.63292591803 1.7358697650772277E7
- ll2 66.30494772966733 107.34138336092884
-EPSG:2388
- ll -3.2169863509725616 132.84791372460776
- en 927999.4866125642 -356527.2945159743
- ll2 -3.2169863509635186 132.84791372420898
-EPSG:23880
- ll 67.79055119418453 120.93640903112812
- en 665953.8659807446 1.7524793429644786E7
- ll2 67.7905511940002 120.9364090309508
-EPSG:23881
- ll -6.915156727925307 116.07833868430657
- en -266466.3563680269 9230035.583351407
- ll2 -6.9151567269871945 116.07833869608261
-EPSG:23882
- ll -16.37982617302582 124.61960515308927
- en 31844.082450848713 8183995.846760865
- ll2 -16.37982617294296 124.61960515325215
-EPSG:23883
- ll -56.07065575197516 139.13938002914074
- en 757608.3766829491 3778330.0314938696
- ll2 -56.07065575151005 139.13938002899232
-EPSG:23884
- ll 82.86163163267415 147.75862568290302
- en 593555.0729269303 1.9206494327687874E7
- ll2 82.861631632531 147.7586256545532
-EPSG:23887
- ll 71.38902705137139 98.48475760342588
- en 481621.3473205229 1.79208801723972E7
- ll2 71.38902705098486 98.48475760076138
-EPSG:23888
- ll 45.62710623566534 103.292788065034
- en 366894.35502976214 1.5054043976873841E7
- ll2 45.627106235406394 103.29278806396647
-EPSG:23889
- ll 40.08397228788749 114.7375215898078
- en 818654.884715812 1.4443784176111821E7
- ll2 40.08397228752669 114.73752158874859
-EPSG:2389
- ll -82.40687599218732 138.1827469242114
- en 591074.7327539134 -9158789.509116579
- ll2 -82.40687599206032 138.18274691159314
-EPSG:23890
- ll 25.32777974831464 120.90743434648105
- en 893413.4602248655 1.280699289426392E7
- ll2 25.32777974809485 120.90743434555499
-EPSG:23891
- ll 83.93995927812117 117.55999890946413
- en 435947.35806505755 1.9324448930669706E7
- ll2 83.9399592779945 117.55999890340905
-EPSG:23892
- ll 27.20396003448674 135.8027793840279
- en 1174620.126451448 1.30274000098109E7
- ll2 27.203960031858852 135.80277938650227
-EPSG:23893
- ll 11.838477009187969 135.11179513112657
- en 512149.6124259089 1.1308696440885145E7
- ll2 11.838477009047525 135.1117951299261
-EPSG:23894
- ll 28.48297152644558 138.13214013732502
- en 219199.40733331774 1.3154069783579826E7
- ll2 28.48297152643068 138.1321401358952
-EPSG:2390
- ll -47.55758306560718 137.76634695952896
- en 708191.4147472137 -5272949.780914797
- ll2 -47.55758306556616 137.76634695954453
-EPSG:2391
- ll 28.901465943983098 27.289738797400002
- en 2114262.162638463 3214800.661390671
- ll2 28.90146596860102 27.28973881450059
-EPSG:2392
- ll 45.236813734925676 20.709999817938375
- en 2241829.6522185216 5016668.507621262
- ll2 45.23681375301171 20.70999983013525
-EPSG:2393
- ll 11.99911095482355 29.75347670878171
- en 3800072.766727847 1328567.6664269643
- ll2 11.999110986313285 29.753476724800944
-EPSG:2394
- ll 81.5482962791798 34.172347417106565
- en 4568593.48187661 9060625.170544775
- ll2 81.54829627023864 34.17234741665646
-EPSG:23946
- ll -4.555330800311438 99.39785706355804
- en 1211409.332144082 -506970.97445337893
- ll2 -4.555330748388671 99.39785700189373
-EPSG:23947
- ll -55.95949656943111 101.2570610549578
- en 641232.4210045862 -6203891.041580371
- ll2 -55.95949607736502 101.25706053640012
-EPSG:23948
- ll 15.581896051936624 99.83452662307454
- en -54016.77563827846 1729091.563588247
- ll2 15.581896057129118 99.83452661233821
-EPSG:2395
- ll 41.09807030375546 41.37550179106714
- en 8195518.680667626 4557728.273650797
- ll2 41.09807029474901 41.37550179508349
-EPSG:2396
- ll -86.21288839047143 53.14121008998261
- en 9515820.39377357 -9579283.008144917
- ll2 -86.21288838335943 53.14121010558637
-EPSG:2397
- ll 51.1450758087378 11.556974803211308
- en 3679045.8274860806 5671486.505792415
- ll2 51.14507581202016 11.55697481696125
-EPSG:2398
- ll 16.154090706755937 17.025367131183184
- en 5038191.177410442 1793377.8558145133
- ll2 16.15409071423288 17.02536714461159
-EPSG:2399
- ll -75.85094312735826 8.063793609263525
- en 5311183.771990552 -8433146.067071175
- ll2 -75.85094312257283 8.063793775754172
-EPSG:2401
- ll -0.9916559851534572 71.59194328581233
- en 2.512050539503744E7 -109764.21021919517
- ll2 -0.9916559890348892 71.59194328314312
-EPSG:2402
- ll -46.17084626334551 83.33111225313787
- en 2.6911720393844385E7 -5128835.692091929
- ll2 -46.170846246102116 83.3311122570678
-EPSG:2403
- ll 74.80158080414427 78.44513210894068
- en 2.7425266966446523E7 8306418.844645843
- ll2 74.80158080546896 78.44513210702888
-EPSG:2404
- ll -25.58289755294704 81.28077457521367
- en 2.8226769959522184E7 -2833335.78151447
- ll2 -25.582897551221944 81.28077457571595
-EPSG:24047
- ll -49.951423296479255 98.85211815280512
- en 489726.4548680058 -5533300.846998822
- ll2 -49.951422894946596 98.85211780619319
-EPSG:24048
- ll -41.78766993205215 109.52524176007923
- en 876445.4824941079 -4636205.840354779
- ll2 -41.78766961319894 109.52524136007122
-EPSG:2405
- ll 85.14238282032315 90.1323122924759
- en 2.952963481251201E7 9460235.49698406
- ll2 85.1423828171059 90.13231229642886
-EPSG:2406
- ll -23.372444611056068 96.88193928038248
- en 3.1204787878517617E7 -2602537.1240308103
- ll2 -23.372444609165782 96.8819392832239
-EPSG:2407
- ll -42.8797379095598 92.30863873395182
- en 3.144352304903571E7 -4749507.043763494
- ll2 -42.879737897238186 92.30863873490019
-EPSG:2408
- ll -12.061273262618784 92.96017555440412
- en 3.2168888211839613E7 -1335609.0105698816
- ll2 -12.061273266883346 92.96017555416992
-EPSG:2409
- ll 52.751457889405515 100.367981792982
- en 3.3592357435046695E7 5847865.912359222
- ll2 52.75145789469884 100.36798179438534
-EPSG:2410
- ll -26.46660671482671 104.36206994582396
- en 3.4735567112502955E7 -2930603.14024444
- ll2 -26.46660671322142 104.36206994555083
-EPSG:24100
- ll -7.1600010985848215 -1.3992191776703464
- en 2.9834085786380157E7 -2969937.22418151
- ll2 -7.160001098584795 -1.3992191776703606
-EPSG:2411
- ll -14.90592961311323 108.2557340956905
- en 3.585044745302776E7 -1651053.2505423983
- ll2 -14.905929616028665 108.25573409646793
-EPSG:2412
- ll -78.22588395747175 112.67663329030609
- en 3.660643443245957E7 -8691293.254529627
- ll2 -78.22588392058945 112.6766332397532
-EPSG:2413
- ll 1.858212902399174 107.73324022928375
- en 3.713629987892584E7 205888.742369768
- ll2 1.8582128972801184 107.73324023154274
-EPSG:2414
- ll -47.66102006746618 107.23117230225463
- en 3.799163032662901E7 -5302906.823449591
- ll2 -47.66102004262378 107.23117230716319
-EPSG:2415
- ll 61.86412475920682 123.45771181342828
- en 3.983942073956512E7 6878713.062269406
- ll2 61.86412475713035 123.45771180583469
-EPSG:2416
- ll -32.639161577271786 115.80931666536902
- en 4.0106567473388724E7 -3620413.6809816314
- ll2 -32.63916157057681 115.80931666235838
-EPSG:2417
- ll -34.07797454178414 129.63316551708627
- en 4.211268803282508E7 -3792156.528904376
- ll2 -34.077974528229795 129.63316551230608
-EPSG:2418
- ll 2.608717900230218 128.74643033124164
- en 4.280545442577293E7 288873.69318274
- ll2 2.6087178974165957 128.74643033425826
-EPSG:2419
- ll -58.05774555162432 134.29753407873073
- en 4.381247800972785E7 -6449945.885345212
- ll2 -58.05774552547022 134.29753404731167
-EPSG:2420
- ll -30.94370180151408 130.51376294937015
- en 4.435787460097471E7 -3425603.3662035973
- ll2 -30.943701793334913 130.5137629433556
-EPSG:24200
- ll -34.44434927291786 -36.39927075708516
- en 5978976.509898498 -5958280.8892497625
- ll2 -34.444349071033734 -36.399270657159455
-EPSG:2421
- ll -75.15841671112273 130.92294509453015
- en 4.5383365345630184E7 -8348635.4382397635
- ll2 -75.15841667899082 130.92294501802047
-EPSG:2422
- ll -54.80606230211471 79.5142932175344
- en 790238.6167937053 -6084928.750336019
- ll2 -54.80606227925949 79.51429322690028
-EPSG:2423
- ll 52.77545970101096 71.39618407315231
- en 54657.805773147964 5870142.275030315
- ll2 52.77545969708561 71.39618407805884
-EPSG:2424
- ll 24.6249097762406 84.89838827628664
- en 894965.1514477462 2730168.1697760415
- ll2 24.62490977532095 84.89838827348957
-EPSG:2425
- ll -8.72769758055523 79.13169448283195
- en -36289.03558710881 -968508.7637615498
- ll2 -8.727697584392903 79.13169448231078
-EPSG:2426
- ll -60.41393748508133 93.16884704697955
- en 839604.7849624206 -6716052.616801544
- ll2 -60.41393745445097 93.16884704066194
-EPSG:2427
- ll 81.49949009107644 85.67943269376917
- en 428751.301187353 9055253.61376478
- ll2 81.49949008974782 85.67943269598746
-EPSG:2428
- ll -41.267514023198075 96.96108901126853
- en 831960.7500622182 -4577771.076309206
- ll2 -41.26751401186131 96.9610890111619
-EPSG:2429
- ll 1.529182990655059 94.56526203091578
- en 340326.23290521273 169223.09908083215
- ll2 1.5291829851661722 94.56526203067762
-EPSG:2430
- ll 26.888806550851058 98.37967389963077
- en 438360.5394254979 2975514.746285742
- ll2 26.88880655074579 98.37967390035615
-EPSG:24305
- ll 37.324353797052694 86.16221623241456
- en 425945.78209951834 4130919.483391701
- ll2 37.32435379981218 86.16221623765213
-EPSG:24306
- ll 51.671760769954375 96.65147961499918
- en 752719.7777988642 5730563.346426439
- ll2 51.671760748453195 96.65147957516422
-EPSG:2431
- ll 44.50258815633336 105.00557944644234
- en 739005.0585111241 4934099.687095099
- ll2 44.50258816046032 105.0055794492783
-EPSG:24311
- ll 9.157904513725924 68.41016396644525
- en 1095174.8094564718 1016547.5189970441
- ll2 9.157904529216552 68.41016396324171
-EPSG:24312
- ll -34.00515342459513 67.18404303796008
- en 332327.39717429836 -3764334.1638428345
- ll2 -34.00515324248314 67.18404303976294
-EPSG:24313
- ll 59.07397033066752 78.00100807587069
- en 672101.2020286587 6551856.094374647
- ll2 59.073970268346706 78.0010080281754
-EPSG:2432
- ll -53.04721772079884 103.31225200182976
- en 386791.2849394351 -5881136.051101369
- ll2 -53.04721770032665 103.31225199792335
-EPSG:2433
- ll 67.50513141317572 108.53704353085134
- en 522905.80159135076 7490807.79995903
- ll2 67.50513141683936 108.53704353380516
-EPSG:2434
- ll 57.556991157234904 105.90059700073128
- en 194875.296943443 6393439.459100199
- ll2 57.5569911607704 105.90059700496428
-EPSG:24342
- ll 40.69636266218376 70.21664826854496
- en 602803.06369987 4505509.914146383
- ll2 40.696362663863205 70.2166482689915
-EPSG:24343
- ll -37.2600102421587 71.68615364781743
- en 206218.11587265803 -4129017.5714848354
- ll2 -37.260010029195506 71.68615362220399
-EPSG:24344
- ll -32.83520918474195 85.62960910852574
- en 933634.1499185928 -3642693.2950010826
- ll2 -32.83520899687054 85.62960899443034
-EPSG:24345
- ll 57.261422690407784 87.67422405909954
- en 540925.0922187599 6346393.088194965
- ll2 57.26142265063404 87.67422399889368
-EPSG:24346
- ll -50.954107174557805 88.43292943028158
- en 179641.29132765066 -5654670.288252454
- ll2 -50.9541068119221 88.43292915004076
-EPSG:24347
- ll -38.94057854275753 94.26297479584133
- en 89802.76208379027 -4320940.992745678
- ll2 -38.940578294716346 94.26297456024793
-EPSG:2435
- ll 21.364066910353813 110.86947046431871
- en 175148.50057977252 2366684.1135459007
- ll2 21.36406690857856 110.86947046802862
-EPSG:2436
- ll -84.64920663668602 118.88421617978288
- en 519566.15241904795 -9404662.763540763
- ll2 -84.64920659895854 118.88421601637155
-EPSG:2437
- ll -60.25185434681559 126.13180897324872
- en 839163.7171123007 -6697865.84643189
- ll2 -60.251854316783685 126.131808939867
-EPSG:24370
- ll -6.004070598850367 44.82433702974312
- en -1344371.020205687 -3012667.007449761
- ll2 -6.004070598850351 44.82433702974312
-EPSG:24371
- ll 11.772920895990353 13.848665964247427
- en -3566931.6172585785 144047.63810381741
- ll2 11.772920895990381 13.848665964247424
-EPSG:24372
- ll 72.42504748844802 122.10495711260342
- en 5791614.002242232 8052003.440397194
- ll2 72.42504748844802 122.10495711260343
-EPSG:24373
- ll 69.50741068774656 151.76527823420165
- en 8140074.054602379 9339171.107908988
- ll2 69.50741068774657 151.76527823420165
-EPSG:24374
- ll 55.65751255913341 117.04438515152248
- en 6598410.3971012 7168875.028347676
- ll2 55.65751255913351 117.04438515152248
-EPSG:24375
- ll 20.381469334980636 69.58219492701461
- en 613134.4430692848 458626.8056216165
- ll2 20.38146933131558 69.58219492327004
-EPSG:24376
- ll 11.827857677488623 128.143680095383
- en 9341809.615592433 491625.3755923501
- ll2 11.827857814758152 128.14367970000114
-EPSG:24377
- ll -31.101733663880335 22.684405520924685
- en -5130061.083924698 -5027642.04844299
- ll2 -31.101733464915526 22.684405911619518
-EPSG:24378
- ll 63.831819059209394 101.54078705164032
- en 4697748.815142549 4916053.322568636
- ll2 63.83181898040602 101.54078681966888
-EPSG:24379
- ll 75.8404234847116 86.03310622505283
- en 3336146.014360152 7564729.90793434
- ll2 75.84042329619568 86.03310590275068
-EPSG:2438
- ll -63.199854270529606 128.4186453981034
- en 772392.1177251856 -7022132.5363278845
- ll2 -63.19985424145536 128.41864536290322
-EPSG:24380
- ll 2.6755710762742595 97.78189493047243
- en 3678790.3557219226 -1705904.6989121074
- ll2 2.675571123507835 97.78189485478596
-EPSG:24381
- ll -19.89261829796454 32.02917768190573
- en -3489794.257281254 -2875720.4701286806
- ll2 -19.89261815076274 32.02917789317137
-EPSG:24382
- ll -13.404887979755195 17.5695320412772
- en -7230001.798111472 -1239358.4821731753
- ll2 -13.404887979755166 17.5695320412772
-EPSG:24383
- ll 28.117992678589943 43.18877580344385
- en -1008131.3630093485 2971652.0726933093
- ll2 28.117992681000104 43.188775825901416
-EPSG:2439
- ll 38.445960191495956 123.22704831619805
- en 257829.3066350726 4260697.776657533
- ll2 38.445960193159934 123.22704832257779
-EPSG:2440
- ll -37.582361045745884 125.00216165588456
- en 146716.0290280984 -4168591.928668585
- ll2 -37.58236103446385 125.0021616487217
-EPSG:2441
- ll -63.548249347962845 125.9860558465613
- en 201219.66657653172 -7063520.056324398
- ll2 -63.548249317064574 125.98605582356932
-EPSG:2442
- ll 40.66026614854681 136.24196241822256
- en 604930.0944846917 4503648.335987983
- ll2 40.660266149380334 136.24196242458117
-EPSG:2443
- ll -23.68637315876471 130.50254277091204
- en 102249.53254626818 -6273032.722604844
- ll2 -23.686373158764514 130.5025427709121
-EPSG:2444
- ll 41.526546884454575 127.19758497404034
- en -317354.1890949969 953195.2742494969
- ll2 41.5265468842321 127.19758497391209
-EPSG:2445
- ll -37.90262242900648 134.18918805398403
- en 177869.03355750523 -8183343.01656782
- ll2 -37.902622429002385 134.1891880539898
-EPSG:2446
- ll 6.018365460160084 130.13545397839783
- en -372662.60912018403 -2985800.17392396
- ll2 6.018365460153249 130.1354539785691
-EPSG:2447
- ll 16.307766827550665 130.72460569808334
- en -385838.94181430124 -2178208.507339036
- ll2 16.307766827526635 130.72460569814723
-EPSG:2448
- ll 22.568593563527756 136.1352190893447
- en 13905.285617878737 -1488624.300504054
- ll2 22.568593563527635 136.1352190893447
-EPSG:2449
- ll 29.195472573950468 132.8683299560267
- en -418200.0143702645 -746871.2169495471
- ll2 29.195472573758916 132.8683299556685
-EPSG:2450
- ll 79.3543842312935 132.08243660185377
- en -132131.486161405 4834307.101452991
- ll2 79.3543842308262 132.08243661910467
-EPSG:24500
- ll -80.6574890317807 103.13739981601867
- en 17220.33599861587 -9070767.291955883
- ll2 -80.6574884726299 103.13739899058986
-EPSG:2451
- ll -79.04486670062334 139.73050307619903
- en -2182.226324823995 -1.2762761100264898E7
- ll2 -79.04486670062417 139.73050307619906
-EPSG:2452
- ll -73.19057242976675 139.27201822053198
- en -50407.1357098963 -1.2553919978431687E7
- ll2 -73.19057242976734 139.272018220532
-EPSG:2453
- ll -59.71376649108163 133.52144715112055
- en -378225.1306676417 -1.1514067143130798E7
- ll2 -59.71376648359272 133.52144716938471
-EPSG:2454
- ll 88.08919755566598 146.94090821966356
- en 17448.981397235464 4914941.850721443
- ll2 88.08919755566627 146.94090821859768
-EPSG:24547
- ll -52.38134131618659 102.33557018422788
- en 727120.0434378105 -5808638.298069975
- ll2 -52.38134117026387 102.33557010052925
-EPSG:24548
- ll 76.85441658451367 110.87982753112308
- en 649238.1198898342 8537768.728071302
- ll2 76.85441612400048 110.8798266716776
-EPSG:2455
- ll -33.80272029563898 139.7408784191089
- en -417658.40409683296 -8623894.399734389
- ll2 -33.80272029526446 139.7408784186302
-EPSG:2456
- ll 72.4119354343384 137.5428123599431
- en -150247.98688782562 5166320.1844585
- ll2 72.4119354341103 137.54281236053444
-EPSG:2457
- ll 15.175101160442708 123.34964361566765
- en -446302.1138269983 -1194113.5172807323
- ll2 15.175101160387674 123.34964361584811
-EPSG:2458
- ll 25.988416513300237 117.77964008044317
- en -623526.3204396415 13586.81369844324
- ll2 25.98841651192199 117.77964007808
-EPSG:2459
- ll -38.11802273974273 136.38758458283112
- en 472564.9194908024 -7110460.666526608
- ll2 -38.118022738271584 136.38758458358387
-EPSG:2460
- ll -71.28885439223315 139.460134825389
- en 123865.31421716162 -1.0127675768677847E7
- ll2 -71.28885439217548 139.46013482532965
-EPSG:24600
- ll 67.08493965167195 55.82593574360229
- en 2094814.7424899254 5335245.712303059
- ll2 67.08493958973162 55.82593566282904
-EPSG:2461
- ll -84.2684744695991 158.84070466201848
- en 53925.83318985011 -1.2239689067778125E7
- ll2 -84.26847446958517 158.84070466062164
-EPSG:2462
- ll -68.35240907738523 14.882462357167308
- en 4248431.165630717 -7597823.612542765
- ll2 -68.35240907297599 14.882462322389424
-EPSG:2463
- ll 15.850783008315432 20.04236124336782
- en 397545.99707421503 1753467.1630789412
- ll2 15.850783014739541 20.042361255577614
-EPSG:2464
- ll -45.86989776564563 24.84799109786354
- en 333030.377055572 -5083881.034590202
- ll2 -45.869897748768956 24.84799113524694
-EPSG:2465
- ll -82.00646222522114 31.96583894130461
- en 484061.04297322576 -9109432.276217096
- ll2 -82.00646220978959 31.965839169958695
-EPSG:2466
- ll -63.71904575703883 43.71107672391592
- en 732794.3879571685 -7077146.465462717
- ll2 -63.7190457345257 43.711076775922706
-EPSG:2467
- ll 4.923896074879067 51.77998565900843
- en 1253833.4260402597 548395.5916756783
- ll2 4.9238960755540075 51.77998564933324
-EPSG:2468
- ll 20.524061924056568 44.489893088888586
- en -179994.2261121699 2284056.106120134
- ll2 20.52406192334674 44.48989308947188
-EPSG:2469
- ll 48.71000839272688 61.117639028048636
- en 803095.1626448222 5405639.649552164
- ll2 48.71000839303424 61.11763902429051
-EPSG:2470
- ll -50.92039498151862 56.571503554539674
- en 48229.37230092281 -5662907.418367283
- ll2 -50.920394954805374 56.57150358490426
-EPSG:2471
- ll 61.616742909220335 65.54875580434424
- en 317022.30842269596 6839128.233001045
- ll2 61.61674291032512 65.54875580103709
-EPSG:24718
- ll -52.25910475810264 -81.07417453615251
- en 85823.27786773373 -5807106.266430506
- ll2 -52.259104617744136 -81.07417430870713
-EPSG:24719
- ll 14.342680475735534 -67.22640105258857
- en 691486.5543020112 1586718.3874815241
- ll2 14.342680454166102 -67.2264010661691
-EPSG:2472
- ll -43.70393687391076 68.92829548855806
- en 10603.56677887123 -4858820.682131952
- ll2 -43.70393685363899 68.92829550105306
-EPSG:24720
- ll -49.18378054849934 -63.71065635066495
- en 448403.28971854533 -5447925.651114996
- ll2 -49.18378040597053 -63.71065621352771
-EPSG:2473
- ll -39.26767237872081 76.23892994356888
- en 89066.78297160572 -4358973.515561392
- ll2 -39.26767236475478 76.2389299496634
-EPSG:2474
- ll 43.127104681156084 89.03150334014924
- en 665338.5007257912 4778896.928685691
- ll2 43.127104683111845 89.03150333794956
-EPSG:2475
- ll -69.99682479935439 94.40226810933596
- en 553569.216190236 -7769223.5183068365
- ll2 -69.99682476903229 94.4022681175872
-EPSG:2476
- ll 63.593392333760846 92.67712843243757
- en 186511.611107708 7070080.576446305
- ll2 63.593392332192195 92.6771284427795
-EPSG:2477
- ll 65.84386443242016 107.48699012915257
- en 613575.1227521347 7307716.189836313
- ll2 65.84386443486267 107.48699013023457
-EPSG:2478
- ll -40.54973292857944 107.9197732097238
- en 239039.6137084706 -4495063.090564202
- ll2 -40.5497329156398 107.91977320778615
-EPSG:2479
- ll 57.88826560216836 111.17578494432432
- en 154746.30926301115 6433764.805369503
- ll2 57.888265601714444 111.17578495080582
-EPSG:2480
- ll 45.195921775986704 119.08677816885063
- en 192457.68052565755 5014229.846298514
- ll2 45.1959217775827 119.08677817204583
-EPSG:2481
- ll -55.82994985609618 135.2453553528454
- en 891028.6103651507 -6207256.41794806
- ll2 -55.829949828310546 135.24535532342068
-EPSG:24817
- ll 34.24103076105624 -79.03254435697417
- en 681440.806559999 3790964.4582475205
- ll2 34.241030693805676 -79.032544431927
-EPSG:24818
- ll 56.98395313828232 -68.65676406758496
- en 885400.1644032052 6333732.733474418
- ll2 56.98395310778371 -68.6567642215766
-EPSG:24819
- ll 3.1822242102586387 -63.343679932343484
- en 1129669.065590137 353840.3079650105
- ll2 3.182224180946012 -63.343679950172366
-EPSG:2482
- ll -59.962233473936834 138.37239362833253
- en 688266.1776449832 -6654643.471001815
- ll2 -59.962233449911686 138.37239359941066
-EPSG:24820
- ll 68.75621353827358 -69.41145422846019
- en 241329.27826875204 7640826.388826072
- ll2 68.75621355413406 -69.41145443473457
-EPSG:24821
- ll 2.8434061418383862 -50.36360867236538
- en 1239356.6771339492 316790.5978804829
- ll2 2.843406096267572 -50.363608696420116
-EPSG:2483
- ll 63.33016132382471 146.75538512582742
- en 787964.6306948744 7038195.436231685
- ll2 63.33016132169895 146.75538512256682
-EPSG:2484
- ll 80.37541576886261 145.17716936011098
- en 465871.3091329265 8927669.331064833
- ll2 80.3754157673942 145.17716934997884
-EPSG:2485
- ll -22.354904885465345 154.33532616268795
- en 637443.9764997961 -2473645.574746334
- ll2 -22.354904875504506 154.33532615204794
-EPSG:2486
- ll -11.83212187069384 155.45432369998412
- en 113280.77613891545 -1310896.6726980458
- ll2 -11.83212186399881 155.45432369254783
-EPSG:2487
- ll -40.546909381641306 167.66231451399895
- en 725414.9265883386 -4493642.644677199
- ll2 -40.54690936471067 167.662314486526
-EPSG:24877
- ll -20.774236564936942 -87.33097015874532
- en -159727.09073559428 7690209.3171595745
- ll2 -20.774236463493562 -87.33097007681381
-EPSG:24878
- ll 19.67520401915168 -73.42458736166212
- en 665377.7765496979 1.2176661589700047E7
- ll2 19.675203962571498 -73.4245874026308
-EPSG:24879
- ll 63.394329794953194 -66.372419058577
- en 631468.0600937537 1.7032392779179435E7
- ll2 63.39432979684853 -66.37241922925821
-EPSG:2488
- ll 31.75605489281945 172.75481667276415
- en 666139.196898161 3516248.7911455
- ll2 31.75605489472562 172.75481666654161
-EPSG:24880
- ll 34.16028579513035 -62.93121245833633
- en 506517.2846039407 1.3780224203590881E7
- ll2 34.16028571976074 -62.93121252628681
-EPSG:24881
- ll -62.99786066757471 -52.35280568208475
- en 735417.7000696007 3006338.4976924015
- ll2 -62.99786047059749 -52.352805544208735
-EPSG:24882
- ll -1.749050936261682 -57.15370092159602
- en -185642.5177682276 9805929.319750993
- ll2 -1.7490509582020157 -57.15370092330693
-EPSG:2489
- ll 68.8649709450369 170.01347226412017
- en 219137.91976464877 7658483.753462376
- ll2 68.86497093975368 170.01347228879325
-EPSG:24891
- ll -84.1471942519044 -87.23881267279525
- en 145684.23367144697 -7261011.354802371
- ll2 -84.1471941022669 -87.23881067147978
-EPSG:24892
- ll 46.36629451501611 -72.95164760214354
- en 954638.4024207894 7227988.413052939
- ll2 46.36629445718444 -72.95164771267649
-EPSG:24893
- ll 49.788352412474666 -65.31805416931797
- en 1697089.757526468 7618004.275491104
- ll2 49.78835236513688 -65.31805428053909
-EPSG:2490
- ll -50.838409079169374 -179.8710735078801
- en 297635.4736279814 -5638070.693214416
- ll2 -50.83840906304495 -179.87107355331574
-EPSG:2491
- ll 8.570241981777713 -173.63165553555336
- en 210055.74412546278 948807.6758490719
- ll2 8.570241991258502 -173.63165555154424
-EPSG:2494
- ll 72.09927963936258 18.71215099317322
- en 421633.2900139058 8004844.879838162
- ll2 72.09927963924724 18.712151008579838
-EPSG:2495
- ll 50.894341513747975 29.63237693777645
- en 685317.9351008818 5643757.00338238
- ll2 50.894341513538606 29.632376941845987
-EPSG:2496
- ll 29.55705284107576 32.265285235887134
- en 428908.50477909844 3271345.8921321477
- ll2 29.55705284174505 32.265285239915734
-EPSG:2497
- ll -66.1616980063067 32.123843698786864
- en 190371.03296632145 -7357918.733043865
- ll2 -66.16169798088896 32.123843799915605
-EPSG:2498
- ll -78.67718487959887 45.926181319312406
- en 520412.23670899833 -8737646.446203064
- ll2 -78.67718485502137 45.926181462644394
-EPSG:2499
- ll 51.79997851909502 54.119896714349885
- en 715294.9723143302 5745774.132076546
- ll2 51.799978519430624 54.119896710117686
-EPSG:2500
- ll -13.663133323293039 62.89002702775241
- en 1138317.665629976 -1518760.8527916423
- ll2 -13.66313332064543 62.89002702770553
-EPSG:25000
- ll 82.03989986135434 0.2271826529695975
- en 293267.53161398164 8594757.755358808
- ll2 82.03989984838114 0.22718261960771818
-EPSG:2501
- ll 60.2229821070261 64.9482501409958
- en 608050.2920560705 6680568.844261408
- ll2 60.22298210862653 64.9482501361799
-EPSG:2502
- ll -82.41519503359594 71.87200829805123
- en 542382.8571536391 -9155910.391343521
- ll2 -82.41519499989376 71.87200842166199
-EPSG:2503
- ll 19.21010608495736 79.09148488066852
- en 930582.0494835995 2130061.0175635517
- ll2 19.210106082363698 79.09148487721045
-EPSG:2504
- ll 17.204120099855047 74.35825139841418
- en -207769.64246926107 1915143.6573133282
- ll2 17.20412009587754 74.3582513960756
-EPSG:2505
- ll 84.78257478127483 83.87409992040284
- en 468306.39578386367 9420119.76321156
- ll2 84.78257477851194 83.87409992989663
-EPSG:2506
- ll -42.810988607247275 91.61454265199954
- en 386671.43428699183 -4742579.273045015
- ll2 -42.81098859360049 91.61454265430174
-EPSG:2507
- ll 8.195637588586507 93.9967739377829
- en -52002.03991073836 909805.5149565378
- ll2 8.195637584172136 93.99677393833822
-EPSG:2508
- ll -53.25643182540114 106.03153134204504
- en 568806.0415416029 -5903595.865823484
- ll2 -53.25643180431777 106.03153133867235
-EPSG:2509
- ll -2.1455828187813353 116.81164627166649
- en 1147557.6489887503 -238402.55653885243
- ll2 -2.1455828222585955 116.81164626869588
-EPSG:2510
- ll 75.94039987828842 114.50685251561265
- en 432343.6973925987 8433362.089712288
- ll2 75.94039987879442 114.50685251679397
-EPSG:2511
- ll -88.52179627148817 122.14011734289734
- en 497455.8364985015 -9836919.471135268
- ll2 -88.52179623585812 122.14011677815417
-EPSG:2512
- ll -77.60212536726972 126.96970663704842
- en 451243.9626320095 -8618271.993419595
- ll2 -77.60212533451552 126.96970656689275
-EPSG:2513
- ll 26.958404382782206 138.91642297036455
- en 888942.5740474951 2989116.7154600066
- ll2 26.958404381439095 138.91642297476517
-EPSG:2514
- ll -27.896094509936546 140.24875942718452
- en 425913.6893306375 -3087093.317551383
- ll2 -27.89609450094408 140.2487594197833
-EPSG:2515
- ll -69.13283322626671 150.7306516835016
- en 648168.3929265037 -7676776.237286483
- ll2 -69.13283320107475 150.73065161550414
-EPSG:2516
- ll 27.141202704545236 156.17636906977617
- en 814834.6759183311 3007335.5510742376
- ll2 27.14120270411114 156.17636906996987
-EPSG:2517
- ll 23.685158506741644 163.3429198120525
- en 943113.2225195655 2627253.763203965
- ll2 23.685158507355908 163.34291980913252
-EPSG:2518
- ll -83.53846921274052 158.28894095068827
- en 415697.82586343295 -9285287.761912873
- ll2 -83.53846919107413 158.28894069799478
-EPSG:2519
- ll 83.9907228879498 174.67596948797453
- en 542816.7722935898 9332273.616709204
- ll2 83.99072288686928 174.6759694441651
-EPSG:2520
- ll 41.311554188715405 175.99107808449824
- en 415355.6126713945 4575772.3531484855
- ll2 41.311554189777056 175.9910780771409
-EPSG:2521
- ll 64.0889997069738 -173.09535690359436
- en 690208.8641015522 7115744.0386356795
- ll2 64.08899970765421 -173.09535691841853
-EPSG:2522
- ll -81.56952605504934 -167.43555449994827
- en 558185.2383875524 -9062348.880125767
- ll2 -81.56952605353369 -167.4355547634166
-EPSG:2523
- ll -65.14159737981996 22.666086548316166
- en 7578303.466335455 -7228211.542383451
- ll2 -65.1415973638531 22.666086627799398
-EPSG:25231
- ll -26.280317639703703 -1.9185218574779
- en 8556.572187326266 -2915846.4572022757
- ll2 -26.28031763936154 -1.9185218581569012
-EPSG:2524
- ll -2.0468177146423727 23.830591063748614
- en 8481266.47573762 -226239.18731668516
- ll2 -2.0468177059662582 23.83059107839891
-EPSG:2525
- ll -67.27270727798995 33.701024083853525
- en 9788687.630965786 -7480401.07741979
- ll2 -67.27270725327512 33.70102413966842
-EPSG:2526
- ll -9.075328402603702 34.12252043161584
- en 1.0953697792446911E7 -1006078.8231262869
- ll2 -9.075328394756719 34.12252044259469
-EPSG:2527
- ll 39.995445175251575 34.72710821092472
- en 1.1647614297338046E7 4430562.026815345
- ll2 39.99544517505817 34.727108212920946
-EPSG:2528
- ll 11.3100655867227 38.17382313511481
- en 1.2737478810914034E7 1251744.1771737544
- ll2 11.310065588575586 38.17382313937606
-EPSG:2529
- ll 67.08588880891838 40.10396313013439
- en 1.3548103984694017E7 7444460.645947963
- ll2 67.0858888084303 40.10396313233533
-EPSG:2530
- ll -88.71354873490591 39.317171185171794
- en 1.4493387923938502E7 -9858517.295333125
- ll2 -88.7135487153629 39.31717266662977
-EPSG:2531
- ll -39.070612382586596 40.44968231426579
- en 1.5106215022520235E7 -4336164.022500769
- ll2 -39.070612365477594 40.44968233686669
-EPSG:2532
- ll 39.09916849304304 46.59182077867685
- en 1.6378280280193644E7 4330545.793777642
- ll2 39.09916849249448 46.591820776406
-EPSG:2533
- ll -25.962862459563638 54.869109487509654
- en 1.7887755611286577E7 -2878383.9983065445
- ll2 -25.962862450597818 54.86910949588372
-EPSG:2534
- ll -70.85266225368396 57.46568694768261
- en 1.8626949147219468E7 -7867742.707041715
- ll2 -70.85266222587283 57.46568701029776
-EPSG:2535
- ll -9.932622821812473 62.794434811936995
- en 2.0136528670831185E7 -1103882.7648039132
- ll2 -9.932622820455556 62.794434809995586
-EPSG:2536
- ll 3.3457917585074597 62.38831845259232
- en 2.0765559405740183E7 370371.45378843544
- ll2 3.3457917569143576 62.38831845111937
-EPSG:2537
- ll 36.25799923083025 56.94377103212117
- en 2.0955499275855508E7 4031301.759383298
- ll2 36.25799922773432 56.94377102640441
-EPSG:2538
- ll 10.18139038698287 64.10000578435074
- en 2.229182323863849E7 1126611.2228964723
- ll2 10.181390384708406 64.10000578169452
-EPSG:2539
- ll 72.31610386038 70.76727571211077
- en 2.3560009865146205E7 8028331.836305327
- ll2 72.31610386119894 70.76727570989956
-EPSG:25391
- ll 48.74313445920839 113.87029829091429
- en 269695.6080100512 5405564.438001329
- ll2 48.74313441769301 113.87029832799767
-EPSG:25392
- ll 57.49785621820766 124.46718554123628
- en 827415.4273333024 6388264.494426089
- ll2 57.49785616722679 124.4671855932772
-EPSG:25393
- ll 34.92923225055986 126.52475969187005
- en 1004868.4137029161 3880585.000568802
- ll2 34.929232240030146 126.52475969925113
-EPSG:25394
- ll -12.18273262974914 127.83242391839869
- en 1026305.9290024643 -1351890.8806799613
- ll2 -12.182732636336693 127.83242389791751
-EPSG:25395
- ll -7.979372741023184 130.24183143559276
- en 1078513.3133460898 -885969.4029243139
- ll2 -7.979372743465258 130.24183141240977
-EPSG:2540
- ll -62.410025792789256 76.72024011564265
- en 2.47438945168139E7 -6931501.855967394
- ll2 -62.41002576505909 76.72024013527474
-EPSG:2541
- ll 65.85935402296204 81.66222698003955
- en 2.5803762901256688E7 7323334.1356059555
- ll2 65.85935402063691 81.66222695706423
-EPSG:2542
- ll -2.151770265911864 74.04663643649427
- en 2.605989958770485E7 -238417.458617221
- ll2 -2.1517702685688103 74.04663643531104
-EPSG:2543
- ll -84.01863234719805 85.85131647459296
- en 2.7556430841299478E7 -9336298.39144611
- ll2 -84.01863231045739 85.85131655419165
-EPSG:2544
- ll -87.44415341513998 83.61413308148977
- en 2.8498104756147504E7 -9716525.671326438
- ll2 -87.44415337819794 83.61413331181421
-EPSG:2545
- ll -17.77264569269755 84.09052492153856
- en 2.9191374805716313E7 -1968124.8970341405
- ll2 -17.772645692666803 84.0905249216193
-EPSG:2546
- ll -47.993002884288984 88.00972268120827
- en 3.035145501627557E7 -5319499.070487264
- ll2 -47.99300286683548 88.00972268578857
-EPSG:2547
- ll -32.40861613202667 90.34679428245953
- en 3.1250358280528944E7 -3590180.414120119
- ll2 -32.40861612519073 90.34679428369874
-EPSG:2548
- ll -56.68976855682754 90.147660758034
- en 3.2141614922932416E7 -6300629.735598048
- ll2 -56.68976852969765 90.14766076851969
-EPSG:2549
- ll -53.634020080882884 103.57972376550715
- en 3.3802833252676055E7 -5954876.503591873
- ll2 -53.63402005867372 103.57972376306142
-EPSG:2551
- ll 22.439291830551937 103.81102973859903
- en 3.4686424520048186E7 2483629.3824471035
- ll2 22.439291828577748 103.81102973958451
-EPSG:2552
- ll -43.99633304127935 108.7940361355744
- en 3.580429601398232E7 -4880347.420275321
- ll2 -43.99633302649848 108.79403613283388
-EPSG:2553
- ll 16.974734143784445 113.76282404687385
- en 3.711455980541164E7 1886619.7756262629
- ll2 16.97473414030708 113.76282404897339
-EPSG:2554
- ll 5.538769450448029 115.93057577970521
- en 3.804693494813651E7 614813.1216148292
- ll2 5.538769446396871 115.93057578041318
-EPSG:2555
- ll 45.36557700652375 114.65158678483272
- en 3.855100097401601E7 5025818.8499369
- ll2 45.365577009037665 114.65158678850808
-EPSG:2556
- ll -75.10037781910101 112.31208345966441
- en 3.936546395827233E7 -8343456.862180887
- ll2 -75.10037778491417 112.31208343420008
-EPSG:2557
- ll -34.692301258914256 123.02843399558012
- en 4.077746278942089E7 -3844562.142822248
- ll2 -34.69230124922306 123.02843399112055
-EPSG:2558
- ll 25.990111991487368 123.42054219013225
- en 4.1542031450701594E7 2875864.960341595
- ll2 25.990111990130433 123.42054219445531
-EPSG:2559
- ll 12.66579356111761 129.32159691556288
- en 4.2860914211960316E7 1403101.745162831
- ll2 12.665793558381038 129.32159691889137
-EPSG:2560
- ll 70.03091764239142 126.28093556026599
- en 4.339628102389957E7 7774779.172648502
- ll2 70.03091764370394 126.28093556364975
-EPSG:2561
- ll -58.74172696507422 134.58140910083716
- en 4.464935941658126E7 -6516751.001924033
- ll2 -58.741726940638145 134.58140907448586
-EPSG:2562
- ll -45.67549561488592 131.6618086579457
- en 4.523979883326658E7 -5065395.817764534
- ll2 -45.67549559749567 131.6618086452981
-EPSG:2563
- ll 28.779657356701108 140.21296260561002
- en 4.671600466463159E7 3186920.359401055
- ll2 28.779657355607345 140.2129626098366
-EPSG:2564
- ll 19.34438794679312 147.67606421524314
- en 4.8202608564055316E7 2153462.0356573598
- ll2 19.344387944321806 147.6760642171699
-EPSG:2565
- ll 69.15239332875441 137.75545257880685
- en 4.825214858726363E7 7687114.028496907
- ll2 69.15239332685519 137.7554525935572
-EPSG:2566
- ll -88.1521267226367 142.17597581334394
- en 4.948253333598289E7 -9796378.517293207
- ll2 -88.15212669397044 142.17597501812838
-EPSG:2567
- ll 50.68033853502007 150.0465327398057
- en 5.050316656243082E7 5616593.233080072
- ll2 50.680338534999755 150.04653274312375
-EPSG:2568
- ll 29.57295093299956 148.58444970682845
- en 5.107179460089318E7 3281002.0607506405
- ll2 29.572950931876882 148.58444970910105
-EPSG:2569
- ll -35.48142379028418 162.82679099824568
- en 5.31198801081291E7 -3949467.747226971
- ll2 -35.481423769526195 162.8267909768556
-EPSG:2570
- ll 28.003730750922756 155.49010912345642
- en 5.315450660547106E7 3103906.6879010326
- ll2 28.00373075037732 155.49010912383145
-EPSG:2571
- ll -48.82069409109105 168.9937596252532
- en 5.501327338371986E7 -5433324.671815082
- ll2 -48.82069406203729 168.99375957165464
-EPSG:2572
- ll -66.3247742690611 162.45682207476486
- en 5.53858775304874E7 -7361421.647335954
- ll2 -66.32477424778276 162.45682200407913
-EPSG:2573
- ll -67.93871933279951 168.3066694927311
- en 5.651271474580412E7 -7539139.995957047
- ll2 -67.93871931377329 168.306669409782
-EPSG:2574
- ll -36.462998045573414 169.0588443145627
- en 5.732583666251909E7 -4038658.3521916852
- ll2 -36.462998029145474 169.0588442872028
-EPSG:2575
- ll -43.67987209046333 167.34584745886718
- en 5.796321041221484E7 -4859833.510490613
- ll2 -43.6798720657325 167.34584743075575
-EPSG:2576
- ll 84.0067425997012 172.2505678362553
- en 5.9444533434940204E7 9334988.380041564
- ll2 84.00674259844574 172.25056779530607
-EPSG:2578
- ll -1.2103503796226818 -173.4212242179165
- en 6.1898398068342835E7 -134028.63526394466
- ll2 -1.2103503678128165 -173.42122423862176
-EPSG:2579
- ll 76.51830545047065 -170.88400650904308
- en 6.258093952681415E7 8498708.989557408
- ll2 76.51830545092311 -170.88400653400828
-EPSG:2580
- ll -49.8808530862695 -174.40369159431012
- en 6.325522663965133E7 -5533206.396782418
- ll2 -49.88085307119714 -174.40369164586437
-EPSG:2581
- ll 36.60553223355544 -168.68041711554267
- en 6.443895759395161E7 4053078.15975426
- ll2 36.60553223898789 -168.68041713116165
-EPSG:2582
- ll -74.1905090159452 26.731852586064278
- en 674262.9421742935 -8245056.700623882
- ll2 -74.1905089990179 26.731852705273482
-EPSG:25828
- ll -4.1054098714278995 -13.093039202004235
- en 711695.0792489832 -454031.21322032734
- ll2 -4.105409871427762 -13.093039202013365
-EPSG:25829
- ll -3.9515249777694885 -10.844280831864726
- en 295227.07231557614 -436996.3591533546
- ll2 -3.9515249777693806 -10.844280831857008
-EPSG:2583
- ll -1.1384554118300372 25.668961615147424
- en 685893.4522320821 -125848.56534306754
- ll2 -1.138455403905267 25.668961628537623
-EPSG:25830
- ll -2.9346400148343643 -3.8538084030228905
- en 405112.7461393682 -324404.9407748314
- ll2 -2.934640014834364 -3.853808403022733
-EPSG:25831
- ll 45.98293085062029 3.4583585116644606
- en 535502.6597518034 5092253.119117581
- ll2 45.9829308506203 3.4583585116644624
-EPSG:25832
- ll 28.978940242361965 9.444389968575432
- en 543292.555574971 3205733.7208009325
- ll2 28.97894024236197 9.444389968575434
-EPSG:25833
- ll -4.189091685704661 13.025970226764912
- en 280879.6593442116 -463304.5923922104
- ll2 -4.189091685704488 13.025970226775804
-EPSG:25834
- ll 75.74408975899891 20.949890484704383
- en 498622.5702901486 8406630.953545488
- ll2 75.74408975899892 20.949890484704383
-EPSG:25835
- ll 76.23959351972334 30.83014224851491
- en 601631.1445402491 8465221.08426254
- ll2 76.23959351967382 30.830142248356598
-EPSG:25836
- ll 66.28301129980083 36.9236047114277
- en 676010.1670961326 7356976.315911358
- ll2 66.28301129959381 36.92360471126211
-EPSG:25837
- ll 58.765510814933926 36.51616649880137
- en 356349.7890584799 6516605.005135051
- ll2 58.765510814913554 36.51616649880102
-EPSG:25838
- ll 78.90937386121946 48.49407789203991
- en 574989.9568031528 8762104.027997162
- ll2 78.90937386120359 48.494077891968864
-EPSG:2584
- ll -77.58931019201954 23.557935686977938
- en 417555.3855782105 -8618485.819878723
- ll2 -77.58931017842798 23.55793585292205
-EPSG:2585
- ll 22.474898798889015 25.20098338424005
- en 5808.7725505306735 2494422.7503690226
- ll2 22.4748988016385 25.2009833923629
-EPSG:2586
- ll 4.786245011835433 38.255473687191525
- en 1083934.1362843588 531580.3841386834
- ll2 4.78624501482243 38.25547369048506
-EPSG:2587
- ll 47.46757603494592 30.714820318265847
- en 101714.63335019886 5272896.779836045
- ll2 47.46757603284003 30.714820322339705
-EPSG:2588
- ll -35.945227274029286 42.12500694155695
- en 782105.3749088522 -3983934.463704358
- ll2 -35.94522725868472 42.12500696135297
-EPSG:25884
- ll -27.753789195321467 23.361319628249934
- en 437060.4391217219 -3070092.186783081
- ll2 -27.753789195320767 23.361319628249923
-EPSG:2589
- ll -2.413184713443087 44.13152687399103
- en 737222.968267076 -266936.1377146655
- ll2 -2.4131847101247614 44.13152687884334
-EPSG:2590
- ll 80.62680979475309 38.52578714955263
- en 382595.4847695553 8961782.406224025
- ll2 80.62680979303963 38.525787186545934
-EPSG:2591
- ll 38.264988014103636 52.92928146960378
- en 931609.8477323926 4248509.366089652
- ll2 38.264988012756035 52.929281466363086
-EPSG:2592
- ll -16.895519085557808 46.44902197265316
- en 14768.127006171155 -1874274.197236966
- ll2 -16.895519078237438 46.44902198106953
-EPSG:2593
- ll 30.10802203281345 49.14823349446689
- en 32185.488442098605 3342125.1621385724
- ll2 30.108022031515226 49.14823349145389
-EPSG:25932
- ll 66.81352408807737 15.265736082004029
- en 774878.2595684144 1.74244922576068E7
- ll2 66.81352408750216 15.26573607382967
-EPSG:2594
- ll -20.685504445627117 63.128152991263484
- en 1139466.534125018 -2300287.8192538777
- ll2 -20.685504439962457 63.12815299567211
-EPSG:2595
- ll -68.6403715185664 57.51254591442608
- en 398946.892615565 -7619347.696007
- ll2 -68.64037149133439 57.51254596895935
-EPSG:2596
- ll -2.200475381125841 65.12810691361013
- en 736840.4918646559 -243400.31166201647
- ll2 -2.200475382390734 65.12810691268682
-EPSG:2597
- ll -86.49530495342168 62.9682687346542
- en 479376.84886244225 -9611100.484483613
- ll2 -86.49530492220815 62.968269097332495
-EPSG:2598
- ll 36.37782108728794 72.31842009757497
- en 797873.7704832822 4032648.672386984
- ll2 36.3778210875162 72.31842009269673
-EPSG:2599
- ll 72.54611766902988 74.93730237930137
- en 598406.7129661285 8055519.647892562
- ll2 72.54611767002747 74.937302377098
-EPSG:2601
- ll -41.11098166009078 69.57896805114036
- en 44602.82446972112 -4567016.19263421
- ll2 -41.11098164395697 69.57896806003015
-EPSG:2602
- ll 64.15622406295753 73.7724122416842
- en 294460.1362887792 7124140.607681202
- ll2 64.15622406479339 73.77241223779772
-EPSG:2603
- ll 10.766390295223289 77.2819662460225
- en 93106.39524688321 1193171.6565011821
- ll2 10.766390291795712 77.28196624324028
-EPSG:2604
- ll 65.43390870278407 84.55629957405331
- en 525854.6517075805 7259865.644773685
- ll2 65.43390870561491 84.55629957125295
-EPSG:2605
- ll -58.18249671968354 81.82921205477669
- en 195981.06957414612 -6463227.672949209
- ll2 -58.1824966935054 81.82921206875622
-EPSG:2606
- ll -34.030728759104164 84.4218713002967
- en -15460.884962566313 -3781056.960305835
- ll2 -34.03072874946649 84.42187130146341
-EPSG:2607
- ll 63.315515877131304 96.74303630280477
- en 687554.565675662 7029057.446341033
- ll2 63.31551588044282 96.74303630222016
-EPSG:2608
- ll -47.166559686041495 101.98917523006435
- en 954021.4504646675 -5243126.285195504
- ll2 -47.16655966530967 101.98917522682359
-EPSG:2609
- ll -48.107552412297224 99.57701595352576
- en 542947.5065433204 -5330479.641914866
- ll2 -48.107552394985355 99.57701595354268
-EPSG:2610
- ll -78.42039701649583 108.8325160666954
- en 652814.6310873748 -8717703.704333747
- ll2 -78.42039698009623 108.83251601048826
-EPSG:2611
- ll 83.18068017177461 107.81679710329972
- en 537335.0610638963 9241260.210899046
- ll2 83.18068016969376 107.81679710117459
-EPSG:2612
- ll -87.42248406295488 109.76431105147675
- en 508828.6129047761 -9714235.819574615
- ll2 -87.4224840251994 109.7643109043975
-EPSG:2613
- ll -61.33331593138294 104.28317426700178
- en 140773.78549794416 -6821098.263519148
- ll2 -61.33331589781426 104.28317428208045
-EPSG:2614
- ll -43.697291417751494 120.03279304568403
- en 986305.8541685587 -4857843.192366811
- ll2 -43.69729139889457 120.03279303788653
-EPSG:2615
- ll 71.80096715936165 111.3288695543576
- en 302451.18856785016 7979242.894602155
- ll2 71.80096716008286 111.32886956142029
-EPSG:2616
- ll 86.56284752857968 119.27871434905154
- en 495127.98566598666 9618122.032006145
- ll2 86.56284752503221 119.27871432834377
-EPSG:2617
- ll 64.05078949740445 119.33725001617974
- en 321116.5619896683 7110691.701084639
- ll2 64.05078949990649 119.33725002018545
-EPSG:2618
- ll 57.0675182512027 124.28175180419348
- en 395704.133769875 6328783.220925243
- ll2 57.06751825378919 124.28175180917337
-EPSG:2619
- ll -53.71261571891631 122.68552110590593
- en 83231.33743116981 -5972429.966106253
- ll2 -53.71261569127873 122.68552110065886
-EPSG:26191
- ll 70.30220232301706 -64.28849042800519
- en -2292319.53554237 5604812.6271164855
- ll2 70.30220229720075 -64.288490354823
-EPSG:26192
- ll 65.3188320459292 -24.504004388371257
- en -635831.6660103502 4675596.664184419
- ll2 65.318832001188 -24.504004316526853
-EPSG:26194
- ll -5.132680526489995 -70.1290967848276
- en -6738289.321725496 -1211200.154670201
- ll2 -5.132680523558147 -70.12909678248208
-EPSG:26195
- ll 62.27120612811704 24.643894671123817
- en 3599332.165102169 5478373.1866995245
- ll2 62.271206090059245 24.643894699404353
-EPSG:2620
- ll -76.60645434507843 136.01766717447975
- en 603764.886129884 -8509819.819616295
- ll2 -76.60645431463716 136.01766709015305
-EPSG:2621
- ll 18.451207811533962 130.03886398842238
- en -24686.763455474982 2048192.111995664
- ll2 18.45120780904452 130.03886399245553
-EPSG:2622
- ll 39.4901469261134 132.00385790906418
- en -16104.09212739754 4390184.999117606
- ll2 39.49014692353625 132.00385791408274
-EPSG:2623
- ll 36.529334470735066 146.4741239492154
- en 990353.4186814814 4058310.6151882247
- ll2 36.529334468707795 146.47412395395318
-EPSG:26237
- ll 81.71801393963267 42.34081955590373
- en 553779.0009732527 9074623.778211772
- ll2 81.71801343492183 42.34081890908439
-EPSG:2624
- ll 16.014552926895703 142.52489704496475
- en 341987.246392349 1771885.7562792925
- ll2 16.014552925417664 142.52489704740532
-EPSG:2625
- ll -88.72689446381892 143.29066109547293
- en 490689.0927388532 -9860145.158518994
- ll2 -88.72689443571907 143.29065990810147
-EPSG:2626
- ll -6.033192523721041 149.25654231971265
- en 417555.25347629027 -667127.3778649118
- ll2 -6.033192520772795 149.256542316145
-EPSG:2627
- ll 58.86793720872765 146.2595921049306
- en 111405.59972579364 6547624.400277762
- ll2 58.867937201321055 146.25959212667868
-EPSG:2628
- ll -62.233726410826094 152.6563473095116
- en 326058.97404825536 -6907489.200733943
- ll2 -62.23372638727024 152.65634726053625
-EPSG:2629
- ll -47.83932280128015 158.60779237773292
- en 470496.83900740393 -5300628.989102795
- ll2 -47.83932278202922 158.6077923468479
-EPSG:2630
- ll 36.51046473260571 168.05447131956282
- en 1042505.4503207818 4059363.7833779915
- ll2 36.51046473030629 168.0544713170289
-EPSG:2631
- ll -44.43074144537783 165.06239133166557
- en 504817.5655830004 -4921681.723692632
- ll2 -44.4307414272119 165.06239129995342
-EPSG:2632
- ll -71.68823482961395 165.10305143633101
- en 398260.3610890288 -7959852.01142895
- ll2 -71.68823480959514 165.10305133784985
-EPSG:2633
- ll 34.55257843537511 177.68224076610142
- en 1113656.6556954586 3845407.1723110727
- ll2 34.552578433390735 177.68224075939372
-EPSG:26331
- ll 57.375354403573624 5.081478312704455
- en 625244.4653092977 6360954.568422362
- ll2 57.375354383095996 5.08147829368002
-EPSG:26332
- ll 88.55229533534578 4.321185800923512
- en 486894.5038899348 9836667.977319483
- ll2 88.55229534918583 4.321185242909407
-EPSG:2634
- ll -13.86999687477956 177.92245673257193
- en 924134.2277443829 -1537396.4602571644
- ll2 -13.869996862346895 177.92245671227397
-EPSG:2635
- ll -34.037651530264526 175.69436014569
- en 379264.457148293 -3768597.7272039903
- ll2 -34.037651514123496 175.69436011604077
-EPSG:2636
- ll -72.86056190236496 176.989634546075
- en 400825.87160671287 -8090750.160844345
- ll2 -72.86056188827341 176.9896344268312
-EPSG:2637
- ll 72.72989109778706 -174.82355703608482
- en 571983.6098683993 8075022.311121866
- ll2 72.7298910980004 -174.8235570544938
-EPSG:2638
- ll -68.96068400635802 -167.58391026938915
- en 756624.6974526484 -7666579.2040124
- ll2 -68.96068399673399 -167.58391038997874
-EPSG:2639
- ll -62.51001360908694 -175.44084831430456
- en 271177.9636084408 -6941730.119638049
- ll2 -62.5100135956506 -175.44084839050086
-EPSG:26391
- ll 36.32518661725781 9.073742124585424
- en 641536.7054758018 3588077.429833316
- ll2 36.32518661114233 9.073742121967888
-EPSG:26392
- ll 78.49777593239776 12.820794704857263
- en 766744.2660628858 8276451.906888776
- ll2 78.49777593153276 12.820794642315661
-EPSG:26393
- ll 78.45920916742841 10.824511324062282
- en 1073019.9520904436 8269125.105159166
- ll2 78.45920916613265 10.824511259124657
-EPSG:2640
- ll -8.954259427382425 -172.3435049753189
- en 21720.881180126453 -992964.7683452191
- ll2 -8.954259413763682 -172.34350499827215
-EPSG:2641
- ll 61.468561962076336 19.6192066912009
- en 7426524.382452254 6818620.67025674
- ll2 61.46856196276317 19.619206701642874
-EPSG:2642
- ll -79.46008103376109 26.75400408354463
- en 8556371.258520693 -8826288.793704411
- ll2 -79.46008102037317 26.754004262206767
-EPSG:2643
- ll -21.023986653229926 26.140295321387505
- en 9410750.485658184 -2325923.2197300596
- ll2 -21.023986639929735 26.140295341291765
-EPSG:2644
- ll 57.95775614016037 29.03606419711334
- en 1.0443057076430958E7 6427100.380718782
- ll2 57.95775614027321 29.036064202811417
-EPSG:2645
- ll -78.56673538648 39.710441496030334
- en 1.1648367822951488E7 -8733711.953530468
- ll2 -78.56673536580546 39.710441614980304
-EPSG:2646
- ll 45.02171571729926 34.83411693349947
- en 1.2408225802616445E7 4988121.597963538
- ll2 45.02171571755443 34.83411693630544
-EPSG:2647
- ll -75.77983854735949 44.490039037230375
- en 1.3650519680893304E7 -8421038.57034686
- ll2 -75.77983852468485 44.490039140181324
-EPSG:2648
- ll 30.096456694953304 36.18056584466783
- en 1.3938674950397724E7 3345227.508685351
- ll2 30.096456694595915 36.18056584602041
-EPSG:2649
- ll -6.7719670424664145 40.04229310440567
- en 1.4951367028462611E7 -751567.6204408607
- ll2 -6.771967035836857 40.04229311431745
-EPSG:2650
- ll -17.446204656828584 50.70928800834027
- en 1.6788002422486223E7 -1931661.914691635
- ll2 -17.44620464941656 50.709288015763406
-EPSG:2651
- ll -3.4370485281188223 45.231129661551435
- en 1.6857969067543644E7 -381916.2300908601
- ll2 -3.437048523550388 45.23112967141436
-EPSG:2652
- ll 81.1485000354761 57.464618340105865
- en 1.8559602662630104E7 9015240.64582669
- ll2 81.14850003384913 57.46461835138308
-EPSG:2653
- ll 15.084795627140437 55.19649130434485
- en 1.9306168648697644E7 1669248.7757692635
- ll2 15.08479562677633 55.19649130370127
-EPSG:2654
- ll 24.809262656746938 65.66708922330972
- en 2.107366448956351E7 2756932.854958647
- ll2 24.809262655048375 65.66708922150808
-EPSG:2655
- ll 28.640560540810768 69.36838986971148
- en 2.2123436872826044E7 3186155.5308149895
- ll2 28.64056053818454 69.36838986912748
-EPSG:2656
- ll 76.1730315708929 64.16975123930621
- en 2.2451235047163315E7 8458691.75377421
- ll2 76.17303157036571 64.16975124132581
-EPSG:2657
- ll 65.055499428953 68.63537710269394
- en 2.348290257508729E7 7217631.641586449
- ll2 65.05549943020314 68.63537709971109
-EPSG:2658
- ll 1.1772196211656336 68.46194556073986
- en 2.4106036538931224E7 130502.0908357378
- ll2 1.1772196202798708 68.46194556022554
-EPSG:2659
- ll -32.78685745356105 77.37488966045572
- en 2.572255566925306E7 -3631536.146722444
- ll2 -32.786857444060175 77.37488966474886
-EPSG:2660
- ll -21.92686780696495 83.63795052829703
- en 2.7083217858247027E7 -2436359.9417070546
- ll2 -21.926867802959233 83.63795053018991
-EPSG:2661
- ll -72.11455055712831 81.08222555994125
- en 2.75028631505122E7 -8004906.416093521
- ll2 -72.11455052679383 81.08222558996908
-EPSG:2662
- ll -65.66468643969057 89.74596487415943
- en 2.8764063879062638E7 -7297501.087469035
- ll2 -65.66468640948764 89.7459648800064
-EPSG:2663
- ll 2.3668342302455017 80.80170330712501
- en 2.8809270292641036E7 263341.1500333152
- ll2 2.3668342276985395 80.80170331266768
-EPSG:26632
- ll 0.11523072004813173 13.368444060218128
- en 986690.5624995875 12731.752171469767
- ll2 0.11523071945144983 13.368444060914243
-EPSG:2664
- ll -28.57908102488682 86.46785427304178
- en 3.0154346130324602E7 -3167638.74507136
- ll2 -28.579081018492737 86.46785427464636
-EPSG:2665
- ll -77.87578352377257 93.15784902340566
- en 3.1503719304861996E7 -8647973.36172928
- ll2 -77.8757834905131 93.15784904191047
-EPSG:2666
- ll 45.56645300408073 89.60629130515555
- en 3.2000900186838463E7 5067873.572376015
- ll2 45.56645300061276 89.6062913068675
-EPSG:2667
- ll 10.129283516982753 103.36241119848496
- en 3.3978535478421144E7 1123439.2623703526
- ll2 10.129283513841324 103.36241119830927
-EPSG:2668
- ll -65.69111150073427 105.62320148340781
- en 3.466642289698338E7 -7293164.1101929825
- ll2 -65.6911114723472 105.62320147822639
-EPSG:2669
- ll 19.606752207105046 102.1245738252578
- en 3.519824409902048E7 2171444.597465187
- ll2 19.606752205101337 102.12457382551277
-EPSG:26692
- ll -35.43327394861492 12.129197264663997
- en 784189.8443076634 6074382.542004207
- ll2 -35.433273900545764 12.129197243456883
-EPSG:2670
- ll 50.522598829098115 107.52030365520756
- en 3.646596259332293E7 5599133.470802473
- ll2 50.522598831977525 107.52030365659061
-EPSG:2671
- ll 81.24673094466326 113.39756555817745
- en 3.754071364453873E7 9025235.15928755
- ll2 81.24673094321008 113.39756555577496
-EPSG:2672
- ll 49.694553271706894 118.93052473041402
- en 3.885562510647869E7 5518604.693170088
- ll2 49.69455327268495 118.93052473329084
-EPSG:2673
- ll 69.68985381633419 122.14874954045149
- en 3.969928851085786E7 7742827.970239765
- ll2 69.68985381689254 122.14874954045749
-EPSG:2674
- ll -33.25997777005991 120.39646790393175
- en 4.053689493683923E7 -3681577.197997969
- ll2 -33.259977760678844 120.3964679003461
-EPSG:2675
- ll -29.4604129129156 118.3821888831435
- en 4.105174460118174E7 -3269120.537473376
- ll2 -29.460412905478517 118.38218888017816
-EPSG:2676
- ll 27.225026465463827 124.1087758156369
- en 4.2312582246551536E7 3014048.336793689
- ll2 27.225026464656494 124.10877581889632
-EPSG:2677
- ll -33.52278835338342 134.94345222850876
- en 4.4052462803557396E7 -3726521.100452557
- ll2 -33.52278834014943 134.9434522226255
-EPSG:2678
- ll -80.69662469179971 127.11575375666885
- en 4.441184333158471E7 -8966662.542280626
- ll2 -80.69662466032258 127.11575367042505
-EPSG:2679
- ll -86.77664152405346 139.91887843699524
- en 4.5530779870376885E7 -9643314.276367523
- ll2 -86.77664149617776 139.91887804709214
-EPSG:2680
- ll -32.128550625016814 139.70920014927867
- en 4.6661209694594026E7 -3557322.122352591
- ll2 -32.12855061365418 139.70920014046823
-EPSG:2681
- ll -13.7769927193129 145.79175521704806
- en 4.8018619765053175E7 -1528768.950169738
- ll2 -13.776992714040377 145.7917552117114
-EPSG:2682
- ll 39.06292102216105 141.75679771104294
- en 4.830574725375093E7 4327961.38716125
- ll2 39.06292102221766 141.75679771445976
-EPSG:2683
- ll -76.48900863577677 152.57334660679618
- en 4.964511343320839E7 -8500059.255581465
- ll2 -76.48900861162801 152.5733464957683
-EPSG:2684
- ll 33.76900737882953 147.49809797162183
- en 5.02681060336332E7 3740937.2775980933
- ll2 33.76900737852536 147.4980979738346
-EPSG:26847
- ll 16.39772844788071 -71.661111974548
- en -123954.9189355644 -9908756.875557574
- ll2 16.3977284478702 -71.66111197451524
-EPSG:26848
- ll 21.793677556955686 -73.15999798420899
- en 1936888.0224596094 -7644891.337296791
- ll2 21.79367755694474 -73.15999798422061
-EPSG:26849
- ll 85.48758820579958 -132.5283425037764
- en 913277.8848105937 1.6739862202663593E7
- ll2 85.4875882057996 -132.52834250377643
-EPSG:2685
- ll 54.23959993237156 151.64403273010132
- en 5.1411487581720084E7 6013518.840490465
- ll2 54.23959993257653 151.64403273177882
-EPSG:26850
- ll 55.81740731013019 -12.158860209937558
- en 1.6849205721212152E7 1.2403121047977453E7
- ll2 55.81740731013026 -12.158860209937544
-EPSG:26851
- ll 58.33652852959381 -101.3881438659555
- en 1160326.688802572 6044430.259109501
- ll2 58.3365285295938 -101.3881438659555
-EPSG:26852
- ll 67.94628713489327 -42.71306943005604
- en 1.0008778056726824E7 1.355824243179172E7
- ll2 67.94628713489328 -42.71306943005603
-EPSG:26853
- ll 32.160750840838006 -92.3160640765673
- en -2016570.404292633 -2030068.7044619794
- ll2 32.160750840838276 -92.3160640765673
-EPSG:26854
- ll 85.34473841086165 -79.14913790407059
- en 2083451.8296443645 2.1314488764522713E7
- ll2 85.34473841086165 -79.14913790407059
-EPSG:26855
- ll -81.5529804237013 -67.61175580156002
- en 1032053.6597985624 -4.558410016364004E7
- ll2 -81.55298042370198 -67.61175580156002
-EPSG:26856
- ll -22.00921876913486 -67.98643340936982
- en 3691439.00163889 -2.3557671331128143E7
- ll2 -22.00921876913315 -67.98643340936842
-EPSG:26857
- ll 26.892490922393264 -139.8678219661685
- en -1.2600870846983742E7 -2218116.4251352246
- ll2 26.89249092239272 -139.86782196616852
-EPSG:26858
- ll 63.87044764930923 -105.45345931956697
- en 723001.1341196283 7466570.793369825
- ll2 63.87044764930993 -105.45345931956697
-EPSG:26859
- ll 73.67395850390479 -42.74638310800182
- en 8531377.442394929 1.4049531008863231E7
- ll2 73.67395850390574 -42.74638310800184
-EPSG:2686
- ll 41.75058847004851 161.12613331183675
- en 5.292631066370183E7 4636744.17469075
- ll2 41.750588468795975 161.12613331112692
-EPSG:26860
- ll 78.96031633704027 -116.01906260073847
- en 65535.364140734346 1.5880687274847085E7
- ll2 78.96031633704114 -116.01906260073848
-EPSG:26861
- ll 27.464543787155385 -34.61601839260254
- en 1.6226934608956032E7 -409357.54499313916
- ll2 27.464543787154742 -34.61601839260255
-EPSG:26862
- ll 45.4790224100474 -0.27357702759465496
- en 2.0307472325933143E7 1.1629685208056305E7
- ll2 45.47902241004751 -0.2735770275946692
-EPSG:26863
- ll -25.42388972865492 -64.38497548303167
- en 2343041.496562245 -2.5116171503533013E7
- ll2 -25.423889728549813 -64.38497548282014
-EPSG:26864
- ll -20.85375533378395 -73.60750118137494
- en 1777417.1203623181 -2.3145253554699484E7
- ll2 -20.853755333759928 -73.60750118139288
-EPSG:26865
- ll 18.975341582478798 -124.47248413621301
- en -9180965.484504806 -7674305.844445998
- ll2 18.97534158247878 -124.47248413621305
-EPSG:26866
- ll 75.59355977653968 -111.92407008163708
- en 700661.1231353256 1.234226484438912E7
- ll2 75.59355977654062 -111.92407008163708
-EPSG:26867
- ll 3.115209313960243 -122.3991171136626
- en -1.018951843339961E7 -1.318592131060911E7
- ll2 3.1152093139602623 -122.39911711366261
-EPSG:26868
- ll 43.95535073048745 -99.23592913635416
- en 1841741.7603919578 1502825.5261817481
- ll2 43.955350730487545 -99.23592913635416
-EPSG:26869
- ll 29.689991975547443 -146.48905812643156
- en -1.766493105905726E7 4455663.528117293
- ll2 29.689991975546235 -146.48905812643156
-EPSG:2687
- ll 72.7731539283449 161.58232015907072
- en 5.35852565144337E7 8080339.991906769
- ll2 72.773153927672 161.58232015244596
-EPSG:26870
- ll -19.700262878203176 -45.51374424637663
- en 2.1210220052942175E7 -2.0705088141486928E7
- ll2 -19.700262878203105 -45.51374424637664
-EPSG:2688
- ll -2.3918013133575755 161.4121518886641
- en 5.443449509610685E7 -264407.595033568
- ll2 -2.3918013079164684 161.4121518812736
-EPSG:2689
- ll -11.151667787970368 159.44886759764765
- en 5.489262668007277E7 -1238874.9984550928
- ll2 -11.151667780276263 159.4488675906468
-EPSG:26891
- ll -41.05244540184473 -77.68345385676209
- en 709745.2176184085 -4557135.5224178
- ll2 -41.05244540095229 -77.68345385642834
-EPSG:26892
- ll -51.7711619980061 -86.64082510150855
- en -84386.36110733746 -5752379.030786081
- ll2 -51.77116199495548 -86.64082509928518
-EPSG:26893
- ll 48.33662552319328 -78.24904332630187
- en 731041.7584140426 5371328.9344500555
- ll2 48.33662551989266 -78.24904332810735
-EPSG:26894
- ll 16.381757647643283 -81.5565344388283
- en 887002.4376620116 1819524.6744352372
- ll2 16.381757647303985 -81.55653443936139
-EPSG:26895
- ll 50.12996154463829 -93.52069772519924
- en 53115.326452178735 5560685.468484274
- ll2 50.129961544457274 -93.5206977252175
-EPSG:26896
- ll -12.940468098241269 -89.02282774560251
- en 736636.2160374871 -1434342.0064109561
- ll2 -12.940468098204192 -89.02282774582811
-EPSG:26897
- ll 5.686567649270003 -92.66255487252835
- en 674676.0390454185 629814.2375198619
- ll2 5.6865676492638295 -92.66255487269473
-EPSG:26898
- ll -47.63178693860487 -59.3180374461332
- en -169894.71946612943 -5296334.04366065
- ll2 -47.63178693293372 -59.318037441617406
-EPSG:26899
- ll 42.394612566822275 -57.212288383346305
- en 204993.21199863893 4695711.721896251
- ll2 42.39461256682209 -57.212288383346646
-EPSG:2690
- ll -79.60108300022891 172.330238910016
- en 5.658709273526019E7 -8843927.238610264
- ll2 -79.60108298573473 172.33023873121428
-EPSG:26901
- ll -63.437237737144216 -172.05898154334974
- en 746341.1354823004 -7043815.41140077
- ll2 -63.43723773614176 -172.05898154458907
-EPSG:26902
- ll -80.33483619626111 -172.86575256465855
- en 465035.9847420745 -8919520.271695329
- ll2 -80.33483619626088 -172.8657525646583
-EPSG:26903
- ll -52.61092704322789 -162.4300343724802
- en 674002.4632117092 -5832092.265474731
- ll2 -52.610927043200114 -162.43003437247492
-EPSG:26904
- ll 10.417349153653802 -162.03486442603847
- en 167679.43983122276 1153149.1915692096
- ll2 10.417349153648185 -162.0348644259661
-EPSG:26905
- ll -29.545145433359927 -159.4300979194559
- en -123653.14616837632 -3285688.123817925
- ll2 -29.54514543114105 -159.43009792249742
-EPSG:26906
- ll -12.576648377828803 -152.21088570414415
- en -66730.29858028772 -1395942.6206065891
- ll2 -12.576648377616355 -152.210885703045
-EPSG:26907
- ll 33.48952854757334 -144.98566869301789
- en 129627.44707862154 3712673.3442179584
- ll2 33.489528547399054 -144.9856686932645
-EPSG:26908
- ll 41.384269998554004 -130.51283944633226
- en 875225.6014481708 4591140.3961023055
- ll2 41.384269997959336 -130.5128394460757
-EPSG:26909
- ll 56.514137441616214 -128.64945180563146
- en 521571.7415593609 6263359.125245853
- ll2 56.514137441616214 -128.64945180563146
-EPSG:2691
- ll 16.79683111630939 165.4415048135063
- en 5.690655102666874E7 1866255.7339063056
- ll2 16.79683111840232 165.4415048088563
-EPSG:26910
- ll 24.894644730705323 -117.65423133781057
- en 1040408.6029234919 2763915.0002040826
- ll2 24.894644730205307 -117.65423133687297
-EPSG:26911
- ll 46.7792000038138 -113.07356417091356
- en 799722.6800401065 5188117.462829755
- ll2 46.77920000348582 -113.07356417085464
-EPSG:26912
- ll -72.67722345488376 -104.92235853568116
- en 701673.4784299214 -8074696.09359407
- ll2 -72.6772234535175 -104.9223585454216
-EPSG:26913
- ll 36.1443652814318 -111.5672411438108
- en -91204.8371909908 4019996.1753894263
- ll2 36.14436527727211 -111.56724114511077
-EPSG:26914
- ll 1.2908537272337242 -92.26515008161492
- en 1250972.544635002 143676.16797173256
- ll2 1.2908537270764355 -92.26515009362859
-EPSG:26915
- ll -5.1645297958363585 -96.41546145798642
- en 121255.06490369141 -571868.2923040973
- ll2 -5.164529795829794 -96.41546145779336
-EPSG:26916
- ll -45.76165501063304 -83.68486065504152
- en 757795.200675898 -5072912.502009814
- ll2 -45.76165501051728 -83.68486065499835
-EPSG:26917
- ll -27.270042617878424 -78.72644976137435
- en 725063.9067283416 -3018392.188629189
- ll2 -27.270042617875024 -78.72644976136651
-EPSG:26918
- ll -32.77813059740664 -69.75633535400767
- en 991349.2651819491 -3638884.19315209
- ll2 -32.7781305965546 -69.7563353529339
-EPSG:26919
- ll -48.22548870906632 -75.95883274993457
- en -16687.454107452824 -5364817.65502713
- ll2 -48.22548869895327 -75.95883273704116
-EPSG:2692
- ll 63.69650302937964 169.1427585671945
- en 5.8259796932493925E7 7075275.093957512
- ll2 63.69650302828658 169.14275856275952
-EPSG:26920
- ll -73.56965519592366 -60.4207964190402
- en 581406.0633375642 -8165786.042628721
- ll2 -73.56965519591631 -60.42079641904455
-EPSG:26921
- ll 88.79523223024171 -50.88659892098438
- en 514323.96733273007 9864218.396503085
- ll2 88.79523223024704 -50.88659893267525
-EPSG:26922
- ll -27.511507112186983 -47.4994701569104
- en 845844.7086334283 -3047975.5563110355
- ll2 -27.51150711213974 -47.49947015681206
-EPSG:26923
- ll -19.645372976792444 -44.478462070923825
- en 554677.3137368893 -2172322.7244665627
- ll2 -19.64537297679245 -44.478462070923825
-EPSG:26929
- ll 79.4572546711818 -91.58625653962854
- en 82632.38144234863 5454576.297381002
- ll2 79.45725467093057 -91.58625653320661
-EPSG:2693
- ll 79.85869562978385 174.42734820326217
- en 5.9449295387754515E7 8870615.561128566
- ll2 79.8586956290551 174.4273481804992
-EPSG:26930
- ll 80.9291595469225 -86.34285951081964
- en 620371.9058597194 5668604.423900245
- ll2 80.9291595469225 -86.34285951081964
-EPSG:26931
- ll 60.756209067559354 -129.6460836609831
- en 1037898.2381427479 1000417.627188718
- ll2 60.75620906755826 -129.6460836609831
-EPSG:26932
- ll 13.459166066639497 -139.45180420316996
- en 775977.4516795806 -4495527.725492216
- ll2 13.459166066637186 -139.4518042031904
-EPSG:26933
- ll -85.39774914547807 -141.69430623403613
- en 538547.5697308523 -1.5473746236294312E7
- ll2 -85.39774914547431 -141.69430623452394
-EPSG:26934
- ll 2.279289439932967 -153.14941374263606
- en 149542.26405198238 -5732927.164908193
- ll2 2.279289439931176 -153.14941374250157
-EPSG:26935
- ll 34.96065231112104 -156.23928655314475
- en 295484.2484508204 -2113186.0388633767
- ll2 34.9606523111149 -156.23928655315498
-EPSG:26936
- ll 45.319592896921165 -158.5780701458506
- en 454679.6343368703 -965194.6169557691
- ll2 45.31959289692116 -158.5780701458506
-EPSG:26937
- ll 19.0119734866269 -159.6346789348762
- en 749062.7963389178 -3880858.8169864165
- ll2 19.01197348662481 -159.63467893487916
-EPSG:26938
- ll -16.542166707989963 -164.93867675699818
- en 613280.8352019608 -7815073.438337092
- ll2 -16.542166707989946 -164.93867675699832
-EPSG:26939
- ll 38.93410269916053 -173.94015920236157
- en 158338.86551604583 -1667171.03523149
- ll2 38.9341026989215 -173.9401592025498
-EPSG:26940
- ll 10.268519036869524 -123.36175539674187
- en 7665026.933646532 -2366890.67512413
- ll2 10.268519036869556 -123.36175539674187
-EPSG:26941
- ll 37.9560231923323 -178.9819550159345
- en -2667570.463505471 1920523.3156109992
- ll2 37.956023192332395 -178.9819550159345
-EPSG:26942
- ll 8.54579894427593 -76.20813089769209
- en 7504154.853028857 -1463188.0083691033
- ll2 8.545798944275964 -76.20813089769209
-EPSG:26943
- ll 65.71368295604596 -176.86080889334815
- en -824675.996677293 4776751.52366678
- ll2 65.71368295604594 -176.86080889334815
-EPSG:26944
- ll 53.65439686072274 -87.97970560724282
- en 4116212.907782744 2910847.3615259444
- ll2 53.65439686072275 -87.97970560724283
-EPSG:26945
- ll 36.95480323474696 -109.77168652902299
- en 2732518.303765424 913332.9570673336
- ll2 36.954803234747075 -109.77168652902299
-EPSG:26946
- ll 67.98445448272318 -138.68924317074234
- en 814581.2270534302 4913258.625801956
- ll2 67.98445448272317 -138.68924317074234
-EPSG:26948
- ll 10.609294899424697 -106.68209125203796
- en 594856.0817203906 -2255361.924182539
- ll2 10.609294899410997 -106.68209125218652
-EPSG:26949
- ll -40.30593506115667 -106.99702688485404
- en 631628.8469179405 -7905315.65408705
- ll2 -40.30593506018301 -106.99702688444883
-EPSG:2695
- ll -84.4655475939037 -170.9641394389492
- en 6.156476931049635E7 -9387361.603950864
- ll2 -84.46554759068138 -170.9641398161207
-EPSG:26950
- ll -23.7639410041012 -110.62940796183862
- en 531548.0309788698 -6063207.961363941
- ll2 -23.763941004084497 -110.629407961809
-EPSG:26951
- ll 2.5875684112378394 -98.17359514251352
- en -400447.7985551114 -3687310.827233426
- ll2 2.5875684112378767 -98.17359514251352
-EPSG:26952
- ll 33.87093315296439 -62.60275170663458
- en 3082521.9764387524 921400.2997333957
- ll2 33.87093315296458 -62.60275170663458
-EPSG:26953
- ll 11.44710466152604 -145.86810463035474
- en -3862547.1605688473 -1807362.4023142587
- ll2 11.447104661526048 -145.86810463035474
-EPSG:26954
- ll 46.69587476563024 -144.7825025202875
- en -2023927.955516602 1937096.8010552805
- ll2 46.695874765630265 -144.7825025202875
-EPSG:26955
- ll 6.288832527037513 -78.9361876156306
- en 4249551.43545387 -2753193.4044976537
- ll2 6.2888325270375445 -78.93618761563062
-EPSG:26956
- ll 72.77529021530093 -112.33217348291822
- en -1245992.3266135557 4295982.193377609
- ll2 72.77529021530094 -112.33217348291822
-EPSG:26957
- ll -43.83920543945502 -71.2850220769754
- en 532287.4403012829 -9071714.783868426
- ll2 -43.83920543905032 -71.28502207684511
-EPSG:26958
- ll 88.72293249070876 -78.62540976010209
- en 205909.1256066606 7166817.196401415
- ll2 88.72293249070877 -78.62540976010436
-EPSG:26959
- ll 28.869338426000468 -83.64404698430072
- en 39602.41247033744 503660.3199753132
- ll2 28.869338425999903 -83.64404698430224
-EPSG:2696
- ll -81.01892596677835 -169.3764479283758
- en 6.258039705028029E7 -9002258.817744458
- ll2 -81.0189259631465 -169.37644815579745
-EPSG:26960
- ll 12.941297778439328 -30.567411565026532
- en 6484884.681509746 -387559.3409582599
- ll2 12.941297778439344 -30.567411565026546
-EPSG:26961
- ll -84.71135655744962 -152.03836233895143
- en 535614.715561119 -1.1495181105120847E7
- ll2 -84.71135655744793 -152.03836233901936
-EPSG:26962
- ll -33.45398933025455 -158.8080007915048
- en 300904.895509248 -5954220.815039805
- ll2 -33.453989330250394 -158.80800079151274
-EPSG:26963
- ll 18.571791481988626 -153.00297981221445
- en 1028009.528037951 -279910.58063673676
- ll2 18.571791481772078 -153.0029798122453
-EPSG:26964
- ll 61.32909427095629 -161.52058271563033
- en 391817.443291 4388449.58026799
- ll2 61.32909427095094 -161.52058271563052
-EPSG:26965
- ll -28.60629639055857 -155.9452180477538
- en 913086.0811169895 -5569819.837445264
- ll2 -28.606296390396462 -155.94521804743889
-EPSG:26966
- ll -66.78562414348555 -88.07175786844552
- en -59502.32814896153 -1.0741791104365084E7
- ll2 -66.78562414123212 -88.07175786167127
-EPSG:26967
- ll 46.89038787640533 -80.75682050580147
- en 959833.1967615895 1880408.3351565416
- ll2 46.89038787626395 -80.75682050576083
-EPSG:26968
- ll 63.053676689925425 -113.96666956361308
- en 108969.89683478508 2380903.5092312554
- ll2 63.053676689923 -113.96666956361318
-EPSG:26969
- ll -0.6826893013939781 -110.94321627863403
- en 840400.2690355929 -4689962.860980727
- ll2 -0.6826893013935268 -110.94321627875038
-EPSG:2697
- ll 79.50218586164385 -175.47232094953077
- en 6.340894856713857E7 8833208.459987866
- ll2 79.50218586158373 -175.47232097575903
-EPSG:26970
- ll -34.7833865599468 -115.52148833100972
- en 820913.8610910405 -8464635.085167505
- ll2 -34.78338655994681 -115.52148833100972
-EPSG:26971
- ll -86.64371482791478 -83.17529186400978
- en 333682.4575941444 -1.3687785073393352E7
- ll2 -86.64371482791258 -83.17529186651335
-EPSG:26972
- ll 24.51361389224286 -95.1093131897171
- en 198712.1358601409 -1338276.5611743669
- ll2 24.513613891943567 -95.10931319028427
-EPSG:26973
- ll 54.215890246273545 -83.86098866907622
- en 217785.1397004117 2109387.90007577
- ll2 54.21589024627021 -83.86098866907531
-EPSG:26974
- ll -1.7874094265998082 -85.04721430485684
- en 1126590.5615221972 -4099624.9235516516
- ll2 -1.7874094265997102 -85.04721430487027
-EPSG:26975
- ll 22.001327295517754 -43.637672431417485
- en 6655546.868725861 356708.39787521306
- ll2 22.001327295517765 -43.637672431417485
-EPSG:26976
- ll 43.44881818818275 -57.60898156973525
- en 3325504.301967135 974452.9090865183
- ll2 43.448818188182784 -57.60898156973525
-EPSG:26977
- ll 43.56655879044219 -20.42381077180241
- en 5944044.891391612 3113056.8901984785
- ll2 43.56655879044223 -20.423810771802394
-EPSG:26978
- ll 57.69360912131333 -109.20992159577078
- en -282007.5360474241 2825467.594556261
- ll2 57.69360912131332 -109.20992159577078
-EPSG:2698
- ll 67.7530210964633 -168.07868138003025
- en 6.449653971882349E7 7518500.9598298855
- ll2 67.7530210980018 -168.07868139705764
-EPSG:26980
- ll 88.47026833499888 -156.2930815721354
- en -136717.9226770373 8295046.536587096
- ll2 88.470268334999 -156.2930815721354
-EPSG:26981
- ll 22.191433812861604 -135.461024497797
- en -3375269.1679867012 -46728.8759350286
- ll2 22.19143381286161 -135.461024497797
-EPSG:26982
- ll 59.547705966319626 -173.80540618610385
- en -4009703.6079552546 5506607.385397328
- ll2 59.547705966319604 -173.80540618610385
-EPSG:26983
- ll 60.683209570810504 -64.21316883110265
- en 534118.73409465 1900861.2008569466
- ll2 60.68320957031384 -64.21316883140322
-EPSG:26984
- ll 39.564628784638074 -76.28486136489288
- en 374068.9767035167 -345079.8655837366
- ll2 39.564628781232514 -76.2848613651313
-EPSG:26985
- ll 18.617847314532618 -137.08617176786714
- en -5846359.480711356 -22686.168325876828
- ll2 18.617847314532632 -137.08617176786714
-EPSG:26986
- ll 48.205295010305576 -91.5611572148807
- en -1285763.4699393455 1727446.531442373
- ll2 48.205295010305555 -91.5611572148807
-EPSG:26987
- ll 80.83457685635034 -142.5713165521971
- en -1210602.0958356243 5732507.978592857
- ll2 80.83457685635037 -142.57131655219706
-EPSG:26988
- ll 20.926710537195085 -171.72639684804687
- en 103716.53556841053 1941291.2968811607
- ll2 20.926710537195103 -171.72639684804687
-EPSG:26989
- ll 85.10803582032918 -119.17449773035523
- en 5464641.785868063 5411716.64768976
- ll2 85.10803582032916 -119.1744977303552
-EPSG:2699
- ll 2.752085321613336 23.112029550457642
- en 735023.9104655697 304605.6809155241
- ll2 2.7520853300257184 23.11202956398458
-EPSG:26990
- ll 61.17075131010955 -50.57462625479447
- en 5876868.057456858 2608786.2028047615
- ll2 61.17075131010953 -50.57462625479447
-EPSG:26991
- ll 43.203911522537034 -133.26560585560102
- en -2328965.856899808 564931.9093709363
- ll2 43.20391152253707 -133.26560585560102
-EPSG:26992
- ll -2.6780259926305874 -23.800485837080572
- en 1.0259915944163792E7 -1324556.2957491144
- ll2 -2.678025992630545 -23.800485837080586
-EPSG:26993
- ll 21.00144385795047 -75.095085623985
- en 2903215.9786776253 -2164227.387443521
- ll2 21.001443857950477 -75.095085623985
-EPSG:26994
- ll -78.76498045266328 -82.16340561323045
- en 444820.7919141046 -1.2019609654768175E7
- ll2 -78.7649804519855 -82.16340563755453
-EPSG:26995
- ll -75.58959553139488 -89.73720945976658
- en 716565.793624995 -1.1656938849620868E7
- ll2 -75.58959553139488 -89.73720945976658
-EPSG:26996
- ll -81.29235038527011 -91.05341513992448
- en 240643.4214720814 -1.2995677021519015E7
- ll2 -81.29235038527011 -91.05341513992448
-EPSG:26997
- ll 38.79054394797578 -94.03514121717315
- en 366630.4721412781 329299.37208905374
- ll2 38.790543947974946 -94.03514121717447
-EPSG:26998
- ll -62.41393618744316 -96.33366540830913
- en 755240.0457704228 -1.0927801103701299E7
- ll2 -62.41393618744034 -96.33366540830926
-EPSG:2700
- ll -84.15838079886565 19.73506821248137
- en 451689.0694666041 -9351430.677373702
- ll2 -84.15838079097813 19.73506855313441
-EPSG:2701
- ll -23.12709291162203 27.695528583490052
- en 571366.8560879789 -2558736.1583350594
- ll2 -23.127092898075414 27.69552860355775
-EPSG:2702
- ll -6.516449119485458 30.60039786119528
- en 566530.5924625244 -720548.4681566146
- ll2 -6.516449110734649 30.600397873726344
-EPSG:2703
- ll 60.47183954464822 32.34164050905387
- en 463909.3572669404 6706935.328589445
- ll2 60.47183954454382 32.34164051375873
-EPSG:27039
- ll -66.1390956397957 44.866084028161616
- en 223408.40100529278 -7348859.525894806
- ll2 -66.13909549997615 44.86608418280568
-EPSG:2704
- ll -45.59489504930835 31.147544785984408
- en 121498.16109915538 -5062515.722454197
- ll2 -45.59489503059634 31.147544819385747
-EPSG:27040
- ll -65.60183725594248 60.073140783243616
- en 641467.8812457336 -7278899.158977971
- ll2 -65.60183709214489 60.07314107872334
-EPSG:2705
- ll 73.69256499261405 43.56676981521416
- en 643176.7579587478 8186590.039084622
- ll2 73.69256499168321 43.566769820292414
-EPSG:2706
- ll 74.48607925777534 35.913809050992484
- en 318623.6341758585 8278970.78413759
- ll2 74.48607925600164 35.913809070682944
-EPSG:2707
- ll -33.35098585051328 38.93646763877295
- en -64723.2683570825 -3708096.6860700273
- ll2 -33.35098583352226 38.93646765640649
-EPSG:2708
- ll 23.346571197582364 42.2069541371677
- en -92986.49087174796 2594915.913477966
- ll2 23.346571197521836 42.20695413782904
-EPSG:2709
- ll 35.76191250019676 53.75313288756811
- en 749105.008343714 3962706.386161532
- ll2 35.761912499956395 53.75313288524233
-EPSG:2710
- ll -86.12521964045268 49.26553724036745
- en 464401.2538824907 -9570722.499408763
- ll2 -86.1252196174324 49.26553763974004
-EPSG:2711
- ll 19.240907321976962 63.17530827334081
- en 1150348.563960881 2139996.140174759
- ll2 19.240907319947237 63.17530827112255
-EPSG:2712
- ll -17.277497694916917 54.57541694009022
- en -77420.43366814568 -1919079.196856768
- ll2 -17.277497688054435 54.575416946456876
-EPSG:27120
- ll -47.4049889931682 -59.29334934844814
- en 779479.8175436661 -5256888.966260309
- ll2 -47.40498900060215 -59.29334929471374
-EPSG:2713
- ll -27.363539323652788 66.49840805484531
- en 846316.120820404 -3032705.708174236
- ll2 -27.363539315273968 66.49840806047197
-EPSG:2714
- ll 83.21054419010656 67.78408276357617
- en 523628.4663613234 9244083.757054456
- ll2 83.21054418795386 67.78408277643108
-EPSG:2715
- ll -27.71795740952978 66.6123356964813
- en 264561.773097954 -3069397.1643979964
- ll2 -27.717957401047485 66.61233570207783
-EPSG:2716
- ll -8.666733194591899 73.3281049871152
- en 646239.3647695866 -958564.1928140576
- ll2 -8.66673319431496 73.32810498728975
-EPSG:2717
- ll -64.35567790300925 78.54885631804882
- en 671431.73200135 -7144270.443251322
- ll2 -64.3556778759552 78.54885633884258
-EPSG:2718
- ll 83.00059917805297 72.02912415948421
- en 418928.13408339897 9224459.551409949
- ll2 83.00059917586871 72.02912417894545
-EPSG:2719
- ll 85.02202941107018 85.87537664236268
- en 547239.1901170663 9448016.313064832
- ll2 85.02202940818901 85.87537665005716
-EPSG:2720
- ll 12.67502594795748 81.29796762643261
- en 206430.61442604172 1403354.6774419271
- ll2 12.675025945499804 81.29796762432622
-EPSG:27205
- ll 68.61655026432919 174.48559758169884
- en 288629.19744919694 1.2396893058827523E7
- ll2 68.61655023780779 174.4855975852961
-EPSG:27206
- ll -28.402744160271368 171.2723967725356
- en -209373.67242759268 1726733.508930955
- ll2 -28.402744176917345 171.27239677290856
-EPSG:27207
- ll -16.233282567368818 174.24655951550213
- en -89310.95680244203 3177762.7486487227
- ll2 -16.233282598256466 174.24655951689863
-EPSG:27208
- ll -43.7921300235499 177.2899780771991
- en 349589.08349758654 239664.36976560357
- ll2 -43.79213002444495 177.28997807805854
-EPSG:27209
- ll 7.991629049199176 168.3593003183476
- en -348151.4789729422 5921842.1884388
- ll2 7.991629004233273 168.35930032544877
-EPSG:2721
- ll 49.37868309900597 87.40359838142977
- en 529335.9429835805 5471869.030734308
- ll2 49.37868310157849 87.40359837894007
-EPSG:27210
- ll 8.177438686691502 171.23388088791933
- en -186050.26267979277 5982253.28499344
- ll2 8.177438642029804 171.2338808911032
-EPSG:27211
- ll 77.65022908446448 173.0857217299793
- en 242609.23867100585 1.3780622066041648E7
- ll2 77.65022905792004 173.0857217383202
-EPSG:27212
- ll -74.51948830185925 173.95654999182474
- en 249617.12330524245 -3041908.6244436563
- ll2 -74.51948829889086 173.9565499908619
-EPSG:27213
- ll 42.18922956035496 173.62094154813667
- en 204497.1362385676 9947416.022575725
- ll2 42.18922952711409 173.62094155079413
-EPSG:27214
- ll 53.81801372467601 177.85537091963087
- en 641228.3766394991 1.118716514673255E7
- ll2 53.81801369388306 177.85537091869884
-EPSG:27215
- ll -68.23988650851774 175.650505069647
- en 397295.10342078924 -2303622.400248444
- ll2 -68.23988650293036 175.65050506982251
-EPSG:27216
- ll 35.17851392327141 171.43034194987348
- en 238144.39824480162 9167419.6492322
- ll2 35.178513886797866 171.43034195329798
-EPSG:27217
- ll -51.352869627822336 177.0663035100646
- en 681976.9415704976 -375212.2877805801
- ll2 -51.35286962097644 177.06630350927898
-EPSG:27218
- ll 45.408807318929945 169.59559285084705
- en 146983.0829344249 1.0421034462304993E7
- ll2 45.40880728715165 169.59559285588793
-EPSG:27219
- ll 23.16875121262578 179.8236291194718
- en 998805.3205350651 8007799.96565906
- ll2 23.1687511686553 179.82362912201222
-EPSG:2722
- ll -26.380303273241623 92.85071237724392
- en 784575.2148833149 -2922034.1491245376
- ll2 -26.3803032684312 92.85071237798651
-EPSG:27220
- ll 15.193556269512897 174.96714667514544
- en 425169.81707292265 6981735.622574306
- ll2 15.193556225337865 174.9671466767008
-EPSG:27221
- ll -3.097857539654484 175.62272389581125
- en 816630.468558131 5106300.78714571
- ll2 -3.0978575809342015 175.6227238958461
-EPSG:27222
- ll -54.103009967666864 173.49817688202342
- en 511724.26629416726 -527464.1555971671
- ll2 -54.1030099620765 173.49817688251252
-EPSG:27223
- ll -16.343436884027298 171.7761425729224
- en 638834.221357807 3760924.4990375787
- ll2 -16.343436914821925 171.77614257458666
-EPSG:27224
- ll -88.1092020478085 174.2474586939927
- en 305618.16968744557 -4262686.036015248
- ll2 -88.10920205239238 174.24745867703555
-EPSG:27225
- ll 9.511983343433414 178.13318624356245
- en 1045256.0876996368 6605019.304900618
- ll2 9.511983297664454 178.13318623579772
-EPSG:27226
- ll 48.81222931933121 169.9353428027346
- en 217568.89687417872 1.1027989637729483E7
- ll2 48.81222928887264 169.93534280791448
-EPSG:27227
- ll 3.5478882236979814 173.19538585320055
- en 714446.6954647013 6048587.782507309
- ll2 3.5478881797970847 173.1953858547387
-EPSG:27228
- ll 74.47741940372526 161.97870065525697
- en 108464.10175739313 1.397893995166992E7
- ll2 74.47741937659654 161.97870069700082
-EPSG:27229
- ll 69.33063689598555 161.00816189328302
- en 35180.21535376733 1.3456714482726317E7
- ll2 69.3306368665095 161.00816193688667
-EPSG:2723
- ll 2.783732860384845 89.15935287519852
- en 72656.8902875738 308588.5787217368
- ll2 2.7837328574137192 89.15935287457337
-EPSG:27230
- ll -72.8624996415391 166.24083336105218
- en 155757.25511399575 -2318178.4467355562
- ll2 -72.86249963745054 166.240833358297
-EPSG:27231
- ll 34.68816402358719 163.66012587786236
- en -307347.6030702692 9640416.630257308
- ll2 34.68816398308946 163.6601258826915
-EPSG:27232
- ll 84.6652893837439 170.33905379229424
- en 320718.00135480927 1.5269598253200898E7
- ll2 84.66528935688963 170.33905382386888
-EPSG:2724
- ll -28.20588645195339 99.68822107102719
- en 862236.6301152036 -3126691.9147065813
- ll2 -28.20588644633958 99.68822107127028
-EPSG:2725
- ll 73.50680730149233 92.88761480339701
- en 306539.4926044833 8170222.386211681
- ll2 73.50680730120911 92.88761481319504
-EPSG:27258
- ll -2.6535382335974305 167.68858027127484
- en 798951.1773442867 9706180.978734797
- ll2 -2.6535382751949266 167.68858027417508
-EPSG:27259
- ll -64.27276493030837 164.03804100289136
- en 163321.81541187578 2853854.7365214406
- ll2 -64.27276491650322 164.03804102948592
-EPSG:2726
- ll -11.23520796963912 95.07672965282474
- en -257744.55315677065 -1251350.310192463
- ll2 -11.23520796941746 95.07672966066505
-EPSG:27260
- ll 58.98388670158985 170.06818139981124
- en 101971.86743840558 1.6559016861452244E7
- ll2 58.98388666482931 170.06818142963678
-EPSG:2727
- ll 41.23733574894527 108.09975900663288
- en 759862.7977413796 4571618.924469387
- ll2 41.237335750686945 108.09975900816015
-EPSG:2728
- ll 65.80654051719836 110.90125273060146
- en 632670.8578243256 7304370.517546504
- ll2 65.80654051953448 110.90125273216644
-EPSG:2729
- ll -54.64672281550886 111.38152962450961
- en 524603.6415313667 -6057919.913136782
- ll2 -54.64672279363463 111.38152961852198
-EPSG:27291
- ll 4.891968039474165 173.82115383338373
- en 96283.87591351916 5714510.085993867
- ll2 4.891967995279817 173.8211538351253
-EPSG:27292
- ll 87.26849153449498 173.86112189957754
- en 513727.59609424556 1.64353870043344E7
- ll2 87.26849150736624 173.86112192560813
-EPSG:2730
- ll -16.434967980687205 111.02335711107781
- en 181939.17195449222 -1820032.031637292
- ll2 -16.43496797996128 111.02335711095851
-EPSG:2731
- ll -20.519928151572913 117.35213296354553
- en 536686.0787234317 -2269883.3372888924
- ll2 -20.519928148747667 117.352132962624
-EPSG:2732
- ll 48.92010511985961 126.97564751708455
- en 1011013.1919261455 5444298.931986749
- ll2 48.92010511122132 126.97564750706279
-EPSG:2733
- ll 83.92744192978685 124.4498114827704
- en 517077.1921006942 9323984.91307487
- ll2 83.9274419273666 124.44981147188656
-EPSG:2734
- ll -77.41964097314306 129.3979218858364
- en 582551.4066554559 -8599445.176788706
- ll2 -77.41964094274151 129.39792181843967
-EPSG:2735
- ll 20.84295220748986 126.16731546256561
- en 205021.62348227238 2308358.5084791426
- ll2 20.84295220592595 126.16731546554179
-EPSG:2736
- ll 46.49883075534143 30.555602751977368
- en 312484.8943209204 1.5152464455970116E7
- ll2 46.49883062345414 30.555602723859185
-EPSG:2737
- ll 82.54247570197302 44.77417886884397
- en 583554.6471219044 1.9169411535296656E7
- ll2 82.54247572189209 44.77417879776984
-EPSG:2738
- ll -87.22603066431438 125.61920076485693
- en 465508.9264179569 -9694097.902926309
- ll2 -87.22603063205706 125.61920048113993
-EPSG:2739
- ll -30.823447088483505 129.83936551468238
- en 5829.324892260309 -3422752.7640521848
- ll2 -30.82344707857009 129.83936550841392
-EPSG:27391
- ll -30.936323848869407 -0.02003403193430109
- en -581168.149602832 -9870708.867616234
- ll2 -30.936323410077254 -0.020033942037240116
-EPSG:27392
- ll -80.64474723795018 5.837671496009325
- en -46563.42503535425 -1.5388387096010275E7
- ll2 -80.64474685294233 5.8376719929812815
-EPSG:27393
- ll -3.1441808054572675 13.874199594332783
- en 350582.26767227985 -6779418.628374544
- ll2 -3.144180507555235 13.874199636043329
-EPSG:27394
- ll 66.51495459751104 17.188784232326704
- en 176605.7595846478 954459.5220236955
- ll2 66.51495455431412 17.18878425000211
-EPSG:27395
- ll -51.41073159125882 17.06633220306577
- en 12233.609173243492 -1.212853319235026E7
- ll2 -51.41073112906944 17.066332256617898
-EPSG:27396
- ll 45.91287002966098 19.95468375046832
- en -72215.07459427495 -1344593.023385719
- ll2 45.91287003759751 19.954683777005652
-EPSG:27397
- ll 29.418618286387186 31.015998091880938
- en 595428.1257123818 -3160083.0725599946
- ll2 29.418618360321418 31.015998118142335
-EPSG:27398
- ll 1.2151674337470126 22.06495692211576
- en -779736.1728476286 -6295905.313933532
- ll2 1.215167698039048 22.06495696949171
-EPSG:2740
- ll 30.276895288678375 143.44821823832228
- en 1024517.5823725129 3363481.9177617067
- ll2 30.276895287309504 143.44821824236172
-EPSG:2741
- ll -68.21281549565991 139.90222123983813
- en 454424.347687714 -7570029.464911532
- ll2 -68.21281546939875 139.90222119324235
-EPSG:2742
- ll 32.81440754675651 145.47718560310474
- en 638247.1609790764 3633209.9699609065
- ll2 32.81440754640408 145.47718560564357
-EPSG:27429
- ll -46.00074091796126 -5.220015048149428
- en 792608.5262179046 -5101121.891633624
- ll2 -46.000740916564055 -5.220015050980302
-EPSG:2743
- ll -82.22166314655104 152.10302098453454
- en 576943.3849319941 -9136682.309578922
- ll2 -82.22166312300186 152.10302078963235
-EPSG:2744
- ll -57.87075561088035 150.98290497249957
- en 558227.9622300253 -6417304.659576975
- ll2 -57.87075558893332 150.9829049366938
-EPSG:2745
- ll -7.553683810841491 153.70726145814027
- en 577946.1678598489 -835277.5726591648
- ll2 -7.553683805828255 153.70726145237745
-EPSG:2746
- ll 76.77301141074275 152.31452917500616
- en 405775.7644357182 8527892.206441324
- ll2 76.77301140974423 152.3145291681628
-EPSG:2747
- ll -70.16125959634158 156.5354504396006
- en 406519.9167743338 -7788900.776628485
- ll2 -70.16125957393423 156.53545036660609
-EPSG:2748
- ll -0.93341836351334 166.92899381346277
- en 1049185.8883264982 -103516.63978758355
- ll2 -0.9334183570814214 166.92899380238026
-EPSG:2749
- ll -23.39172133958465 168.1053580691553
- en 817430.8687753848 -2591284.5015774905
- ll2 -23.39172132676486 168.1053580517129
-EPSG:27493
- ll -76.52115492821636 -8.323217890190069
- en -4876.7238722802 -1.2889489086673468E7
- ll2 -76.52115490959872 -8.323217924166984
-EPSG:2750
- ll -18.258609949552962 170.125295489934
- en 724666.9597492446 -2020852.8839029337
- ll2 -18.258609937777702 170.12529547363067
-EPSG:27500
- ll 11.552798018192778 56.68857321991578
- en 6517901.558089935 -2168111.6514183935
- ll2 11.552798018192787 56.68857321991578
-EPSG:2751
- ll 86.50555656974666 176.70713807758776
- en 538664.1036058528 9613717.635263063
- ll2 86.50555656875477 176.70713799457403
-EPSG:2752
- ll -69.25912627119138 175.17616332529494
- en 546373.8902567734 -7686844.513629735
- ll2 -69.25912625573571 175.17616323765046
-EPSG:2753
- ll 35.437153968045266 170.29050568114812
- en -109816.9464042479 3943962.178407259
- ll2 35.437153964729475 170.29050567472657
-EPSG:2754
- ll 27.966299053857455 174.2342185301958
- en -67988.43732549774 3108249.1110649267
- ll2 27.9662990554904 174.2342185211512
-EPSG:2755
- ll -35.411170926126886 -174.42162973401514
- en 734087.3464579809 -3923255.0650204057
- ll2 -35.41117091049408 -174.42162976721315
-EPSG:2756
- ll -29.44011061867772 -168.57568116472606
- en 1026569.736590387 -3270307.6883705463
- ll2 -29.4401106025512 -168.575681195437
-EPSG:27561
- ll 46.77813576765672 -1.441621601613082
- en 311298.1451498816 -95479.4088998771
- ll2 46.77813576765672 -1.4416216016130818
-EPSG:27562
- ll 46.03812929055178 5.8313873597903365
- en 870439.3315802779 121335.83089890497
- ll2 46.03812929055179 5.8313873597903365
-EPSG:27563
- ll 45.23275963085384 1.6403432490045127
- en 545325.5232264523 326105.32562436664
- ll2 45.23275963085388 1.6403432490045131
-EPSG:27564
- ll 44.212732598368596 -1.3831097364576572
- en -297119.42136144475 419875.36624099035
- ll2 44.21273259836861 -1.383109736457658
-EPSG:2757
- ll -11.25854065650202 -170.99547489052193
- en 500357.0594301437 -1245005.1825512995
- ll2 -11.258540642621629 -170.99547491325646
-EPSG:27571
- ll 38.746231545263825 3.59786571791048
- en 711455.5888258487 -525.150555413682
- ll2 38.7462315443146 3.597865721655537
-EPSG:27572
- ll 7.948932245339279 18.650936495560842
- en 2788497.9797738213 -2192481.456168564
- ll2 7.948932254776957 18.650936495441567
-EPSG:27573
- ll 42.3348623284422 14.171254358795636
- en 1572341.4117874664 3073888.496151801
- ll2 42.33486232799639 14.171254360032654
-EPSG:27574
- ll 62.280189238198794 55.67761274531381
- en 2786576.1500589447 7376419.050801849
- ll2 62.28018923910742 55.67761272803817
-EPSG:2758
- ll -66.013361328227 -173.20988048630895
- en 263647.2072498541 -7334245.648273286
- ll2 -66.01336131615896 -173.20988056643833
-EPSG:2759
- ll -54.89440937057476 -87.92746295180814
- en 65651.78360161834 -9462647.923802271
- ll2 -54.89440937056709 -87.92746295180972
-EPSG:2760
- ll -54.16275394498545 -90.3354068227641
- en 414828.108229118 -9327239.074347991
- ll2 -54.16275394493614 -90.33540682276836
-EPSG:2761
- ll -25.02300638994292 -113.13688160062867
- en -86484.47167874349 -6202246.399070878
- ll2 -25.02300638992877 -113.13688160065648
-EPSG:2762
- ll 34.64772439135298 -112.30536283347749
- en 177728.7044635637 404566.3146170927
- ll2 34.647724391352995 -112.30536283347752
-EPSG:2763
- ll -5.77880220535441 -106.98813988132095
- en 963957.4333654067 -4074186.947234311
- ll2 -5.778802204670779 -106.98813989209606
-EPSG:2764
- ll 34.70691017854407 -69.44895427667032
- en 2448049.942508176 277008.7642318671
- ll2 34.70691017854424 -69.44895427667032
-EPSG:2765
- ll 40.388361292655546 -141.47759027206172
- en -3664584.732229841 2260112.1035655513
- ll2 40.38836129265565 -141.47759027206172
-EPSG:2766
- ll 62.01822740067361 -47.299892093586294
- en 5743515.702215019 4784570.543792747
- ll2 62.01822740067424 -47.29989209358629
-EPSG:2767
- ll -19.75856535795883 -173.7101416557847
- en -6409545.369063884 -4629038.185138774
- ll2 -19.758565357958776 -173.71014165578472
-EPSG:2768
- ll -15.27796102017306 -166.73762995199036
- en -5110548.54141092 -4315443.012841481
- ll2 -15.277961020173016 -166.73762995199039
-EPSG:2769
- ll -17.219714000184418 -104.9820390538395
- en 4251170.712468862 -6080212.210747523
- ll2 -17.219714000184393 -104.98203905383951
-EPSG:2770
- ll 62.28004246860911 -157.9355006650486
- en -322473.9593710173 4306998.524928784
- ll2 62.28004246860973 -157.9355006650486
-EPSG:27700
- ll -47.96940711294079 -8.540749949011637
- en -87951.96188646037 -1.0860930442339627E7
- ll2 -47.96940643883855 -8.540750027518584
-EPSG:2771
- ll 33.13851081899495 -133.63811227801574
- en 385143.4216238903 742745.4995865261
- ll2 33.138510818995165 -133.63811227801574
-EPSG:2772
- ll -6.754194541255831 -58.70742271975824
- en 7629492.06642496 -3570980.1439678185
- ll2 -6.7541945412558455 -58.70742271975825
-EPSG:2773
- ll 69.2008521811139 -37.7124951839628
- en 3842936.653410559 5135747.711636925
- ll2 69.2008521811148 -37.71249518396281
-EPSG:2774
- ll 5.264076044049027 -165.19273581346405
- en -6253647.815446614 -989970.5318576884
- ll2 5.264076044049043 -165.1927358134641
-EPSG:2775
- ll 52.51197345359844 -52.97081941122484
- en 1662316.4545771412 1614553.9376629738
- ll2 52.5119734535987 -52.97081941122483
-EPSG:2776
- ll 52.453729050176605 -73.43278651933448
- en 334859.57244916086 1608176.1578215605
- ll2 52.453729050170956 -73.43278651933268
-EPSG:2777
- ll -58.47686451425061 -78.62974655111617
- en 338265.66155460034 -9178504.222022902
- ll2 -58.476864514235544 -78.62974655111547
-EPSG:2778
- ll 87.30654788850447 -85.92549562140303
- en 179413.43818691853 7009209.152195202
- ll2 87.30654788850438 -85.92549562118985
-EPSG:2779
- ll -23.040589029697696 -98.35300658939674
- en -1556399.2118953732 -6549309.076324131
- ll2 -23.04058902969753 -98.35300658939674
-EPSG:2780
- ll 62.74045225902509 -81.53326418676002
- en 232377.2945339111 3639137.2429024624
- ll2 62.740452259025744 -81.53326418676002
-EPSG:2781
- ll 20.910842714808638 -79.66607762363076
- en 1168520.0563251376 -1000229.964696156
- ll2 20.91084271468031 -79.66607762350151
-EPSG:2782
- ll 19.08594242626505 -153.94488434116406
- en 663667.4561633003 28687.171906086493
- ll2 19.085942426264857 -153.9448843411645
-EPSG:2783
- ll 17.97006805850009 -161.6079488361012
- en -23906.651826036337 -254608.3997484304
- ll2 17.970068058304843 -161.6079488359967
-EPSG:2784
- ll -0.617322953927939 -152.20550290067416
- en 1146106.3445676803 -2410118.77726505
- ll2 -0.6173229539011558 -152.20550290531477
-EPSG:2785
- ll 51.57519214855307 -155.43335820734563
- en 781868.1519576461 3308541.8300727843
- ll2 51.57519214811979 -155.4333582073892
-EPSG:2786
- ll 67.94064502155084 -166.6206613664226
- en 229804.04002574232 5156494.378939742
- ll2 67.94064501814181 -166.62066135093752
-EPSG:2787
- ll -58.030406823620325 -110.18110912623484
- en 317295.6734762102 -1.1050425729467109E7
- ll2 -58.03040682361533 -110.18110912623418
-EPSG:2788
- ll 3.9706242473807833 -115.2567224588066
- en 360432.0413881056 -4175231.8081474453
- ll2 3.970624247380772 -115.25672245880551
-EPSG:2789
- ll 54.829834550086105 -113.22984202168567
- en 961928.7931167812 1466487.9401551178
- ll2 54.82983455006212 -113.22984202168269
-EPSG:2790
- ll 28.104216288304016 -90.15021178135241
- en 121448.37232102823 -948170.8035659164
- ll2 28.104216288302272 -90.15021178135486
-EPSG:2791
- ll 81.48457259245745 -94.26548184212086
- en 632273.2852988634 4993498.025368294
- ll2 81.48457259243901 -94.26548184181505
-EPSG:2792
- ll -79.63979981443804 -90.7155579289616
- en -1277.8287451116194 -1.2750881864741812E7
- ll2 -79.6397998143248 -90.71555792698406
-EPSG:2793
- ll 79.38813365479524 -88.29542131319424
- en 875073.9802131568 4914921.718145059
- ll2 79.38813365479604 -88.29542131319424
-EPSG:2794
- ll 33.3916811272013 -73.62813869677134
- en 3354827.2874597255 314802.4509893465
- ll2 33.39168112720153 -73.62813869677134
-EPSG:2795
- ll 0.8081911530826034 -48.29661243735643
- en 6524870.269002828 -3101403.4240855803
- ll2 0.8081911530826411 -48.29661243735644
-EPSG:2796
- ll 0.7549313000992477 -107.56590201270348
- en -906828.83470401 -4406788.367184764
- ll2 0.7549313000992657 -107.56590201270346
-EPSG:2797
- ll 2.4931077176023706 -170.6521929763061
- en -8241925.0533345025 -106929.48815865844
- ll2 2.4931077176024172 -170.65219297630603
-EPSG:2798
- ll 78.60576282894415 -144.69984788232932
- en -1342188.3158771745 5753510.4726329595
- ll2 78.605762828945 -144.69984788232932
-EPSG:2799
- ll 15.892185477917721 -34.064875299353076
- en 6118687.755242148 -241679.4498832688
- ll2 15.892185477917732 -34.06487529935308
-EPSG:2800
- ll -1.6485017999457519 -15.324540867700819
- en 1.0262317032091696E7 -323710.16994032724
- ll2 -1.6485017999457094 -15.32454086770082
-EPSG:2801
- ll -21.75244193155479 -156.07424559148615
- en -8435624.979045363 -3662975.537905249
- ll2 -21.752441931554706 -156.07424559148615
-EPSG:2802
- ll -39.39853036568833 -62.67484034483155
- en 801888.3887658681 -9214838.93848508
- ll2 -39.39853036316374 -62.67484034430127
-EPSG:2803
- ll -54.17899848237284 -76.4725384040867
- en 488539.9744353941 -1.0768076975497417E7
- ll2 -54.178998476526594 -76.47253839627479
-EPSG:2804
- ll -7.079225005437319 -143.37353591502745
- en -8612386.036019025 -2074493.0022891434
- ll2 -7.079225005437332 -143.37353591502745
-EPSG:2805
- ll 36.87430444179913 -1.8070034118590286
- en 5768132.364789747 2701580.503974225
- ll2 36.87430444179926 -1.8070034118590284
-EPSG:2806
- ll 70.02197454031497 -1.9322617844576087
- en 3269594.607326951 4554090.06857256
- ll2 70.0219745403159 -1.9322617844575944
-EPSG:2807
- ll -13.5735629857099 -159.2595349549607
- en -3055953.87976622 -2291839.0639875955
- ll2 -13.573562985709867 -159.2595349549607
-EPSG:2808
- ll 48.61479982143069 -160.29248395041697
- en 1174519.0626360215 3028499.5951536903
- ll2 48.61479982143083 -160.29248395041694
-EPSG:2809
- ll 33.781439513565815 -127.353698667141
- en 143392.124203498 145807.12053450613
- ll2 33.781439513566035 -127.35369866714099
-EPSG:2810
- ll 28.280320757517806 -171.21822293748536
- en -5974096.330490614 1785785.7479784323
- ll2 28.280320757517003 -171.2182229374854
-EPSG:2811
- ll 78.99271003669388 -134.14110785707956
- en -251093.5441007153 4438779.679167018
- ll2 78.9927100366947 -134.14110785707953
-EPSG:2812
- ll 82.87241205335809 -50.85129398212493
- en 1661359.4920868059 5289781.392709869
- ll2 82.87241205335869 -50.85129398212491
-EPSG:2813
- ll -53.60240416242078 -94.3568162961757
- en -65463.16067932511 -9220090.196567576
- ll2 -53.60240415973852 -94.3568162940556
-EPSG:2814
- ll -33.23837105841371 -92.39418707596505
- en 507919.0893721682 -6945421.003500594
- ll2 -33.23837105841046 -92.39418707597146
-EPSG:2815
- ll -22.40772475430667 -85.67761886817112
- en 746919.3375660023 -6453553.579350668
- ll2 -22.4077247540873 -85.67761886783606
-EPSG:2816
- ll -59.0628112438 -86.91899301932536
- en 819925.2477861494 -1.0529395549819672E7
- ll2 -59.062811241251225 -86.91899302254316
-EPSG:2817
- ll 54.05659812633152 -101.39563785938944
- en 398793.82353584 2010089.6466006984
- ll2 54.056598116440966 -101.39563784147293
-EPSG:2818
- ll 82.69315063257366 -158.69628074749696
- en -325467.377716745 4984728.419334378
- ll2 82.69315063257429 -158.69628074749693
-EPSG:2819
- ll -8.962523452976912 -31.733918669257235
- en 1.0110889637944292E7 -2129270.9436685177
- ll2 -8.962523452976868 -31.733918669257246
-EPSG:28191
- ll 57.86571338444591 35.95767888098123
- en 214227.3242751412 3031086.4327540025
- ll2 57.86571341068855 35.95767884815174
-EPSG:28192
- ll 23.328634905322716 37.091914046863955
- en 362522.4869096456 196643.90272715234
- ll2 23.3286347595743 37.09191403647752
-EPSG:28193
- ll -3.3399571366158796 36.18484900344749
- en 278501.26121669536 -2754935.370508059
- ll2 -3.33995726694988 36.1848490257592
-EPSG:2820
- ll 14.684718366623386 -119.39137539881561
- en -210374.82319898892 5780929.291088517
- ll2 14.684718366592486 -119.39137539868632
-EPSG:2821
- ll -68.75155884078032 -119.14620725906796
- en 399707.40940554155 -5477445.803359451
- ll2 -68.7515588407706 -119.14620725906532
-EPSG:2822
- ll 37.79630790705296 -117.31097527153207
- en 912053.8488161238 4338759.749068224
- ll2 37.79630790705273 -117.31097527153156
-EPSG:2823
- ll 54.88327021315001 -73.14373096386231
- en 205209.0427689787 1378013.3487311301
- ll2 54.88327021314936 -73.14373096386265
-EPSG:28232
- ll 3.4780536761280842 3.798811484416652
- en -78567.20456314133 1.0386320523877833E7
- ll2 3.478053652578513 3.798811491103914
-EPSG:2824
- ll 7.2291866449932485 -75.96858570812813
- en -12192.34032885087 -3499985.453839756
- ll2 7.229186644993264 -75.96858570812601
-EPSG:2825
- ll -14.391102343323197 -111.23571304228122
- en -580938.736267074 -5033342.168851227
- ll2 -14.39110234179831 -111.23571303766154
-EPSG:2826
- ll 66.8208228132637 -108.73480164163395
- en 390850.63042666833 3985175.434547836
- ll2 66.82082281325168 -108.73480164163153
-EPSG:2827
- ll -81.58493288347975 -112.21836091567384
- en 758401.9645501924 -1.2494766346115673E7
- ll2 -81.58493288345305 -112.21836091511115
-EPSG:2828
- ll 26.45474466622352 -74.4451944586574
- en 155465.16179219284 -1372646.8145542394
- ll2 26.454744666223032 -74.4451944586574
-EPSG:2829
- ll -60.473275547004214 -79.05636322249767
- en 114010.8784258226 -1.1138190687468909E7
- ll2 -60.473275546986144 -79.05636322249723
-EPSG:2830
- ll 11.372109201998825 -85.0201563716675
- en -353899.49918881804 -3163882.7055392596
- ll2 11.37210920117446 -85.02015636681831
-EPSG:2831
- ll -5.056010131106005 -67.29283174979162
- en 1295429.3521147182 -5512594.369276471
- ll2 -5.05601013110596 -67.29283174979162
-EPSG:2832
- ll 54.61895163107019 -74.0654270758456
- en 2285629.5442015203 1141381.680775954
- ll2 54.618951631070516 -74.06542707584559
-EPSG:2833
- ll 86.0938231094234 -140.50904382492718
- en 110415.36676890444 5245680.866697639
- ll2 86.09382310942372 -140.50904382492718
-EPSG:2834
- ll -0.5463005617154728 -36.833018047413105
- en 6768596.465604651 -3198466.9291944113
- ll2 -0.5463005617154375 -36.833018047413084
-EPSG:28348
- ll -51.7827557250628 99.43750217524955
- en 116427.45033571112 4248474.789440878
- ll2 -51.782755722255 99.43750217718411
-EPSG:28349
- ll 56.11908119408878 104.41826906935283
- en 91116.66147742141 1.623886508308639E7
- ll2 56.11908118677716 104.41826908225849
-EPSG:2835
- ll 73.19545951575941 -19.77742428447084
- en 2983035.248551883 5072529.301141821
- ll2 73.19545951576036 -19.777424284470833
-EPSG:28350
- ll 55.5494140834376 110.74571384969501
- en 105690.74147744919 1.6173707980478518E7
- ll2 55.54941407796593 110.74571385750771
-EPSG:28351
- ll -5.927549859201648 124.23547327468535
- en 636757.5137936814 9344651.932000265
- ll2 -5.927549859201649 124.2354732746844
-EPSG:28352
- ll 88.87229019606315 122.66404728237248
- en 486105.93780967616 1.9872825955519088E7
- ll2 88.8722901960706 122.66404729853302
-EPSG:28353
- ll -84.6687589785394 135.26591487570482
- en 502758.4384975858 597240.6873786934
- ll2 -84.6687589785399 135.26591487570482
-EPSG:28354
- ll -39.57957367191348 142.3807442956453
- en 618581.7343805826 5617993.824570541
- ll2 -39.579573671913046 142.38074429564602
-EPSG:28355
- ll 4.614958411252687 153.73455252783333
- en 1248688.7065931745 1.0513655295638159E7
- ll2 4.614958410710299 153.73455251677336
-EPSG:28356
- ll -50.59346958588726 151.73547031020527
- en 410496.7302366578 4394618.04980387
- ll2 -50.59346958588708 151.73547031020505
-EPSG:28357
- ll 5.876095960743683 152.98027782835894
- en -167559.6739136047 1.0653108205627438E7
- ll2 5.876095960432108 152.98027783345137
-EPSG:28358
- ll -76.53819120645434 171.51551527162502
- en 668992.6494465838 1495404.304947814
- ll2 -76.53819120542879 171.51551525241138
-EPSG:2836
- ll 45.93480966815065 -130.83692047303123
- en -1936552.5497181574 1652737.5359043167
- ll2 45.934809668150756 -130.83692047303123
-EPSG:2837
- ll 49.79322090700495 -113.80731285279704
- en -577502.0656314688 1941618.7292293813
- ll2 49.793220907005136 -113.80731285279705
-EPSG:2838
- ll 47.29336386074789 -53.368674002584896
- en 7015917.455399737 2395267.903399702
- ll2 47.29336386074804 -53.36867400258489
-EPSG:2839
- ll 34.98536352700267 -160.56928101262537
- en -2054714.6830952787 122441.79077638479
- ll2 34.98536352700282 -160.56928101262537
-EPSG:2840
- ll 31.16868086840016 -69.12326996576579
- en 326616.2954805498 -1097711.3361231897
- ll2 31.168680868391977 -69.12326996575261
-EPSG:28404
- ll -30.448653724107707 18.283311576132178
- en 4239127.522701612 -3372950.1685266173
- ll2 -30.44865370839506 18.28331160640861
-EPSG:28405
- ll -66.19175583091605 25.48212889622348
- en 5431724.9467141135 -7345095.195481111
- ll2 -66.19175581390255 25.482128977194215
-EPSG:28406
- ll 63.248306707268284 28.682829033463783
- en 6283343.995726169 7023475.234891585
- ll2 63.24830670639525 28.68282903986199
-EPSG:28407
- ll 87.96177194014362 33.920030926310005
- en 7479976.704449027 9775311.267396562
- ll2 87.96177193819139 33.92003105775926
-EPSG:28408
- ll -8.46926150501217 44.985335656560345
- en 8498475.853709685 -936466.7602798821
- ll2 -8.469261500226919 44.985335662729646
-EPSG:28409
- ll -44.05104953780813 57.386549637374785
- en 1.0011927694484144E7 -4899322.54665582
- ll2 -44.0510495151472 57.38654965134688
-EPSG:2841
- ll 6.947414610371283 -74.92809621090987
- en 3921363.2395539787 -3867069.718915976
- ll2 6.9474146103713545 -74.92809621090991
-EPSG:28410
- ll -18.937376590274113 58.43496479874679
- en 1.0651230217291461E7 -2095269.693364424
- ll2 -18.937376585175123 58.434964803233235
-EPSG:28411
- ll -66.93007528686763 65.26191177993456
- en 1.1598998629113218E7 -7428337.202265851
- ll2 -66.93007525883365 65.2619118200877
-EPSG:28412
- ll 69.40696446674195 68.14577958664678
- en 1.2466529593625857E7 7703105.850875402
- ll2 69.40696446787726 68.14577958349511
-EPSG:28413
- ll -68.8479036922902 69.00466462601693
- en 1.3258830484556591E7 -7652220.386263383
- ll2 -68.8479036609661 69.00466467426455
-EPSG:28414
- ll -86.91372630060546 86.30318389179357
- en 1.45318800822478E7 -9658747.684724728
- ll2 -86.91372626330676 86.30318404658796
-EPSG:28415
- ll 79.6374896071872 82.35867911206806
- en 1.5406893907931827E7 8848405.364777634
- ll2 79.63748960638225 82.35867911451926
-EPSG:28416
- ll 23.7806097431546 95.4396802518072
- en 1.6748707365113813E7 2633185.953480809
- ll2 23.780609741472137 95.43968025097749
-EPSG:28417
- ll -25.846219233168924 95.78401694493502
- en 1.71774726512293E7 -2863661.369957785
- ll2 -25.84621923028909 95.78401694513052
-EPSG:28418
- ll -59.8629880770021 109.57742321607031
- en 1.8756309366347726E7 -6647622.616003708
- ll2 -59.86298805058522 109.57742320793315
-EPSG:28419
- ll 20.5440509948385 113.43273029313016
- en 1.9753699348368462E7 2274548.7572021866
- ll2 20.54405099248871 113.43273029590142
-EPSG:2842
- ll 35.63351559524287 -34.16268745924617
- en 6029224.864589235 1538425.7160604196
- ll2 35.633515595243026 -34.16268745924616
-EPSG:28420
- ll 37.35261611578554 122.3834635124853
- en 2.0977094748539515E7 4149313.2647277387
- ll2 37.35261611512926 122.38346351807725
-EPSG:28421
- ll 73.90404747210647 128.92316261530954
- en 2.168304210648347E7 8213747.777955341
- ll2 73.90404747154322 128.92316260932586
-EPSG:28422
- ll 28.87295026552026 126.32310171107349
- en 2.2238709681121036E7 3198194.6271071974
- ll2 28.872950264594316 126.32310171575322
-EPSG:28423
- ll -39.25432258439728 135.53685461013725
- en 2.3546232025185525E7 -4346820.981852523
- ll2 -39.254322570360955 135.5368545994144
-EPSG:28424
- ll -78.32231791910701 138.08312719040396
- en 2.4433983742901184E7 -8699499.521041691
- ll2 -78.322317889032 138.08312708672423
-EPSG:28425
- ll -38.63429209650418 151.4586075031985
- en 2.5888176636851538E7 -4287307.071736774
- ll2 -38.634292080249885 151.45860748521997
-EPSG:28426
- ll 63.97448640104426 147.6238768217851
- en 2.623681319171792E7 7108183.224270347
- ll2 63.974486399631296 147.62387682706384
-EPSG:28427
- ll 28.26438977544278 156.3540076742283
- en 2.724017789091673E7 3130663.205166012
- ll2 28.26438977500404 156.3540076744149
-EPSG:28428
- ll -1.3820214406174784 162.68295410381742
- en 2.824191371755349E7 -152872.74295060025
- ll2 -1.3820214354811138 162.68295409593375
-EPSG:28429
- ll -49.39003176940262 173.9226697220058
- en 2.9712019251559824E7 -5477130.501224756
- ll2 -49.39003175154282 173.92266967852524
-EPSG:2843
- ll 86.55650080394696 -69.43000674743585
- en 884015.950696544 7347197.426338561
- ll2 86.55650080394729 -69.43000674743587
-EPSG:28430
- ll -57.55368377193385 171.28712600602472
- en 3.0158066882146254E7 -6396024.091860284
- ll2 -57.55368375032237 171.28712595477728
-EPSG:28431
- ll -50.095122674725886 -170.3965890079079
- en 3.197216940234801E7 -5572388.800237422
- ll2 -50.09512265349044 -170.39658907094469
-EPSG:28432
- ll 55.779115384624646 -169.89935892050772
- en 3.256890313845176E7 6184657.46384921
- ll2 55.77911538685076 -169.89935893527525
-EPSG:2844
- ll 76.68759547953573 -97.05169453568422
- en 370904.4071621603 6339732.005606433
- ll2 76.68759547953665 -97.05169453568422
-EPSG:2845
- ll 62.49766317614667 -105.32103948508805
- en 187075.13282039872 5613526.813006825
- ll2 62.49766317614731 -105.32103948508806
-EPSG:2846
- ll 19.908795883077268 -178.10400946327715
- en -6931643.256432211 4693708.379232737
- ll2 19.908795883077232 -178.10400946327673
-EPSG:2847
- ll 5.3989753655693775 -74.02982812818188
- en 3583793.951099944 1761533.6918810834
- ll2 5.3989753655694255 -74.02982812818188
-EPSG:2848
- ll -4.776970081689754 -135.6133337565342
- en -4401811.735016674 2147933.434813377
- ll2 -4.776970081689724 -135.6133337565342
-EPSG:2849
- ll 42.84438845251717 -143.34258878215223
- en -2046032.0871996507 1750684.0380580807
- ll2 42.844388452517265 -143.34258878215223
-EPSG:2850
- ll 15.229769831599079 -76.86977398694896
- en 4450321.262023041 134242.44658721727
- ll2 15.229769831599102 -76.86977398694896
-EPSG:2851
- ll 78.89826511112311 -100.32534178672665
- en 864967.0782627092 8321647.296800109
- ll2 78.89826511112395 -100.32534178672665
-EPSG:2852
- ll -70.0841787191782 -70.68498898333776
- en 569018.0357390074 -1.2486129863605866E7
- ll2 -70.08417871917773 -70.6849889833379
-EPSG:2853
- ll -20.33368693985587 -105.0172718487477
- en -990259.2798078731 -5010204.384783811
- ll2 -20.333686939855795 -105.01727184874771
-EPSG:2854
- ll 3.0897520084650054 -108.60433057017468
- en -380949.8427967052 -2278115.271319398
- ll2 3.0897520084650423 -108.60433057017468
-EPSG:2855
- ll 46.02201609428143 -173.92620271263849
- en -3294941.086779706 1254845.7584141337
- ll2 46.02201609428157 -173.92620271263854
-EPSG:2856
- ll 39.50731124545337 -110.47050967811049
- en 1366501.444892558 -593871.9549311695
- ll2 39.507311245453465 -110.47050967811047
-EPSG:2857
- ll 38.25063774514412 -134.56749766976932
- en -3924997.2962563233 1404276.933266062
- ll2 38.25063774514424 -134.56749766976932
-EPSG:2858
- ll -6.807140903916848 -27.662236612816287
- en 8010265.591218956 -3171578.52394195
- ll2 -6.807140903916826 -27.66223661281629
-EPSG:2859
- ll -11.395967286896388 -67.81628918396352
- en 4351231.505909622 -6834859.513954521
- ll2 -11.39596728689636 -67.81628918396352
-EPSG:2860
- ll 44.94557004062737 -23.300709872766447
- en 5291475.929279767 2166494.997596941
- ll2 44.945570040627466 -23.300709872766458
-EPSG:28600
- ll -4.856701509862901 57.152364692014906
- en 859639.1354197292 -2945092.295604648
- ll2 -4.856701508705117 57.15236468341374
-EPSG:2861
- ll 10.086806431161605 -107.28621034228449
- en -1591012.6751120081 -3507163.48111931
- ll2 10.08680643116163 -107.28621034228448
-EPSG:2862
- ll 62.458178268347524 -102.68915042633859
- en 327833.0084979641 2445244.2633802835
- ll2 62.45817826833109 -102.68915042633982
-EPSG:2863
- ll 23.33089344108417 -102.91883582907315
- en 851755.4044110186 -1796845.2360156355
- ll2 23.330893440948334 -102.91883582883591
-EPSG:2864
- ll 50.84220155525662 -105.62959764299077
- en 819751.4814082958 1154052.6660146315
- ll2 50.84220155516834 -105.62959764297713
-EPSG:2865
- ll 27.607337445193778 -105.26371819548747
- en 1276066.3448279148 -1320737.9727509448
- ll2 27.60733744486145 -105.26371819484424
-EPSG:2866
- ll 17.64648633420338 -77.17157107164378
- en -938876.8346262446 212721.47764783236
- ll2 17.64648633420335 -77.17157107164378
-EPSG:2867
- ll 56.6450545299935 -116.53888532224846
- en -581411.6300356799 9407154.62902132
- ll2 56.64505452401367 -116.53888531243862
-EPSG:2868
- ll 56.25580449200419 -112.27857173706934
- en 626415.3980480235 9205542.377607191
- ll2 56.25580449200458 -112.27857173706934
-EPSG:2869
- ll 31.734244405575268 -114.21077279712554
- en 556751.0317438928 267378.1366826534
- ll2 31.734244405573243 -114.21077279712554
-EPSG:2870
- ll 12.599813694751337 -142.71256111823692
- en -1613100.3450189265 -7504306.1765285
- ll2 12.59981369475136 -142.71256111823692
-EPSG:2871
- ll 64.83258301731736 -133.39002697757002
- en 4559053.309615283 1.2057417905907756E7
- ll2 64.83258301731813 -133.39002697757002
-EPSG:2872
- ll 5.972479146144167 -142.76134932590767
- en -2670161.6660964633 -8922401.945943346
- ll2 5.97247914614422 -142.76134932590764
-EPSG:2873
- ll 80.77285283653791 -166.33386498095214
- en 2077301.5777480465 2.194294812377015E7
- ll2 80.77285283653865 -166.33386498095214
-EPSG:2874
- ll -23.994592994943844 -145.53570625569938
- en -8492186.716359945 -2.128213185014194E7
- ll2 -23.99459299494361 -145.53570625569938
-EPSG:2875
- ll 29.959435166218576 -70.43203582159302
- en 2.063231976909377E7 3979205.1237544776
- ll2 29.959435166217283 -70.43203582159302
-EPSG:2876
- ll 76.73992699477145 -95.74956101706334
- en 4112586.5523225903 1.600787493813643E7
- ll2 76.73992699477236 -95.74956101706336
-EPSG:2877
- ll 86.8245110510546 -146.74654878095663
- en 1115092.6384258906 2.33801236491647E7
- ll2 86.82451105105487 -146.74654878095663
-EPSG:2878
- ll 34.14381718496538 -93.60494288867335
- en 6596682.894098196 310157.0201859778
- ll2 34.14381718496556 -93.60494288867335
-EPSG:2879
- ll 26.829561853070715 -34.63750569121123
- en 1.3408294561439859E7 -1870806.686710875
- ll2 26.829561853070203 -34.63750569121122
-EPSG:2880
- ll 74.32781460502372 -74.9077399305152
- en 706532.1657863447 1.3269195892738946E7
- ll2 74.32781460502468 -74.90773993051522
-EPSG:2881
- ll -62.771669463441576 -76.96858609612511
- en 1331250.9876870576 -3.1696184730333854E7
- ll2 -62.77166946313259 -76.96858609631255
-EPSG:2882
- ll -8.559120036106549 -87.36709357993237
- en -1284938.9186307488 -1.1950819295885459E7
- ll2 -8.559120035910475 -87.3670935778346
-EPSG:2883
- ll 34.29545683166696 -97.26947708609244
- en -1890316.7886772929 2143946.92035835
- ll2 34.295456831667174 -97.26947708609245
-EPSG:2884
- ll 65.55867548944912 -79.83331139640495
- en 1009652.2785001766 1.2976084788787222E7
- ll2 65.55867548944013 -79.83331139640606
-EPSG:2885
- ll 65.14819161903338 -83.12457273958279
- en 2456957.634517436 1.2820711774138913E7
- ll2 65.14819161903408 -83.12457273958277
-EPSG:2886
- ll -43.30021016530654 -113.5289252118431
- en 293528.3691932584 -3.087622242265909E7
- ll2 -43.30021016530609 -113.52892521184374
-EPSG:2887
- ll 57.19600350662293 -118.97665144741455
- en 653942.4115440598 5702165.691074964
- ll2 57.196003505259384 -118.97665144641007
-EPSG:2888
- ll -21.401810464367102 -113.88199870351036
- en 3260179.6555664614 -2.2909618759910826E7
- ll2 -21.401810464366417 -113.8819987035102
-EPSG:2891
- ll 44.3273744950187 -33.92160859019333
- en 1.4232246623257777E7 6019694.00114322
- ll2 44.3273744950188 -33.92160859019332
-EPSG:2892
- ll 45.88457269880389 -122.60567050176397
- en -7615711.074297005 6960956.316952232
- ll2 45.884572698803986 -122.60567050176397
-EPSG:2893
- ll 11.128804556826054 -139.860872482125
- en -2.1852179424816288E7 -1718027.609300295
- ll2 11.12880455682607 -139.86087248212502
-EPSG:2894
- ll 27.116326019098608 -33.11110566625922
- en 1.3124888167785997E7 201646.19652329807
- ll2 27.116326019098008 -33.11110566625921
-EPSG:2895
- ll 13.91729839799497 -56.0548085085171
- en 7303782.711670478 -9739980.991728622
- ll2 13.91729839799498 -56.05480850851709
-EPSG:2896
- ll 19.56719957288624 -86.76946073665002
- en 2.6334240438828286E7 -9505801.377232833
- ll2 19.567199572886224 -86.76946073665003
-EPSG:2897
- ll 68.06561081083514 -167.4204816598279
- en 9195388.188133601 1.5207997782258991E7
- ll2 68.06561081083603 -167.42048165982789
-EPSG:2898
- ll 57.436542609313335 -76.89846265632654
- en 1.4646310724662216E7 5944163.309648361
- ll2 57.43654260931376 -76.89846265632654
-EPSG:2899
- ll 67.45418839596172 -87.45529670506637
- en 1177751.983980616 1.3847616724841163E7
- ll2 67.4541883959622 -87.45529670506636
-EPSG:28991
- ll -33.87460077721407 -58.080999727492895
- en -1.2018485329982508E7 -1.019380790342698E7
- ll2 -33.87460028446274 -58.08099909006473
-EPSG:28992
- ll 53.559044947053025 5.527341224341959
- en 164286.67950594757 619230.8296641558
- ll2 53.55904495225151 5.52734122781861
-EPSG:2900
- ll -29.53272344249791 -84.49584467925268
- en 4154637.424139287 -2.147939034024294E7
- ll2 -29.5327234412548 -84.49584467732106
-EPSG:2901
- ll -2.18755877272727 -87.26968217965927
- en 1.3045354645851579E7 -1.743923595698751E7
- ll2 -2.187558772727235 -87.26968217965926
-EPSG:2902
- ll 85.25694453387501 -98.11054798045835
- en 729505.6819905356 1.9828669832311973E7
- ll2 85.25694453385928 -98.11054799405152
-EPSG:2903
- ll -60.163989754158834 -106.19552384277728
- en 1650339.2532151032 -3.314399132410284E7
- ll2 -60.163989754159395 -106.19552384277728
-EPSG:2904
- ll 88.4164042775898 -101.60352879741735
- en 2786051.370035298 2.0979698271808576E7
- ll2 88.41640427759775 -101.60352881127783
-EPSG:2905
- ll 87.71624974538102 -67.78827784248872
- en 589898.8155112495 1.7874261163926776E7
- ll2 87.71624974540256 -67.78827786967044
-EPSG:2906
- ll -26.856034696814618 -74.41300673715445
- en 1527905.2005765876 -2.428666800593199E7
- ll2 -26.8560346968116 -74.41300673714872
-EPSG:2907
- ll -54.899548895878056 -72.19657054454126
- en 2491536.373903036 -3.455905577591204E7
- ll2 -54.899548889627454 -72.19657055371458
-EPSG:2908
- ll 0.3910192965212893 -98.52642898032045
- en -1.010666110748132E7 -1.4087774957060166E7
- ll2 0.391019296521334 -98.52642898032045
-EPSG:2909
- ll 48.80058073824102 -90.88526483303406
- en 4279880.169762686 801325.2477469613
- ll2 48.80058073824118 -90.88526483303406
-EPSG:2910
- ll 47.12072529394508 -98.03720905018591
- en 2581520.40177871 539893.7550769132
- ll2 47.120725293945206 -98.03720905018592
-EPSG:2911
- ll 13.960764981979679 -160.4186563925593
- en -2.0168028497347586E7 -469418.51094886614
- ll2 13.9607649819797 -160.41865639255934
-EPSG:2912
- ll 4.795499508988939 -76.83347807927022
- en 1.06443308775544E7 -9928593.611254696
- ll2 4.795499508988979 -76.83347807927022
-EPSG:2913
- ll 57.96089393825147 -43.93597139922795
- en 2.129660689619E7 1.1973280076007552E7
- ll2 57.960893938251914 -43.93597139922793
-EPSG:2914
- ll 78.22360243975169 -97.47626509493654
- en 7196732.394423982 1.4820748120142696E7
- ll2 78.22360243975257 -97.47626509493654
-EPSG:2915
- ll 68.5807870697652 -69.04568905838548
- en 4765580.48178174 1.3571649227692371E7
- ll2 68.58078706976607 -69.04568905838548
-EPSG:2916
- ll 28.909087909611394 -98.0001322835929
- en 1782692.9188293803 1444081.0401389666
- ll2 28.909087909610427 -98.0001322835929
-EPSG:29168
- ll 61.4962505759506 -72.97383852807128
- en 607923.7137447051 6819764.202705626
- ll2 61.49625057600938 -72.97383853223779
-EPSG:29169
- ll 64.08676390041313 -64.33358827157855
- en 727440.7182787955 7115034.46656975
- ll2 64.08676390018604 -64.33358827729204
-EPSG:2917
- ll 51.487497947682115 -42.9533670636649
- en 1.4752834543384362E7 1.7370325666153584E7
- ll2 51.487497947682336 -42.9533670636649
-EPSG:29170
- ll 87.9066061494967 -69.58652214266627
- en 473254.39538345236 9765783.325413615
- ll2 87.90660615013384 -69.5865221602275
-EPSG:29171
- ll 40.89709092962977 -59.1941994820353
- en 315225.8348483662 4529670.158362481
- ll2 40.897090929408705 -59.19419948524272
-EPSG:29172
- ll 38.644092693405966 -46.6811576084713
- en 875968.4274084907 4286156.557213741
- ll2 38.64409269299729 -46.68115761142347
-EPSG:2918
- ll 74.60619885060835 -56.4118006484219
- en 8718850.832102878 2.976722450919354E7
- ll2 74.60619885060932 -56.411800648421874
-EPSG:29187
- ll 56.10233388553681 -87.89877771438307
- en 71335.82050484978 1.6238966873784505E7
- ll2 56.10233387560859 -87.89877769671062
-EPSG:29188
- ll 73.98405507662088 -80.52542459529914
- en 330122.8525837779 1.8218161787158187E7
- ll2 73.9840550760799 -80.5254245973408
-EPSG:29189
- ll -55.07284416010515 -71.72858583659203
- en 325855.18668942014 3893723.598518692
- ll2 -55.07284415770749 -71.72858583053912
-EPSG:2919
- ll 87.81497994437059 -125.79611019951417
- en 384347.68896991044 4.413747442381651E7
- ll2 87.8149799443708 -125.79611019951416
-EPSG:29190
- ll -86.63182884900537 -61.937558993524725
- en 507026.3497386219 378022.24857002124
- ll2 -86.63182884592591 -61.93755891380089
-EPSG:29191
- ll -39.50267470373897 -53.38749623403478
- en 810681.7209471744 5621244.375906401
- ll2 -39.502674702484555 -53.387496232635904
-EPSG:29192
- ll 49.37429771765645 -47.86277644878191
- en 727770.7597073605 1.5473810304193255E7
- ll2 49.374297718146224 -47.86277645257252
-EPSG:29193
- ll 55.5157816005169 -48.5811098978543
- en 273967.92316412413 1.6158018715609182E7
- ll2 55.51578160117299 -48.58110990204838
-EPSG:29194
- ll 15.696534130716287 -39.294936374037604
- en 468435.8559257053 1.1735418715515263E7
- ll2 15.696534129426903 -39.294936376314
-EPSG:29195
- ll 47.87182738180178 -36.37825000028148
- en 247423.2213225987 1.5307582304683322E7
- ll2 47.87182738261768 -36.378250003622114
-EPSG:2920
- ll 48.19454610199345 -51.913654169982806
- en 1.2957050075318523E7 2.703322411496913E7
- ll2 48.194546101993595 -51.91365416998283
-EPSG:2921
- ll 59.426410038992984 -38.60239193167601
- en 1.4389180475463953E7 1.6056659654938607E7
- ll2 59.42641003899347 -38.602391931676024
-EPSG:2922
- ll -10.154127567476218 -29.092224886316785
- en 3.79762230574263E7 4633483.322142099
- ll2 -10.154127567476177 -29.09222488631679
-EPSG:29220
- ll -27.428976297386924 -69.19361951192174
- en -112540.55345410679 6950654.589777723
- ll2 -27.428976302896444 -69.19361947889493
-EPSG:29221
- ll 45.855691962069585 -55.21928506680358
- en 638530.7958946588 1.507954154005905E7
- ll2 45.85569194517452 -55.21928500897237
-EPSG:2923
- ll 58.81095106519392 -55.24290824664524
- en 1.2484244946512083E7 2.1477973207669757E7
- ll2 58.810951065194374 -55.242908246645236
-EPSG:2924
- ll 44.628495631333685 -53.69230047742833
- en 1.7899140411559124E7 9974499.190615468
- ll2 44.628495631333806 -53.69230047742834
-EPSG:2925
- ll -4.325873464422923 -43.389520494891684
- en 2.7440586248269167E7 -9817947.08186366
- ll2 -4.325873464422876 -43.389520494891684
-EPSG:2926
- ll 11.20157552580239 -45.57775011355727
- en 2.909365634978255E7 708255.2060495953
- ll2 11.201575525802394 -45.577750113557265
-EPSG:2927
- ll 24.636143460021472 -116.15838950371044
- en 3181155.585262057 -7674794.9591258755
- ll2 24.636143460021227 -116.15838950371044
-EPSG:2928
- ll 68.30543552016975 -111.97824535907796
- en -1254260.8767780135 9140761.352913681
- ll2 68.30543552017062 -111.97824535907795
-EPSG:2929
- ll 24.196874411696513 -138.1329309240998
- en -1.4081691877191523E7 -2399640.767415523
- ll2 24.196874411696296 -138.1329309240998
-EPSG:2930
- ll 80.37159001810366 -160.5145379002233
- en -3443503.6473151054 1.7875077162637185E7
- ll2 80.37159001810443 -160.5145379002233
-EPSG:2931
- ll -75.84396164715088 16.83008360029888
- en 604546.008557755 -8421047.628281552
- ll2 -75.8439615932832 16.83008347087324
-EPSG:2932
- ll -42.95791278299075 50.38791056901272
- en 132431.07054938335 -7163451.604466583
- ll2 -42.957912781339815 50.3879105693536
-EPSG:2933
- ll -62.17044037049885 122.89541754279065
- en 806687.8937991522 3092918.945582335
- ll2 -62.17044003642681 122.89541750168922
-EPSG:29333
- ll -31.045905690932017 18.326835642730558
- en 817598.7375478367 6560798.604539586
- ll2 -31.04590569218991 18.326835646319697
-EPSG:2935
- ll 7.15497816285837 45.94107588303582
- en 1787440.1866723825 780727.2839673244
- ll2 7.154978163709557 45.94107588434119
-EPSG:2936
- ll -68.26232961159351 44.17103820960984
- en 2285120.714000162 -7588102.809458246
- ll2 -68.26232958784986 44.17103827927705
-EPSG:2937
- ll 39.59015454121891 52.31886883476406
- en 3711276.2917043003 4382167.29644217
- ll2 39.59015454002021 52.31886883144685
-EPSG:29371
- ll 63.277677625789636 11.202765313508486
- en 10198.277121505454 9452791.27575299
- ll2 63.27767715457181 11.202765271908394
-EPSG:29373
- ll -44.538194760365165 13.926214902984452
- en 73656.4567267212 -2500170.633997436
- ll2 -44.53819475988867 13.926214902796069
-EPSG:29375
- ll 47.43674852447788 14.85597725981346
- en -10797.68087927691 7689401.479978593
- ll2 47.43674822156358 14.855977208863514
-EPSG:29377
- ll 22.48560800460531 21.50702893565297
- en 464214.01629722945 4928309.009389871
- ll2 22.485607899087505 21.507028899307613
-EPSG:29379
- ll 70.04872608123267 15.999540559901368
- en -114148.06409890718 1.021058180673042E7
- ll2 70.04872553840511 15.999540365336513
-EPSG:2938
- ll -45.8351184180469 53.41866595018006
- en 4524255.868158212 -5094666.364036275
- ll2 -45.83511839964395 53.418665970728924
-EPSG:29381
- ll -34.62662493718074 21.385084856663326
- en 35442.50710335141 -1399373.141235489
- ll2 -34.62662493849253 21.385084859395544
-EPSG:29383
- ll -15.88734944767053 28.880913501380054
- en 630902.8987972953 667783.1358052164
- ll2 -15.887349449698686 28.88091349547207
-EPSG:29385
- ll 23.76150525284085 25.788596884323226
- en 80558.90432616569 5062826.531944013
- ll2 23.76150513449949 25.788596829523573
-EPSG:2939
- ll 30.766084895363193 52.675233225135074
- en 2482825.822009632 3391940.149456947
- ll2 30.766084894424697 52.67523322194124
-EPSG:2940
- ll 49.984576277317444 53.945785007450965
- en 3312939.208753328 5524479.992831945
- ll2 49.98457627764615 53.94578500319811
-EPSG:2941
- ll -7.55168523200814 61.31883223515715
- en 4802965.307895112 -852358.0904277753
- ll2 -7.551685231303069 61.31883223509698
-EPSG:2942
- ll 56.45065014376365 -10.926948296899246
- en 751359.2927559502 6263379.262956683
- ll2 56.45065001137844 -10.92694812108078
-EPSG:2943
- ll 63.28165478559339 -11.267977951150394
- en 687332.0349740786 7022415.089531164
- ll2 63.28165475547132 -11.267977887325761
-EPSG:2945
- ll 4.358373157487833 -61.20480112259279
- en 4486.820545801544 482424.0808842375
- ll2 4.358373157486556 -61.20480112253635
-EPSG:2946
- ll 44.0675304617572 -64.38462080610527
- en 73717.92411921002 4884885.278680692
- ll2 44.067530461709765 -64.3846208061324
-EPSG:2947
- ll 52.733498062934416 -61.16553092664712
- en 529986.6338868279 5849595.880301828
- ll2 52.7334980628025 -61.16553092664267
-EPSG:2948
- ll 48.922221901956306 -72.14457723908527
- en -35496.07421771489 5430843.800156241
- ll2 48.92222190102121 -72.14457723895349
-EPSG:2949
- ll -69.75263620243689 -75.61353044082179
- en 107438.71570122632 -7748880.21105805
- ll2 -69.75263620171755 -75.613530438866
-EPSG:2950
- ll 30.19384413339398 -68.38275064310703
- en 797858.6763157378 3352359.809423216
- ll2 30.193844132798045 -68.38275064213288
-EPSG:2951
- ll 13.734376023420396 -82.48299391789959
- en -343290.18359959754 1526860.8730142668
- ll2 13.734376022854818 -82.4829939158318
-EPSG:2952
- ll -39.015079224914835 -72.84023029934252
- en 881802.191714055 -4340909.43839016
- ll2 -39.01507921948643 -72.8402303000212
-EPSG:2953
- ll 36.40567238189615 -8.585186109635856
- en 7549099.374216858 8233258.7272745855
- ll2 36.405672381896146 -8.585186109635842
-EPSG:2954
- ll -49.53392505702574 -87.97425113857055
- en -3758896.616021905 -1.3509252748172581E7
- ll2 -49.533925057025904 -87.97425113857058
-EPSG:2955
- ll 45.89864775095637 -111.12138062749196
- en 956000.3622280173 5099614.707757141
- ll2 45.898647747412 -111.12138062899896
-EPSG:2956
- ll -9.90967138797184 -115.7036387827001
- en -16188.804336104426 -1099077.952951632
- ll2 -9.90967138788075 -115.70363878185094
-EPSG:2957
- ll 69.50708212596939 -103.52202506135359
- en 557741.641043149 7711603.417121476
- ll2 69.50708212596987 -103.52202506135359
-EPSG:2958
- ll -53.19624809853009 -75.52552084470912
- en 865568.9281320698 -5908104.027777165
- ll2 -53.19624809598027 -75.52552084658852
-EPSG:2959
- ll 3.2043711485880095 -80.86096963852462
- en -152305.4244982138 356052.8857268111
- ll2 3.2043711484403734 -80.86096963374244
-EPSG:2960
- ll 52.3970578518439 -67.84813453538617
- en 578373.321245369 5805825.79240083
- ll2 52.397057851843904 -67.84813453538604
-EPSG:2961
- ll -57.597869590696334 -66.71421078637746
- en 278066.3815415786 -6390018.005348664
- ll2 -57.59786959046176 -66.7142107863205
-EPSG:2962
- ll -47.745920482464534 -57.42451071404295
- en 468178.26145687286 -5288148.225206976
- ll2 -47.74592048246465 -57.424510714042945
-EPSG:2965
- ll -76.22066715056118 -92.31253956472777
- en -250699.0117912697 -4.059940874543651E7
- ll2 -76.22066714933726 -92.31253954182523
-EPSG:2966
- ll -16.07316374724357 -88.88920760228747
- en 2318758.5432130178 -1.8636403989796363E7
- ll2 -16.073163747243242 -88.88920760228513
-EPSG:2967
- ll 52.972027224269 -79.62648658436251
- en 1658665.8214723812 6517512.599952763
- ll2 52.97202721969839 -79.62648658915784
-EPSG:2968
- ll 40.20332302983019 -89.459086379615
- en 2289120.2387207784 1813648.0279864413
- ll2 40.20332302981782 -89.45908637962765
-EPSG:2969
- ll 17.70389264322191 -62.57380375016622
- en 544958.7463972603 1957914.5536007567
- ll2 17.70389262076944 -62.57380373693211
-EPSG:2970
- ll 16.4454568377889 -61.235547356427155
- en 688805.3371984751 1819334.84896472
- ll2 16.44545682053553 -61.23554738302177
-EPSG:29702
- ll -11.121944502911976 49.86655198408382
- en 775352.4209101503 1657313.197879591
- ll2 -11.121944508751577 49.866551983491796
-EPSG:2971
- ll -45.568719799149655 -44.55350460146211
- en 1003003.0076929487 -5066432.132746964
- ll2 -45.56871979776316 -44.553504600298886
-EPSG:2972
- ll 3.087236605655137 -52.18804837513089
- en 367981.07310790545 341309.44142652635
- ll2 3.0872366056551312 -52.18804837513006
-EPSG:2973
- ll 14.260637582452576 -61.169562494611895
- en 697090.5829156451 1577160.0327720377
- ll2 14.26063759812043 -61.16956247472375
-EPSG:29738
- ll -73.36712818866371 40.00339642359033
- en 340563.6818637676 1851940.2941984124
- ll2 -73.36712812609353 40.00339647785197
-EPSG:29739
- ll 9.337192417733988 47.82364215813083
- en 151041.8312519138 1.103378298224924E7
- ll2 9.337192410972696 47.82364215604667
-EPSG:2975
- ll -22.004144310178074 55.5088924906041
- en 346078.5129806745 7565963.781152274
- ll2 -22.00414431017791 55.50889249060401
-EPSG:2976
- ll -66.16464086503343 -145.5175540573954
- en 566853.4636236874 2660813.7243119003
- ll2 -66.16464086851722 -145.51755405816522
-EPSG:2977
- ll -74.90079913727955 -152.17823462965137
- en 524219.0252777645 1687207.5562317958
- ll2 -74.90079913122808 -152.1782345703702
-EPSG:2978
- ll -77.65569687031808 -140.20631415358196
- en 519101.2077046635 1379856.6646707747
- ll2 -77.65569685781126 -140.20631410327022
-EPSG:2980
- ll 39.67820521318575 50.82087676502585
- en 999108.8421901012 1.4408435005993305E7
- ll2 39.6782051839366 50.8208768478806
-EPSG:2981
- ll -81.7797630766792 158.45474731559767
- en 396036.20981378166 913851.6271023583
- ll2 -81.77976295900797 158.45474849009892
-EPSG:29849
- ll 25.733410684138263 106.00046033239278
- en -2256.191440330702 2855733.830808356
- ll2 25.733410655324967 106.00046038792182
-EPSG:29850
- ll -88.78041839940805 112.22890178596705
- en 488375.19198294845 -9862015.544899821
- ll2 -88.78041768567145 112.22891630766156
-EPSG:2987
- ll -24.573000049846087 -63.661724320246
- en -175752.11169920524 -2734265.1380955256
- ll2 -24.572999811101763 -63.661724167328885
-EPSG:29871
- ll 7.68714768490271 115.10356630297484
- en 29845.494910920675 42294.66894135544
- ll2 7.687147692390543 115.10356628215824
-EPSG:29872
- ll 6.082521569404108 116.92615052648436
- en 2633365.5642638328 2211843.7591909175
- ll2 6.082521577997527 116.9261505019018
-EPSG:29873
- ll 1.452264828918345 116.62120661615215
- en 771575.461408658 161854.90105314116
- ll2 1.4522648343929265 116.62120658909805
-EPSG:2988
- ll -76.08443477843055 -172.88547957388184
- en 610231.3656281763 1551530.1434882693
- ll2 -76.08443470838061 -172.88547979308765
-EPSG:29901
- ll -11.387698632655813 -9.304963411289037
- en 57653.68919765786 -6940044.384055847
- ll2 -11.387698507979964 -9.304963420267045
-EPSG:29902
- ll -48.158444475973965 -6.1615150903058495
- en 336859.3230371446 -1.1017790929983234E7
- ll2 -48.15844373179025 -6.161515216331988
-EPSG:29903
- ll -2.9138865355995733 -6.454062114750403
- en 371973.25004479225 -6002714.762486141
- ll2 -2.913886305088782 -6.45406214345725
-EPSG:2991
- ll 38.66322275311242 -154.00268953063213
- en -2448101.2123446665 245743.76502605388
- ll2 38.66322275311253 -154.00268953063213
-EPSG:2992
- ll -10.686954446996728 -37.95854633814463
- en 3.896099042858094E7 -1471086.9493620675
- ll2 -10.686954446996708 -37.95854633814463
-EPSG:2993
- ll 31.085673943348468 -62.983762013752084
- en 5575724.886552818 695498.1901717423
- ll2 31.085673943346713 -62.983762013752084
-EPSG:2994
- ll 82.78196049041041 -147.77742259493021
- en -552585.8315340264 1.701504539704326E7
- ll2 82.78196049041104 -147.77742259493016
-EPSG:2995
- ll -51.33370469490578 162.10495725349315
- en 298576.5677603514 4309144.518234006
- ll2 -51.3337046563104 162.1049573484423
-EPSG:2996
- ll -85.6224198464309 163.95739643987392
- en 490776.3493416109 490443.36272945255
- ll2 -85.62241985550166 163.9573972910298
-EPSG:2997
- ll -23.595855957117024 159.65387519109774
- en -46358.83044729871 7379896.511183271
- ll2 -23.595855216284146 159.65387469041144
-EPSG:2998
- ll -84.62723761932301 167.47833683072804
- en 525559.0022865544 601070.4555365145
- ll2 -84.62723762338595 167.47833752955515
-EPSG:2999
- ll -64.97717272426837 47.42768524825537
- en 613522.5428246337 2792081.437920914
- ll2 -64.97717254519296 47.42768390595137
-EPSG:3000
- ll -17.172109937955014 157.8518450412796
- en 9210748.85215114 -1022486.2506403003
- ll2 -17.17210989956925 157.851844939668
-EPSG:3001
- ll 34.54363155281486 -66.14006941092778
- en -1.5646647954685416E7 4964616.340596008
- ll2 34.54363245774903 -66.14006957480271
-EPSG:3002
- ll -38.11409308191729 169.66793606064306
- en 1.0522023182998817E7 -3655609.876081694
- ll2 -38.11409290008265 169.66793586040927
-EPSG:3003
- ll 47.012758270470556 8.489836925456373
- en 1461222.0066900193 5206808.262829598
- ll2 47.012758270470556 8.489836925456368
-EPSG:3004
- ll 43.5562583080499 15.422257558203842
- en 2554107.0040041134 4822763.603636109
- ll2 43.5562583080499 15.422257558203846
-EPSG:3005
- ll -16.698791952528765 -168.49735626782984
- en -5469438.948697791 -3820717.155348904
- ll2 -16.69879195252875 -168.49735626782984
-EPSG:3006
- ll -87.9188788196609 13.929531710699337
- en 495660.077976552 -9765650.764818769
- ll2 -87.9188788196611 13.929531710699335
-EPSG:3007
- ll -84.37129872931234 8.973484237647867
- en 116860.3964508714 -9374165.337475799
- ll2 -84.37129872931193 8.973484237668066
-EPSG:3008
- ll 55.598519104150505 13.155201669979679
- en 128264.64205976512 6163916.824810401
- ll2 55.59851910415051 13.155201669979679
-EPSG:3009
- ll -75.81943685533031 18.749200544966946
- en 252502.8120373359 -8421657.844764275
- ll2 -75.81943685528401 18.749200544836942
-EPSG:3010
- ll 30.2095469372089 19.68666590051305
- en 456900.18554261123 3347639.6321968697
- ll2 30.209546937173204 19.68666590057955
-EPSG:3011
- ll 37.47866411922007 15.371664948044092
- en -82499.16795675442 4152880.221639666
- ll2 37.478664119200836 15.371664948020431
-EPSG:3012
- ll 39.97509818164298 13.84773975457264
- en 115636.92158419741 4426841.570477081
- ll2 39.975098181643006 13.84773975457264
-EPSG:3013
- ll 22.419066505874966 10.969356995172552
- en -342603.9859036888 2488055.1936880713
- ll2 22.41906650566699 10.969356994854095
-EPSG:3014
- ll 7.988052401742323 17.112607481195667
- en 134852.942733782 883332.8820160135
- ll2 7.988052401742437 17.112607481195663
-EPSG:3015
- ll -52.93039457214453 14.521304341493892
- en -134288.7220585065 -5875251.624554615
- ll2 -52.93039457159721 14.52130434160885
-EPSG:3016
- ll 59.331823815251425 16.178405396443658
- en -81667.00453128194 6586718.294477476
- ll2 59.33182381486649 16.178405396613375
-EPSG:30161
- ll 70.26117974576567 134.87453294582738
- en 202628.13806135213 4153611.1267306665
- ll2 70.26117977140593 134.87453306481805
-EPSG:30162
- ll 63.42245092980244 135.0950666306069
- en 204606.0685769261 3388612.69218201
- ll2 63.422450939452744 135.09506673341087
-EPSG:30163
- ll 11.18894619929786 128.8482945483703
- en -362336.39519804524 -2746186.5964758312
- ll2 11.188946308221718 128.84829451106387
-EPSG:30164
- ll 75.49602286335715 136.87830368310094
- en 94669.96050148243 4731484.875868128
- ll2 75.49602289476167 136.878303826365
-EPSG:30165
- ll 20.492497542376043 129.58532091972305
- en -495429.6005115013 -1711622.9818582411
- ll2 20.492497571234676 129.5853209069711
-EPSG:30166
- ll 43.78921228149139 136.2027572690558
- en 16581.677953759903 864458.0333173706
- ll2 43.78921224985801 136.20275731676765
-EPSG:30167
- ll 88.59929374498574 131.1127738378619
- en -16224.14789357463 5859997.658218641
- ll2 88.59929375691544 131.11277408486768
-EPSG:30168
- ll 81.47942246740945 141.01460938386566
- en 41877.84596774537 5064919.788398993
- ll2 81.47942249426232 141.0146095617588
-EPSG:30169
- ll 5.945621837186337 139.104852492487
- en -80358.70819724837 -3328011.7636422
- ll2 5.945622047195181 139.10485239951285
-EPSG:3017
- ll 16.06233827945833 27.650999341372355
- en 782367.2160752496 1785574.6002140096
- ll2 16.06233827888885 27.65099934037372
-EPSG:30170
- ll 60.582019400874 146.63915358295034
- en 318250.09334843175 2302938.194042501
- ll2 60.58201939194293 146.63915367634047
-EPSG:30171
- ll -0.481538638546823 134.48913017431545
- en -641973.3379095395 -4927036.086203015
- ll2 -0.4815383643388987 134.48913007934817
-EPSG:30172
- ll -74.37489595401041 148.47650666468402
- en 187213.4720215477 -1.3138642448942427E7
- ll2 -74.37489505017005 148.47650437953794
-EPSG:30173
- ll 52.35666544531827 142.02100358955354
- en -151514.64662169426 931198.0975772208
- ll2 52.35666542501783 142.02100366197632
-EPSG:30174
- ll -71.96462036206627 143.31914228702476
- en 45895.66212995534 -1.0863867137952648E7
- ll2 -71.9646194037368 143.31914055853315
-EPSG:30175
- ll -58.57854685740037 125.81026233698573
- en -98077.72030919227 -9372612.426028896
- ll2 -58.5785458316162 125.81026185183127
-EPSG:30176
- ll -84.71931426762433 130.6146722909126
- en 67988.4603770026 -1.229090405937622E7
- ll2 -84.71931330015113 130.6146679114374
-EPSG:30177
- ll 7.212110277422084 133.53567024170815
- en 280326.68827007076 -2078759.2664441755
- ll2 7.2121104476285005 133.53567017657028
-EPSG:30178
- ll -10.41260504069406 130.02350284228288
- en -655164.2373119321 -3370124.339921356
- ll2 -10.412604636585773 130.0235027272963
-EPSG:30179
- ll 63.38561611383267 156.0113072433535
- en 100942.53897410864 4155193.303201029
- ll2 63.38561610819261 156.01130733683172
-EPSG:3018
- ll -71.31321758135397 29.238253393379907
- en 363912.26818037766 -7926097.486110576
- ll2 -71.31321757984351 29.238253385033538
-EPSG:3019
- ll -72.8983432087006 12.004874233318484
- en 1522986.0079130644 -8092105.128645516
- ll2 -72.89834233586531 12.004873918689633
-EPSG:3020
- ll 61.23132416800166 19.827172249909147
- en 1836517.7899808497 6806806.533811401
- ll2 61.231324136021726 19.827172289465945
-EPSG:30200
- ll -8.754987123151324 -60.43687033374704
- en 919909.392055368 -1.0230196164961787E7
- ll2 -8.754986979674348 -60.43687030930148
-EPSG:3021
- ll -34.083258198246895 13.078118860110678
- en 1248271.0698432648 -3776481.003854635
- ll2 -34.08325749001519 13.078118781822532
-EPSG:3022
- ll 82.3859118506582 21.561549432339817
- en 1551925.4715436257 9152514.122435031
- ll2 82.38591183205847 21.561549565736534
-EPSG:3023
- ll -2.95406564948091 26.89525517096542
- en 2234192.8144764486 -329346.7002048378
- ll2 -2.9540653072844734 26.895255077763718
-EPSG:3024
- ll -53.50847283876997 25.711100521798645
- en 1709364.0918677696 -5935774.244788867
- ll2 -53.50847199211475 25.711100173241153
-EPSG:3025
- ll -52.015642860427 7.341096030701452
- en 1227722.8121037597 -5771925.857466895
- ll2 -52.01564286005394 7.3410960307365
-EPSG:3026
- ll 79.15392518819587 7.905862793993078
- en 1381407.9644990077 8795462.228975166
- ll2 79.15392518794891 7.90586279945375
-EPSG:3027
- ll 41.717146949392344 22.203364051384067
- en 2032240.3388361041 4639565.08160674
- ll2 41.71714694446025 22.203364049890205
-EPSG:3028
- ll 28.62754455182305 14.544663240974677
- en 1156340.4813770219 3172730.5118173175
- ll2 28.627544551769706 14.544663240866868
-EPSG:3029
- ll 61.04515639657288 21.510379185561217
- en 1564939.7588595243 6770410.894823271
- ll2 61.045156396572615 21.51037918556126
-EPSG:3030
- ll -14.055118311285199 24.785691858473484
- en 1740604.7431295684 -1555430.194316615
- ll2 -14.055118311284167 24.785691858464062
-EPSG:3031
- ll 52.821004087871444 29.32423655200924
- en 1.79128422004142E7 3.188869470642666E7
- ll2 52.8210040878647 29.324236552009236
-EPSG:3032
- ll 47.37150966599074 17.648725290374372
- en -1.8973639891557153E7 2.5266147376259826E7
- ll2 47.37150966597341 17.64872529037438
-EPSG:3033
- ll -21.115560047871952 60.44387065438228
- en 4687825.842398375 9646000.338732801
- ll2 -21.115560047871938 60.44387065438228
-EPSG:30339
- ll 10.884177989415335 55.72116313541122
- en 1016510.1060526962 1207211.0003540048
- ll2 10.884177989315349 55.72116313463113
-EPSG:3034
- ll 80.13869126371827 -15.073736005130257
- en 3441632.5375465504 6119525.405340556
- ll2 80.13869126371907 -15.07373600513025
-EPSG:30340
- ll 58.5733205859963 54.592023672703434
- en 359966.0183765148 6495121.874521989
- ll2 58.57332058597928 54.59202367270282
-EPSG:3035
- ll 21.207762999204945 18.81283693491241
- en 5267449.039108827 -116230.43867638241
- ll2 21.207762980024032 18.812836934912408
-EPSG:3036
- ll -10.201027981757633 30.66542935074854
- en 244233.5827082712 8871437.79992425
- ll2 -10.201027981756571 30.665429350767276
-EPSG:3037
- ll -72.7045647106618 45.266617967779816
- en 707605.7781958344 1921623.7421817128
- ll2 -72.7045647090392 45.26661795492831
-EPSG:3040
- ll -62.80991037402457 -9.384768847408997
- en 786006.4006196391 -6976890.6624971265
- ll2 -62.809910371801536 -9.384768851298068
-EPSG:3041
- ll 19.891787972201683 -14.223744883189738
- en -47390.24430360296 2208013.3766364544
- ll2 19.891787971892406 -14.223744883371483
-EPSG:3042
- ll -45.24500996583971 -0.8271788739805697
- en 670519.8244320684 -5012465.08478187
- ll2 -45.245009965830725 -0.8271788739746396
-EPSG:3043
- ll -62.94991952282493 2.127678735300261
- en 455740.02573592187 -6980309.492720187
- ll2 -62.949919522825574 2.127678735300254
-EPSG:3044
- ll 48.14668129467364 5.2968094005165245
- en 224563.49883780302 5339237.889249087
- ll2 48.14668129443556 5.296809400479334
-EPSG:3045
- ll 22.721413497163553 9.740589609295608
- en -40628.465224619256 2522283.4465276003
- ll2 22.721413496777934 9.740589608688023
-EPSG:3046
- ll 6.287311129194293 15.404285077446692
- en -119911.68592965242 698287.8730430715
- ll2 6.287311128993174 15.404285080610281
-EPSG:3047
- ll 87.92668335961562 30.29220599922833
- en 513290.7942052025 9766863.30717851
- ll2 87.92668335961577 30.292205999184652
-EPSG:3048
- ll 80.09125382989876 39.92919051464398
- en 632808.9968690724 8899692.371922126
- ll2 80.09125382935483 39.929190479854995
-EPSG:3049
- ll 55.293340319069756 42.5884354233299
- en 727816.8659160745 6133302.775400396
- ll2 55.29334031886946 42.58843542330547
-EPSG:30491
- ll 77.4526728060066 -9.756502013939738
- en 45099.6051620582 5542529.465659591
- ll2 77.452672805446 -9.756502023378564
-EPSG:30492
- ll 52.47383808811435 0.24740232112945648
- en 322997.8839147813 2474960.3712758403
- ll2 52.47383809358868 0.24740233677630186
-EPSG:30493
- ll 64.21290557860011 77.55728897468047
- en 4318136.535000201 5132156.864468692
- ll2 64.2129055786001 77.55728897468047
-EPSG:30494
- ll -13.401751248758112 -39.310366386155316
- en -5562653.198962304 -4221736.546531927
- ll2 -13.401751248758085 -39.310366386155316
-EPSG:3054
- ll -2.271539488693648 -27.062504913523604
- en 493041.27990070207 -250998.4543041998
- ll2 -2.271539469733924 -27.06250491556775
-EPSG:3055
- ll -26.23211323205758 -21.09080857514499
- en 490912.0349491792 -2901392.603114773
- ll2 -26.23211322112011 -21.090808580483014
-EPSG:3056
- ll -3.032208000913556 -10.944757817346758
- en 950982.2066211042 -335924.4305103717
- ll2 -3.0322079815744765 -10.944757825841583
-EPSG:3057
- ll 7.560561636970354 -85.24297694040469
- en -8433850.412555324 -1667967.7429826446
- ll2 7.560561636970459 -85.24297694040469
-EPSG:3058
- ll -11.31622757087554 -2.3612545194384857
- en 721331.1621543177 -9059201.384770848
- ll2 -11.316226830182975 -2.361255126026715
-EPSG:3059
- ll 85.0891837640614 67.87407522882981
- en 879979.0230567539 3602267.4429345187
- ll2 85.12767775909937 65.33691481499898
-EPSG:3060
- ll 58.782541349267404 158.33125012470768
- en 114492.59744377166 1.653505305838596E7
- ll2 58.78254125215194 158.33124981018446
-EPSG:3061
- ll 53.479961514113654 -14.55812477483333
- en 529694.3302154032 5925443.979670535
- ll2 53.479961395932364 -14.558124610398817
-EPSG:3062
- ll -52.71966989268113 -22.795009645237464
- en 783923.0079426942 -5849432.856206875
- ll2 -52.71966989193504 -22.795009645584546
-EPSG:3063
- ll 8.356939255229832 -24.03124507741012
- en 826908.5141966098 925039.8185251763
- ll2 8.356939259792751 -24.03124508994701
-EPSG:3064
- ll -49.49948244351259 12.895050795389805
- en 782000.3018740243 -5490277.226251391
- ll2 -49.49948244318336 12.895050795403751
-EPSG:3065
- ll 56.711690312611495 16.34266743386959
- en 582190.9025523853 6286098.451779486
- ll2 56.71169031261137 16.34266743386975
-EPSG:3066
- ll 80.04830754293357 32.20267975165459
- en 407553.85269212676 5892760.225025484
- ll2 80.04830754070265 32.20267975924831
-EPSG:3067
- ll 18.70179749734099 20.58435277872855
- en -177572.6229568672 2080032.3529377806
- ll2 18.701797496240843 20.584352778869572
-EPSG:3068
- ll -26.124215174251646 14.607545422527147
- en 138174.12183160556 -8690599.07961237
- ll2 -26.124214894549134 14.607545387249779
-EPSG:3070
- ll -24.84727828877311 -95.36106771874596
- en -22165.725709577557 -7238716.442910368
- ll2 -24.847278288266057 -95.36106771969395
-EPSG:3071
- ll 31.568385765294977 -89.85710123395585
- en 533560.4038971928 -987395.0099102007
- ll2 31.568385765293016 -89.85710123395585
-EPSG:3072
- ll 33.55982749183292 -72.97901659163301
- en 225812.37301528122 -1128748.550236549
- ll2 33.55982749106149 -72.97901659254617
-EPSG:30729
- ll 74.99786974921028 -8.8545306431301
- en 504302.0660206271 8323151.039834823
- ll2 74.99786972819419 -8.854530573944748
-EPSG:30730
- ll -35.93384101024004 -5.281111820921719
- en 294320.66908869 -3979159.835181218
- ll2 -35.93384069151027 -5.281111894490726
-EPSG:30731
- ll 71.15151474859641 8.892668927487636
- en 712258.4337120561 7904381.760697993
- ll2 71.15151472819441 8.892668933411983
-EPSG:30732
- ll 16.869141908689798 14.27392123370466
- en 1062467.2527028578 1872287.9712668136
- ll2 16.869141915474582 14.273921227581255
-EPSG:3074
- ll 78.6031006836015 -73.25061773615784
- en 236565.81667218872 3986445.458412546
- ll2 78.60310068359615 -73.25061773614557
-EPSG:3075
- ll -45.19608649721352 -73.79857244691212
- en 234555.8317821034 -9878944.659664476
- ll2 -45.19608649358631 -73.79857244549852
-EPSG:3077
- ll -33.901204346453625 -75.85852500342422
- en -207464.351588429 -8510306.980621101
- ll2 -33.90120434523839 -75.85852500468546
-EPSG:3078
- ll 43.65688126761501 -89.63320030081178
- en 206808.75188269885 351506.9281908525
- ll2 43.65688126761491 -89.63320030081178
-EPSG:3079
- ll 41.165314837675076 -88.05342592137374
- en 327588.7920433446 70260.60224668588
- ll2 41.16531483767495 -88.05342592137374
-EPSG:30791
- ll 88.04205923805831 -34.39156663257966
- en 56198.49041905254 7975103.300844152
- ll2 88.04205921108137 -34.391565462051375
-EPSG:30792
- ll -23.586677484028666 54.20753853746642
- en 8622670.786990372 -5082753.92945645
- ll2 -23.586677261959817 54.20753858419174
-EPSG:3081
- ll 44.27436917484001 -152.96576479576476
- en -3173686.8537997226 3483601.948515609
- ll2 44.27436917484005 -152.96576479576476
-EPSG:3082
- ll 60.810430237168205 -118.24917857683914
- en 341391.5678411545 1.0024772207198016E7
- ll2 60.81043023716816 -118.24917857683914
-EPSG:3083
- ll -73.70102334031489 -158.89443862477685
- en -7885764.772304779 2037682.4494467112
- ll2 -73.70102334031482 -158.89443862477685
-EPSG:3084
- ll 3.8035290000500765 -93.45719977294003
- en 2307924.5855550957 3355489.744233915
- ll2 3.8035290000501036 -93.45719977294003
-EPSG:3085
- ll 25.779807424721056 -173.215470708752
- en -5335318.077015965 9199263.104033973
- ll2 25.779807424720666 -173.21547070875206
-EPSG:3086
- ll -42.94279278574654 62.320168215820445
- en 1.76692284900043E7 5564969.817719328
- ll2 -42.942792785746676 62.32016821582047
-EPSG:3087
- ll -7.021480984118355 -124.61194283388926
- en -4708541.684753963 -2399248.2690483923
- ll2 -7.02148098411841 -124.61194283388926
-EPSG:3088
- ll 61.247542428137876 -133.2960217811027
- en -1195854.2614751584 4555508.305226946
- ll2 61.247542428137855 -133.2960217811027
-EPSG:3089
- ll -10.290468146706171 -91.01556298338582
- en 2297107.6453036536 -1.5681225502256846E7
- ll2 -10.290468146706152 -91.01556298338582
-EPSG:3090
- ll -5.439784058706458 -12.467304564994123
- en 1.1018202960394537E7 -139755.96603706805
- ll2 -5.439784058706436 -12.467304564994123
-EPSG:3091
- ll 23.900216771912056 -136.49113947518265
- en -1.1667523627875192E7 3335057.456620655
- ll2 23.900216771911857 -136.49113947518268
-EPSG:3092
- ll -34.27266155987882 125.95888468907457
- en 772539.3004207769 -3796760.7894080314
- ll2 -34.27266079433054 125.9588844780615
-EPSG:3093
- ll 71.3321721201263 130.2215142645238
- en 543841.5886518396 7914238.662619085
- ll2 71.3321721531523 130.2215143766483
-EPSG:3094
- ll -10.809273237788517 130.39856038550278
- en -3218.5478658656357 -1199306.0996662239
- ll2 -10.809272826594722 130.3985602639046
-EPSG:3095
- ll -39.13417362103801 134.82903059233738
- en -33185.54259001673 -4350141.950973258
- ll2 -39.13417277945331 134.82903023168524
-EPSG:3096
- ll 69.43729445002427 144.0362009023006
- en 384206.28437888774 7705204.593682662
- ll2 69.43729446528953 144.0362010341238
-EPSG:3097
- ll 7.22757420483137 121.71430255233508
- en 358051.69371893693 799106.9235668671
- ll2 7.2275742048314084 121.71430255233616
-EPSG:3098
- ll 27.19733575054265 128.25167799636915
- en 425883.8934446183 3008513.5240851953
- ll2 27.19733575054205 128.25167799636912
-EPSG:3099
- ll -19.30783673107655 134.835249122277
- en 482692.10503349284 -2134897.7032603095
- ll2 -19.307836731076517 134.835249122277
-EPSG:3100
- ll -67.97474664703476 142.3422822966606
- en 556171.3028503951 -7540658.763155063
- ll2 -67.97474664703537 142.34228229666067
-EPSG:3101
- ll 85.87800346733403 152.5290064118812
- en 544303.5512410185 9539888.701428587
- ll2 85.87800346732739 152.52900640720367
-EPSG:3102
- ll -64.49938882632765 -110.22775163410739
- en 1.59571190354404E7 -2.3209531072067503E7
- ll2 -64.49938859560073 -110.22775189505379
-EPSG:31028
- ll 55.15443963098468 -18.81103864826709
- en 257040.79472700096 6118515.287232298
- ll2 55.154439601671804 -18.811038605980645
-EPSG:3106
- ll 67.57956045235304 84.64836900756885
- en 272747.8442850463 7505464.400876702
- ll2 67.57956033664814 84.64836887466936
-EPSG:3107
- ll 9.029745406504688 132.79677969190544
- en 691916.1579892754 6920860.856600335
- ll2 9.029745406504697 132.79677969190544
-EPSG:3108
- ll -60.76623859461375 2.1074609902810018
- en 293451.10955163446 -1.2183141692842538E7
- ll2 -60.76623859393169 2.1074609897822087
-EPSG:3109
- ll -44.35304500361738 4.456789944638485
- en 565583.1202935035 -1.0318883775337426E7
- ll2 -44.35304499700834 4.456789940215237
-EPSG:3110
- ll -69.30475928754409 126.99903338815778
- en 1628672.375836858 579527.7710193242
- ll2 -69.30475927691553 126.99903343636488
-EPSG:3111
- ll 14.955807196975272 179.12211722932364
- en 7778422.211337905 8117957.53046978
- ll2 14.955807196975297 179.12211722932494
-EPSG:3112
- ll 1.24526833361179 165.79717151146338
- en 3888480.8569732746 -342417.581953495
- ll2 1.2452683336118169 165.7971715114634
-EPSG:31121
- ll 33.16992466685885 -52.63643159295719
- en 907147.6934263981 3678920.121742887
- ll2 33.169924602204475 -52.636431635726325
-EPSG:3113
- ll 56.641157484252886 151.6549309159475
- en -32524.10907308456 9479111.47621763
- ll2 56.64115748425272 151.65493091594735
-EPSG:3114
- ll 12.07345104398047 -74.61716983659227
- en 1595312.08414784 1832924.034134707
- ll2 12.073451043698217 -74.61716983816355
-EPSG:3115
- ll 39.98871434836835 -75.4714240822847
- en 1137175.4355615454 4921279.186830986
- ll2 39.98871434836721 -75.47142408228308
-EPSG:31154
- ll 84.37136186139142 -50.81954725361518
- en 534951.793201139 9370603.81259527
- ll2 84.37136192523312 -50.819547662779335
-EPSG:3116
- ll -75.41908349739923 -68.2404375294115
- en 1163847.478301775 -7890033.482488772
- ll2 -75.41908349671102 -68.24043753642513
-EPSG:3117
- ll -46.94843079933292 -69.69357725112644
- en 1105356.7777763219 -4710676.391038325
- ll2 -46.94843079933239 -69.69357725112593
-EPSG:31170
- ll -28.653812408223793 -60.264095762772484
- en 52234.35171830864 -3177917.471012648
- ll2 -28.65381231091206 -60.264095709998394
-EPSG:31171
- ll -35.77513300866915 -55.21807786864805
- en 542216.5648624497 -3960010.069564397
- ll2 -35.775132896322056 -55.218077810117975
-EPSG:3118
- ll 21.944754598795228 -74.13699073008307
- en 373194.9360070593 2931869.2386376765
- ll2 21.944754597901053 -74.13699073120253
-EPSG:3119
- ll 8.670917696443453 4.115779219950761
- en 296817.60833855707 1963910.1018389561
- ll2 8.670917698117591 4.115779230661031
-EPSG:3120
- ll -18.928279829006385 72.11015400385794
- en 1.2950328260028062E7 -2011061.5895452024
- ll2 -18.92827982775508 72.11015400485962
-EPSG:3121
- ll -6.398943453781953 110.10968674943177
- en -264272.75530920795 -712616.0851662455
- ll2 -6.398943469696288 110.10968674395167
-EPSG:3122
- ll -21.879254260076962 114.15899107355348
- en -983.9407104300335 -2428164.267969106
- ll2 -21.879254289513813 114.15899106049515
-EPSG:3123
- ll 33.15647639089494 120.6334732708791
- en 465721.5520680108 3670052.2923979103
- ll2 33.15647639449966 120.63347327576783
-EPSG:3124
- ll -18.240804313601473 125.86073246911585
- en 802396.3052094936 -2019889.4706764189
- ll2 -18.240804346472185 125.86073245737224
-EPSG:3125
- ll -33.509494686781615 119.7081946624223
- en 7790.032377600728 -3721630.199358912
- ll2 -33.50949471508858 119.70819465646727
-EPSG:31251
- ll -73.92310970711992 5.076316734931641
- en -162023.64196317346 -1.3213727185700418E7
- ll2 -73.92310872413069 5.076315467963395
-EPSG:31252
- ll 34.676247116373446 14.053874943225534
- en 66391.02164132394 -1161574.261356086
- ll2 34.67624710740685 14.053874979315594
-EPSG:31253
- ll -16.85549403584983 18.14407969690902
- en 193370.351101226 -6865615.083894563
- ll2 -16.855493771061155 18.144079509859797
-EPSG:31254
- ll 56.13596756753327 11.31642054182134
- en 61180.41775978222 1223670.488044884
- ll2 56.13596758954314 11.31642053773278
-EPSG:31255
- ll 44.053903815805086 18.056767437750143
- en 378564.1326777757 -109820.94490052108
- ll2 44.05390381365364 18.05676744855673
-EPSG:31256
- ll -33.193940667115164 11.919184386315253
- en -411896.043502868 -8683230.972079564
- ll2 -33.193940250411075 11.919184354014558
-EPSG:31257
- ll 62.811585821916395 6.137673912235608
- en -63777.461359552864 1973896.8559796317
- ll2 62.81158584619246 6.137673896004308
-EPSG:31258
- ll 21.831741673299916 6.913961522002122
- en -214714.06859941245 -2571409.7054713783
- ll2 21.831741645233496 6.913961510030779
-EPSG:31259
- ll -47.18227353453366 20.30650810623029
- en 1050949.1331704278 -1.023531787997566E7
- ll2 -47.18227292716412 20.306507944580446
-EPSG:3126
- ll -45.77209442368293 21.256318046879862
- en 675496.882623466 -5073231.209978801
- ll2 -45.77209442367148 21.25631804688675
-EPSG:3127
- ll 62.087093707741644 25.88235792952269
- en 807041.268209172 6900582.578948255
- ll2 62.08709370469586 25.882357923718384
-EPSG:3128
- ll -73.35206820348907 26.917790658535548
- en 689030.8339581246 -8152374.424145251
- ll2 -73.35206820243157 26.9177906508063
-EPSG:31281
- ll 32.85453937988973 3.4941659940848604
- en -640503.5350010914 3656945.236488403
- ll2 32.8545393611913 3.494166032715389
-EPSG:31282
- ll -86.83039284979195 19.005960627865118
- en 35324.249052907326 -9649242.79645194
- ll2 -86.8303919134679 19.0059488773673
-EPSG:31283
- ll 25.756459918931142 17.06301193135262
- en 73591.79104446327 2849552.8854676913
- ll2 25.75645991415578 17.063011940466417
-EPSG:31284
- ll -75.16251689470587 8.592691664944152
- en 100053.18813448379 -8345541.12131636
- ll2 -75.16251598525852 8.592691670988517
-EPSG:31285
- ll 6.391083015838873 9.985207361907927
- en 79289.11200044549 707464.0891973332
- ll2 6.391083032534151 9.985207352991416
-EPSG:31286
- ll 63.5936350460143 22.250970355356444
- en 1043592.1495269402 7067648.637442731
- ll2 63.59363506448499 22.250970363789836
-EPSG:31287
- ll 13.578760663970304 -60.56695005435984
- en -7593396.5374710215 549296.4271241336
- ll2 13.578760905539498 -60.5669497482521
-EPSG:31288
- ll -73.8162863435927 17.038393020688083
- en 358569.6993886103 -8206362.322940623
- ll2 -73.81628543053141 17.038391068324152
-EPSG:31289
- ll -36.376871215600254 14.244813433270394
- en 532138.956212354 -4028034.8647241485
- ll2 -36.37687072078944 14.244813109227838
-EPSG:3129
- ll -41.3571147841232 25.507165164539092
- en 793501.14085173 -4586172.898768676
- ll2 -41.357114783987214 25.50716516462778
-EPSG:31290
- ll -6.678843191789937 16.55019122072263
- en 774363.6588282257 -739007.0271357192
- ll2 -6.678843038071686 16.550191108817355
-EPSG:3130
- ll -10.953713020340615 21.266424810743718
- en 310485.2944040687 -1211890.9123722597
- ll2 -10.953713020340425 21.266424810747544
-EPSG:31300
- ll 28.148498396817672 58.56195311703411
- en 5356914.066517657 -418309.24614980444
- ll2 28.148498433146262 58.56195308730801
-EPSG:3131
- ll -68.64878936261216 23.67283870135444
- en 486701.6599469735 -7618284.048357138
- ll2 -68.64878936261304 23.67283870135444
-EPSG:3132
- ll 25.181846774433097 24.859594350503173
- en 485846.9608037936 2786205.4864098877
- ll2 25.18184677443278 24.859594350503173
-EPSG:3133
- ll 24.363286227554852 27.713051913379314
- en 673830.4713082439 2696598.748473239
- ll2 24.363286227554134 27.713051913380237
-EPSG:3134
- ll 26.192005080970347 20.963261249698416
- en -104085.1717519036 2912187.411530302
- ll2 26.19200507980501 20.963261247644507
-EPSG:3135
- ll 3.1265477542520728 23.066696975267906
- en -49040.12562733004 347010.8135860994
- ll2 3.1265477542070066 23.066696976946368
-EPSG:3136
- ll -55.325875196693936 35.93226246136955
- en 939641.1778884513 -6155425.830831665
- ll2 -55.32587518664941 35.93226244129021
-EPSG:3137
- ll -70.63267538155009 25.36796886928921
- en 328637.44559451914 -7846104.986954875
- ll2 -70.63267538118902 25.367968870103006
-EPSG:31370
- ll 50.02822479331805 3.363551921709463
- en 77978.49312411762 80145.89987977222
- ll2 50.028224796884125 3.3635519195004377
-EPSG:3138
- ll -14.108359990461977 31.42964274869903
- en 546394.5754364523 -1560376.9729498522
- ll2 -14.108359990461976 31.42964274869903
-EPSG:3140
- ll -10.81417830231355 177.38292642002222
- en 210507.7491230425 4655190.807444718
- ll2 -10.81417831314052 177.3829264666167
-EPSG:3141
- ll 65.01444901576963 176.2980253593641
- en 467314.27382601134 1.721035940611987E7
- ll2 65.01444902501639 176.29802522480946
-EPSG:3142
- ll -5.335435452812732 -170.83796184948923
- en 1184404.0749537665 9407024.059295576
- ll2 -5.335435468170281 -170.83796188106805
-EPSG:31466
- ll 13.505393376398203 5.786148622670604
- en 2476850.876807613 1493489.914206862
- ll2 13.505393376398201 5.786148622670604
-EPSG:31467
- ll 66.7149245263202 8.313568285488806
- en 3469711.971256705 7401942.473810372
- ll2 66.7149245263202 8.313568285488802
-EPSG:31468
- ll 66.2017157677127 10.214924080588673
- en 4419608.582668763 7345698.707054576
- ll2 66.20171576771084 10.214924080588714
-EPSG:31469
- ll 0.3634045105682233 14.93608123331359
- en 5492885.561470025 40179.369319307785
- ll2 0.36340451056822326 14.936081233313592
-EPSG:3148
- ll 68.27344720095465 107.53178036614206
- en 604982.8562633408 7575176.276345087
- ll2 68.27344712076675 107.53178016198223
-EPSG:3149
- ll -56.948805155312805 112.20657162328565
- en 573888.6654376552 -6312331.4790026415
- ll2 -56.948804632748704 112.20657083571186
-EPSG:3152
- ll 25.249804724696673 21.42436746195299
- en 439467.2043414924 -3702649.3710923423
- ll2 25.24980472466604 21.424367462014377
-EPSG:31528
- ll 6.462063972036518 -16.018485178560496
- en 387133.1036115656 714406.6237653471
- ll2 6.4620639735384255 -16.018485183300474
-EPSG:31529
- ll -74.30335936422814 -14.284713682037578
- en 340355.6050819237 -8252866.264375443
- ll2 -74.3033593329353 -14.28471339196999
-EPSG:3153
- ll 46.155828404150895 -97.48857949379804
- en 3156400.6459100572 567744.7990779185
- ll2 46.155828404151 -97.48857949379807
-EPSG:3154
- ll -55.780196332415265 -144.306844189032
- en 292632.65159866074 -6186566.923426016
- ll2 -55.7801963322936 -144.30684418902365
-EPSG:3155
- ll 85.1045831570552 -138.98153907772138
- en 462095.5376165906 9452721.235568356
- ll2 85.10458315705264 -138.98153907748093
-EPSG:3156
- ll -73.99747688628298 -122.26021439742425
- en 706988.0527780585 -8223474.572506384
- ll2 -73.99747688427965 -122.26021442270682
-EPSG:3157
- ll -76.94323164573592 -118.63974130210048
- en 609866.3481331927 -8544512.822383538
- ll2 -76.94323164564398 -118.63974130261343
-EPSG:3158
- ll 34.09457741356678 -92.59357429665012
- en 1091423.3331090594 3791223.6139961327
- ll2 34.094577410465284 -92.59357429450142
-EPSG:3159
- ll -74.46056020018207 -95.37327130019904
- en 429047.5534862173 -8264836.936522675
- ll2 -74.46056020017917 -95.37327130019696
-EPSG:3160
- ll -23.08255712311437 -83.37036859379754
- en 871917.0374793378 -2557281.622936074
- ll2 -23.08255712307445 -83.37036859373187
-EPSG:31600
- ll 40.72875442095631 3.369866474306207
- en -1353709.164505471 173351.00594504725
- ll2 40.72875446765128 3.369866491121835
-EPSG:3161
- ll 44.57569489998839 -104.08519645031191
- en -569772.5961765822 1.2185334682222564E7
- ll2 44.5756948999884 -104.08519645031191
-EPSG:3162
- ll 84.88028611817346 -129.27276050477514
- en 316402.7615668861 1.708972951828216E7
- ll2 84.88028611817393 -129.2727605047752
-EPSG:3163
- ll -74.34093753137742 150.77356377846195
- en -477638.2334711378 -6914855.612217165
- ll2 -74.34093753137834 150.77356377846195
-EPSG:3164
- ll -30.804189086191023 169.13583466860342
- en 895805.7492252316 6584764.575735142
- ll2 -30.804189086912242 169.13583466943385
-EPSG:3165
- ll -36.301366377302145 87.01620428519612
- en -7026882.180733096 -3461023.8346112864
- ll2 -36.30136633904038 87.01620428187485
-EPSG:3166
- ll -71.79727835887657 116.15071660028299
- en -2961490.6146535915 -7011779.602287694
- ll2 -71.7972784017559 116.1507167506178
-EPSG:3167
- ll 5.551134759288333 102.88604915089869
- en -10988.047032303937 30513.496596618974
- ll2 5.551134759287882 102.88604915089869
-EPSG:3168
- ll 1.6695601703603804 99.01342355696481
- en 111955.40552955528 185816.2762148335
- ll2 1.6695601703389453 99.01342355696481
-EPSG:3169
- ll -47.96373355258082 159.38836129490548
- en 528990.281985018 4687657.654353352
- ll2 -47.963733552580976 159.3883612949055
-EPSG:3170
- ll 38.96354143289204 158.21982128153707
- en -87696.59453495231 1.4334653854931355E7
- ll2 38.96354142688298 158.21982128264165
-EPSG:3171
- ll 2.410509017013922 173.86131071036013
- en 818245.1206167459 1.0266769682125889E7
- ll2 2.410509017012892 173.8613107102803
-EPSG:3172
- ll 80.2327630528421 168.34095057540293
- en 449877.850786602 1.8908783007390607E7
- ll2 80.2327630562371 168.3409505507591
-EPSG:3174
- ll -48.329099489014155 58.20549006880364
- en 1.5030277821424384E7 1.0166592524914388E7
- ll2 -48.32909948901417 58.20549006880363
-EPSG:3175
- ll 70.00122702682012 -138.49023239060642
- en -1323548.234281913 4432297.723467356
- ll2 70.00122702682008 -138.49023239060642
-EPSG:3176
- ll -87.87031595675302 103.21758164554015
- en 488894.8556949207 -9760089.344755707
- ll2 -87.87031486447854 103.21756734005116
-EPSG:3177
- ll 87.4926983106514 20.40571096544614
- en 1016617.4281718311 9688466.75584126
- ll2 87.49269826431821 20.405711107916186
-EPSG:3178
- ll -4.452202227384305 -74.73813575823097
- en 529051.6919000801 -492117.2052148674
- ll2 -4.452202227384309 -74.73813575823097
-EPSG:3179
- ll 16.844065587048448 -70.6256673373742
- en 326796.7768473982 1863017.0705355152
- ll2 16.844065587048256 -70.62566733737302
-EPSG:3180
- ll 6.826191797555879 -62.529281926250334
- en 552010.8669299311 754560.4362854054
- ll2 6.826191797555918 -62.52928192625033
-EPSG:3181
- ll 51.90845928948201 -57.73450282090739
- en 449473.52371787245 5751111.767725935
- ll2 51.908459289482245 -57.734502820907394
-EPSG:3182
- ll 42.751789040603626 -56.58886315620595
- en 42574.332058126165 4748421.42660863
- ll2 42.75178903826217 -56.58886315612036
-EPSG:3183
- ll 20.226810268691864 -47.0421425237198
- en 286654.23826183553 2237895.354199771
- ll2 20.226810268690887 -47.04214252371923
-EPSG:31838
- ll -33.501806871238834 49.80452528042632
- en 946467.9275779414 -3717265.3319492624
- ll2 -33.50180687071581 49.804525281085134
-EPSG:31839
- ll 68.743970737122 53.94065429575295
- en 618938.498457034 7628652.464687995
- ll2 68.74397073709088 53.940654295740906
-EPSG:3184
- ll 68.96442200892255 -39.78984581663952
- en 468360.42136283225 7650598.595429885
- ll2 68.96442200892348 -39.789845816639534
-EPSG:3185
- ll -47.84408050060688 -37.286927738860356
- en 179281.59422221006 -5307873.136917105
- ll2 -47.844080500038665 -37.28692773887554
-EPSG:3186
- ll 88.62495883261172 -25.38730650459483
- en 504320.17264364485 9844503.640402462
- ll2 88.62495883261185 -25.387306504594896
-EPSG:3187
- ll 42.476048363445926 -22.68872095514109
- en 361189.5794726396 4704015.117940578
- ll2 42.47604836344417 -22.688720955143005
-EPSG:3188
- ll 2.186102286260521 -16.05351786951605
- en 382847.96105024905 241672.25194205804
- ll2 2.186102286260519 -16.05351786951559
-EPSG:3189
- ll -21.18034897430981 -14.341109629455179
- en -55023.70314895536 -2351473.2200730336
- ll2 -21.18034897392556 -14.341109629885338
-EPSG:3190
- ll -31.232612503958578 5.774733862115049
- en -107262.50832403364 -3461094.1063259
- ll2 -31.232612501900867 5.774733868008237
-EPSG:31901
- ll -64.88924003628586 44.0908911885995
- en 314891.53808357497 -7204706.495335384
- ll2 -64.88924003610057 44.09089118913887
-EPSG:3191
- ll -2.186710809324495 11.964925286472425
- en 307405.5414671533 -241815.93937410205
- ll2 -2.186710809175024 11.964925288689477
-EPSG:3192
- ll 80.18307181354137 17.492854274280475
- en 285528.0157555655 8908511.236748673
- ll2 80.18307178030996 17.49285431517539
-EPSG:3193
- ll 33.489113100660305 8.262162632386506
- en -426662.57590320497 3727215.678868462
- ll2 33.48911309476618 8.262162634647266
-EPSG:3194
- ll -62.423217521939804 10.026580435575655
- en -159748.94300139172 -6943229.747202986
- ll2 -62.42321750017157 10.026580479905924
-EPSG:3195
- ll -14.073614178048885 13.160367940677519
- en -431583.07498131425 -1564261.3538466918
- ll2 -14.073614177021872 13.160367944511588
-EPSG:3196
- ll 17.22572511390004 27.38009017557792
- en 879733.2151280713 1916440.995172703
- ll2 17.225725112506645 27.38009017464513
-EPSG:31965
- ll -3.6430976643817843 -120.59332831798962
- en 100693.65563037462 -403473.6117954869
- ll2 -3.6430976643752344 -120.59332831772053
-EPSG:31966
- ll 84.18429104735671 -115.11580959915386
- en 453477.35756342346 9350330.686713127
- ll2 84.18429104735102 -115.11580959883102
-EPSG:31967
- ll -17.089203477032385 -106.15255198259827
- en 377369.9336974255 -1889785.6955728256
- ll2 -17.08920347703236 -106.15255198259807
-EPSG:31968
- ll 52.56120496634301 -103.32036149875343
- en 207200.4363498679 5832232.432951387
- ll2 52.56120496572025 -103.32036149861501
-EPSG:31969
- ll -27.346953913927038 -87.86502479542624
- en 1008290.498530545 -3035346.1025664643
- ll2 -27.34695391344961 -87.86502479451663
-EPSG:3197
- ll -16.092782019095736 27.398219625811617
- en 670934.6284034178 -1784840.9069959125
- ll2 -16.09278201850778 27.39821962566941
-EPSG:31970
- ll -16.706123579078806 -81.93825246623052
- en 1040212.140742757 -1853917.80618649
- ll2 -16.706123578864524 -81.93825246653293
-EPSG:31971
- ll -83.5534586282889 -82.46214770010673
- en 481673.88926281495 -9278476.091733051
- ll2 -83.55345862828946 -82.4621477001067
-EPSG:31972
- ll 64.932612023405 -77.02498188768747
- en 404280.89255042933 7202476.7373615615
- ll2 64.93261202340142 -77.02498188768732
-EPSG:31973
- ll -79.25331426679847 -64.13386379577759
- en 601182.6051300003 -8802470.284089033
- ll2 -79.25331426669679 -64.1338637971903
-EPSG:31974
- ll 72.1806814183881 -57.15280955690728
- en 699433.2332211727 8018784.33818237
- ll2 72.18068141721754 -57.15280956372657
-EPSG:31975
- ll -37.31083789732607 -53.22145354377278
- en 834891.603422258 -4136054.5079632755
- ll2 -37.31083789715825 -53.22145354360625
-EPSG:31976
- ll -27.941632466524744 -54.861766188963315
- en 119934.49822737271 -3096744.2315171165
- ll2 -27.94163246643492 -54.86176618914391
-EPSG:31977
- ll -8.066562782996598 -79.43321491101622
- en 672651.1332795063 9108012.205780622
- ll2 -8.066562782996645 -79.43321491101902
-EPSG:31978
- ll 19.17126587052401 -75.41566705083869
- en 456295.7384290029 1.2119829879558489E7
- ll2 19.17126587052398 -75.41566705083868
-EPSG:31979
- ll -40.54078364891983 -75.98041222544542
- en -91346.07814501657 5488741.191441102
- ll2 -40.54078364114174 -75.98041222157462
-EPSG:3198
- ll 40.846151053443776 20.48254052865222
- en -180988.63681663934 4533113.215298879
- ll2 40.846151049966885 20.48254053023252
-EPSG:31980
- ll 49.22706357131605 -58.317415686880295
- en 840880.6965176224 1.546325765798731E7
- ll2 49.22706357032987 -58.31741568704848
-EPSG:31981
- ll -26.85763927519624 -50.08576314693582
- en 1187853.076313516 7010522.099300868
- ll2 -26.8576392724027 -50.08576314288523
-EPSG:31982
- ll 82.51516012754314 -47.55438521497579
- en 550080.5290336792 1.9163829173920974E7
- ll2 82.51516012753912 -47.55438521504014
-EPSG:31983
- ll 61.95356603740956 -48.33923916060033
- en 324888.9118548151 1.6873512779627282E7
- ll2 61.953566037305364 -48.33923916057039
-EPSG:31984
- ll 49.069838123298695 -44.09481257366884
- en 127943.28184818989 1.5447732324607339E7
- ll2 49.06983812167166 -44.09481257316501
-EPSG:31985
- ll 5.77623373392953 -35.68739179834789
- en 202361.1883337458 1.0639171960126467E7
- ll2 5.776233733927947 -35.68739179829616
-EPSG:31986
- ll 0.8503183233454195 -87.83342903706742
- en -262126.76056575135 94662.70102047829
- ll2 0.8503183232305923 -87.83342902380852
-EPSG:31987
- ll -11.855262838507613 -72.74084549789345
- en 746118.718081825 -1311546.183331577
- ll2 -11.855262838506627 -72.74084549790695
-EPSG:31988
- ll -72.14701018219561 -68.59569005486853
- en 513834.63803210366 -8005376.841962594
- ll2 -72.14701018219657 -68.59569005486853
-EPSG:31989
- ll 34.21959236858277 -61.131104758583376
- en 672154.3610384115 3788083.6685966016
- ll2 34.21959236858082 -61.13110475857953
-EPSG:3199
- ll -0.7317071525644394 5.591741153422433
- en 120625.7886218626 -81017.69989606961
- ll2 -0.7317071524208295 5.59174115776276
-EPSG:31990
- ll 33.56399901000731 -63.76924834633917
- en -128872.5689777931 3734411.2180580273
- ll2 33.56399900588751 -63.76924834887747
-EPSG:31991
- ll -56.94679503952013 -45.66060090015084
- en 824629.1669665205 -6324156.273977428
- ll2 -56.9467950374348 -45.66060090207293
-EPSG:31992
- ll -82.2447578149764 -74.67497111433146
- en 595101.4730314855 862642.4608023725
- ll2 -82.2447578148251 -74.67497112981795
-EPSG:31993
- ll -61.10496613374167 -78.25102104009957
- en 324796.45432332484 3221167.4332794016
- ll2 -61.10496613364914 -78.25102104007834
-EPSG:31994
- ll -28.848694077124136 -70.57182884371224
- en 346671.2028325435 6807762.651322877
- ll2 -28.84869407712275 -70.57182884371343
-EPSG:31995
- ll -26.5028028208269 -62.40616022600081
- en 559175.4688438531 7068495.135163025
- ll2 -26.502802820826407 -62.40616022600079
-EPSG:31996
- ll -76.13055782738272 -51.07150812431849
- en 658385.8561705995 1542283.2401226908
- ll2 -76.13055782672683 -51.07150813245884
-EPSG:31997
- ll -88.86466121087291 -56.021187927811326
- en 488906.1900005186 128308.34653080441
- ll2 -88.86466121087366 -56.021187925838724
-EPSG:31998
- ll -18.16782378081909 -48.45938354044795
- en 133948.1850714194 7987798.330531934
- ll2 -18.1678237807985 -48.45938354042602
-EPSG:31999
- ll 54.51211455651858 -38.08861834374024
- en 559004.2044128536 1.6040884329709213E7
- ll2 54.51211455651885 -38.0886183437402
-EPSG:3200
- ll 46.19453105276948 107.5892790182753
- en 6193760.352669774 4118336.6899141027
- ll2 46.19453105617467 107.58927892823057
-EPSG:32000
- ll 77.08164509640332 -27.066887020188773
- en 647830.8613537276 1.8563351878611967E7
- ll2 77.08164509586364 -27.066887028475552
-EPSG:3201
- ll -64.38502593475366 10.239731585196996
- en 270588.94891385303 -7148562.154679036
- ll2 -64.38502591877221 10.239731604980047
-EPSG:3202
- ll 18.219654341125903 17.114474346375978
- en 88951.77186350658 2018858.457394852
- ll2 18.219654340601032 17.114474347792314
-EPSG:3203
- ll 80.53156513256789 27.85135243097192
- en 515638.21552491153 8941096.200382829
- ll2 80.53156509837385 27.851352430752932
-EPSG:3204
- ll -7.922402053240958 -25.831159598177734
- en 5922970.6330772815 8312839.559698546
- ll2 -7.922402053240931 -25.83115959817774
-EPSG:3205
- ll -5.798489399783421 16.902247977483455
- en 9364481.758988097 4852291.333364088
- ll2 -5.798489399783383 16.902247977483455
-EPSG:3206
- ll -11.417683063960453 1.5224428049800167
- en 6009207.454665762 7573168.569204049
- ll2 -11.417683063960421 1.5224428049800238
-EPSG:3207
- ll -39.866714536721645 -102.8741947235276
- en 5293656.036337452 2470435.148148706
- ll2 -39.86671453672165 -102.8741947235276
-EPSG:3208
- ll -28.810398729344115 -75.21871070288198
- en -1058955.052389882 7151815.684028315
- ll2 -28.810398729344097 -75.21871070288198
-EPSG:3209
- ll -77.60764706731821 -62.84691001979331
- en -216734.45798975145 1526142.1367883103
- ll2 -77.6076470673182 -62.84691001979331
-EPSG:3210
- ll -9.961189478263833 50.275301699505846
- en 1308096.734849749 9855486.692969408
- ll2 -9.961189478263796 50.275301699505846
-EPSG:32100
- ll 21.036932353315038 -127.81895519105241
- en -1468341.468419031 -2422605.2057367084
- ll2 21.03693235331504 -127.81895519105241
-EPSG:32104
- ll -5.560835274798608 -146.99553271312493
- en -6229809.345905891 -3735346.2462567394
- ll2 -5.560835274798567 -146.99553271312493
-EPSG:32107
- ll 39.63157505163855 -112.89329146338964
- en 430935.7191934395 8545169.21962077
- ll2 39.63157505161325 -112.89329146336469
-EPSG:32108
- ll 52.61337154274344 -121.37733714530151
- en 181047.14153832308 7994966.71157071
- ll2 52.61337154169925 -121.37733714492434
-EPSG:32109
- ll -19.228382346633566 -116.33356123117093
- en 1036582.2536868235 -1974739.7462232476
- ll2 -19.22838234663201 -116.33356123117304
-EPSG:3211
- ll -14.317165108067428 35.79847192587867
- en -2651208.1361304894 8876643.337963374
- ll2 -14.317165108067398 35.79847192587867
-EPSG:32110
- ll 81.93583393913127 -76.17053980483178
- en 229507.18094055812 4396729.093532522
- ll2 81.93583393910309 -76.1705398041137
-EPSG:32111
- ll -19.805173229619 -68.3444378187826
- en 795849.7711444697 -6501937.686262384
- ll2 -19.80517322873591 -68.344437818378
-EPSG:32112
- ll 6.0020215739645835 -110.12396155104099
- en -477118.6444964777 -2763627.591724233
- ll2 6.002021573720927 -110.12396154707103
-EPSG:32113
- ll -10.66492255109219 -100.98060414462411
- en 1077225.8826219277 -4614837.771384403
- ll2 -10.664922550887885 -100.98060414615044
-EPSG:32114
- ll -78.71934109909299 -112.73364070411478
- en 723076.2596522912 -1.2176594241209216E7
- ll2 -78.71934109897035 -112.73364070261742
-EPSG:32115
- ll 48.83076174340718 -80.28386571954464
- en -274508.98455052235 1126849.1839777424
- ll2 48.83076173996357 -80.28386571748365
-EPSG:32116
- ll 81.50792893740706 -77.44602899885332
- en 235773.030960039 4623810.320700685
- ll2 81.50792893740704 -77.44602899885332
-EPSG:32117
- ll -5.94520471865367 -78.78960744198214
- en 327161.73497823294 -5086625.702684169
- ll2 -5.945204718653672 -78.78960744198214
-EPSG:32118
- ll 3.7927271465022336 -95.65146958954595
- en -2579573.7458560574 -3949384.486339746
- ll2 3.7927271465022647 -95.65146958954595
-EPSG:32119
- ll 46.25842718517245 -84.12069720009787
- en 207262.77702936227 1406946.8583505056
- ll2 46.25842718517249 -84.12069720009787
-EPSG:3212
- ll -86.37454844892187 87.88925153957983
- en 170964.27304115845 469755.1502771929
- ll2 -86.3745484489219 87.88925153957983
-EPSG:32120
- ll 48.91996818398913 -148.43982205056136
- en -2690954.954492369 1272419.9685415393
- ll2 48.91996818398915 -148.43982205056136
-EPSG:32121
- ll 1.065484075537757 -179.88963488848896
- en -9216395.099593129 -34179.90507074867
- ll2 1.0654840755377821 -179.88963488848896
-EPSG:32122
- ll -17.611598087539505 -78.32823944603719
- en 1318787.796439163 -7530056.408979857
- ll2 -17.61159808753948 -78.32823944603719
-EPSG:32123
- ll 4.624475670732025 -121.04148853612321
- en -4309240.302954257 -2861771.3952433346
- ll2 4.624475670732066 -121.04148853612321
-EPSG:32124
- ll 46.686104961660476 -103.82852769263849
- en 146433.02448007814 1318156.4628712097
- ll2 46.68610496166051 -103.82852769263849
-EPSG:32125
- ll 40.321860226252724 -157.70039012346427
- en -4207608.963402236 2241241.911587008
- ll2 40.32186022625279 -157.70039012346427
-EPSG:32126
- ll 30.903238946365768 -36.01557741300127
- en 9378669.663242806 2532632.4006193113
- ll2 30.903238946365793 -36.01557741300127
-EPSG:32127
- ll 76.24781140891142 -157.46126256182086
- en 285488.0950836763 4405454.108259813
- ll2 76.24781140891143 -157.46126256182086
-EPSG:32128
- ll 44.00224125084345 -62.747944633423444
- en 1798384.6579485857 530176.0126726001
- ll2 44.0022412508435 -62.747944633423444
-EPSG:32129
- ll 31.231414187930675 -2.9887658892849345
- en 6980286.255924221 1971301.8162139347
- ll2 31.231414187930664 -2.9887658892849345
-EPSG:3213
- ll -55.36878228915726 68.45541670993173
- en -612074.2096590243 3990512.1690154327
- ll2 -55.36878228915723 68.45541670993173
-EPSG:32130
- ll 8.337302741675899 -70.87215139815892
- en 169158.91173989547 -3627793.94910252
- ll2 8.3373027416759 -70.87215139815895
-EPSG:32133
- ll -4.465999327891808 -133.7167288545126
- en -6281869.194560229 -2531444.1183837196
- ll2 -4.465999327891774 -133.7167288545126
-EPSG:32134
- ll 72.97741974152098 -101.14200613896936
- en 556146.196640326 3403829.5635293894
- ll2 72.97741974152099 -101.14200613896936
-EPSG:32135
- ll -12.520334094547527 -65.32304140523765
- en 6305947.832385325 -5878636.683669497
- ll2 -12.520334094547492 -65.32304140523765
-EPSG:32136
- ll -3.777621752704931 -66.84940737624449
- en 3239472.6331494213 -4307629.852301752
- ll2 -3.7776217527048948 -66.84940737624449
-EPSG:32137
- ll -5.981591724371853 -18.05405233724045
- en 1.063366926409609E7 859065.5860679257
- ll2 -5.981591724371828 -18.054052337240435
-EPSG:32138
- ll 38.47418228828553 -81.24406228611869
- en 2105721.1245298814 2880013.0898607494
- ll2 38.474182288285625 -81.24406228611869
-EPSG:32139
- ll 41.627618702428194 -62.97774583330967
- en 3809652.8580779433 4861050.6915940065
- ll2 41.62761870242825 -62.97774583330967
-EPSG:3214
- ll -60.67836459217509 84.3231722800576
- en -311015.57008813886 3426423.005396572
- ll2 -60.67836459217509 84.3231722800576
-EPSG:32140
- ll 16.579304070701376 -72.93051742949234
- en 3425456.2219591844 3058795.3820781996
- ll2 16.579304070701387 -72.93051742949234
-EPSG:32141
- ll 17.5905453784168 -93.68928285557655
- en 817202.0578993398 4111130.927560578
- ll2 17.590545378416802 -93.68928285557655
-EPSG:32142
- ll 76.27486647202826 -101.08323820024943
- en 863903.2760978478 5363725.324754174
- ll2 76.27486647202828 -101.08323820024943
-EPSG:32143
- ll -5.820926468184311 -96.9635017895526
- en 2643370.1901840665 -3249703.0769089954
- ll2 -5.820926468184269 -96.9635017895526
-EPSG:32144
- ll -7.6222291342171875 -132.47428492982218
- en -2568267.651393602 -2088617.084876066
- ll2 -7.622229134217149 -132.47428492982218
-EPSG:32145
- ll -25.113835880636955 -78.66840405888772
- en -122878.52459766809 -7499840.04491754
- ll2 -25.113835879408978 -78.6684040609917
-EPSG:32146
- ll 64.59522772059341 -133.03344970505705
- en 708881.6496346164 5967806.863324409
- ll2 64.59522772059337 -133.03344970505705
-EPSG:32147
- ll 50.794437242994974 -102.93267733769635
- en 1745440.268161566 2849449.3669998515
- ll2 50.794437242994974 -102.93267733769635
-EPSG:32148
- ll 46.437707372137915 -171.09422462508212
- en -3095079.6741596037 1155053.1385620993
- ll2 46.43770737213793 -171.09422462508212
-EPSG:32149
- ll 59.97758428782221 -108.92204934102254
- en 1163975.4230760587 1693038.0361198664
- ll2 59.97758428782218 -108.92204934102254
-EPSG:3215
- ll -41.56852027514408 20.008161451230436
- en -5442664.098941023 1467517.4512065519
- ll2 -41.56852027514408 20.008161451230436
-EPSG:32150
- ll -5.4312593986284305 -11.584826365890677
- en 9666312.104456153 -1778284.6042634367
- ll2 -5.431259398628393 -11.584826365890677
-EPSG:32151
- ll 41.573748123994946 -84.26101253575156
- en 327621.20086014917 512767.74783412507
- ll2 41.57374812399499 -84.26101253575156
-EPSG:32152
- ll 65.53951814680195 -81.46232410505658
- en 1021598.4070328147 2337904.709765435
- ll2 65.53951814680195 -81.46232410505658
-EPSG:32153
- ll 59.833830755443444 -99.82380085114404
- en 29045.769916805788 1835468.7684896656
- ll2 59.833830755443415 -99.82380085114404
-EPSG:32154
- ll 87.1875970527804 -153.16440146685497
- en -49240.37737951102 6223748.857070498
- ll2 87.18759705278038 -153.164401466855
-EPSG:32155
- ll -45.862139854246315 -98.78552572037054
- en 695468.2668402808 -9585055.152419953
- ll2 -45.86213984850273 -98.78552572429821
-EPSG:32156
- ll -83.8748417374724 -112.42414176344731
- en 339412.7475415353 -1.3704712849358557E7
- ll2 -83.874841737449 -112.42414176125016
-EPSG:32157
- ll -55.739631245493186 -113.36114681268182
- en 310499.22095108643 -1.0673592573517883E7
- ll2 -55.73963124460077 -113.36114681225139
-EPSG:32158
- ll -3.232188511733895 -112.11509262752335
- en 574149.7339403685 -4742372.657874148
- ll2 -3.2321885117337312 -112.11509262751039
-EPSG:3216
- ll -21.023790009521974 110.05562441556062
- en -520787.7079802189 8269177.504092021
- ll2 -21.02379000952196 110.05562441556062
-EPSG:32161
- ll 76.38728082460614 -44.667738250762525
- en 1508682.0551711011 8653358.127421351
- ll2 76.38728082460614 -44.66773825076253
-EPSG:32164
- ll 14.529439971570767 -95.62629863560855
- en 2833537.8074643966 5278760.2984696925
- ll2 14.529439971556576 -95.62629863568
-EPSG:32165
- ll 69.89260289346575 -92.8610511091097
- en 1657907.2348310815 2.5439262220296755E7
- ll2 69.89260289346574 -92.8610511091097
-EPSG:32166
- ll 88.46694408739876 -88.4536829974798
- en 1626172.21438317 3.2240276052828718E7
- ll2 88.46694408739874 -88.45368299747976
-EPSG:32167
- ll -27.8025760671664 -75.19227105065114
- en 3519104.985161835 -1.0134165103215264E7
- ll2 -27.8025760661211 -75.19227104883055
-EPSG:3217
- ll -34.228410459897226 110.76023672580446
- en -1572675.266462436 6343736.645850708
- ll2 -34.228410459897226 110.76023672580446
-EPSG:3218
- ll -82.43128537798229 122.31923087777153
- en -242571.09310813033 949815.9217580375
- ll2 -82.43128537798228 122.31923087777153
-EPSG:32181
- ll 3.1926846919541134 -56.974267547499956
- en -137241.96439381543 353852.04432345834
- ll2 3.192684691943041 -56.974267547021185
-EPSG:32182
- ll 71.79753066546701 -55.418251796831214
- en 325088.50692084874 7968837.692278379
- ll2 71.79753066546701 -55.418251796831214
-EPSG:32183
- ll 82.64343284335513 -57.99872676752079
- en 311967.870373931 9179440.024856409
- ll2 82.64343284335514 -57.99872676752079
-EPSG:32184
- ll -85.91220384560549 -61.81091199702392
- en 302324.78821902093 -9544443.492119512
- ll2 -85.91220384560549 -61.81091199702392
-EPSG:32185
- ll 67.32382886171536 -70.53350257218493
- en 45487.755844242434 7482334.594812174
- ll2 67.32382885927738 -70.53350256386483
-EPSG:32186
- ll 14.530336459167657 -66.27931704141527
- en 436362.8148365857 1607213.945203255
- ll2 14.530336459167632 -66.27931704141571
-EPSG:32187
- ll 25.039244091964548 -74.68112030352133
- en -117350.19176650589 2776651.243005131
- ll2 25.03924409185282 -74.68112030374367
-EPSG:32188
- ll 49.222465340185266 -69.01865644380861
- en 631163.6221669385 5463497.066927837
- ll2 49.22246533942648 -69.01865644388893
-EPSG:32189
- ll -31.190781811861868 -75.00362466203617
- en 447418.22633768455 -3452745.932595292
- ll2 -31.190781811861463 -75.0036246620351
-EPSG:3219
- ll -62.98154636422087 83.27585858112656
- en -2783075.4214428323 1545156.9787424468
- ll2 -62.981546364220854 83.27585858112654
-EPSG:32190
- ll 38.360708716265705 -83.18963664674112
- en -17695.499942413473 4253561.171102764
- ll2 38.36070871610997 -83.18963664688086
-EPSG:32191
- ll 57.23345679217721 -83.61933026093267
- en 237210.91613043286 6345832.689181568
- ll2 57.23345679217702 -83.61933026093273
-EPSG:32192
- ll 8.515548834069392 -79.23222001184698
- en 499443.46755453065 942020.5408214867
- ll2 8.515548834069225 -79.23222001185205
-EPSG:32193
- ll 50.600115152206826 -82.18432996087196
- en 433331.24694271805 5608613.939051712
- ll2 50.60011515220338 -82.18432996087049
-EPSG:32194
- ll -23.253410051659998 -85.40032544740961
- en 468493.31441542704 -2573246.7370046778
- ll2 -23.253410051659724 -85.4003254474092
-EPSG:32195
- ll 41.68378031127838 -83.7844416539821
- en 822371.3824914135 4634761.188330939
- ll2 41.683780307100314 -83.78444165484173
-EPSG:32196
- ll 41.19460550445501 -95.44479739481046
- en 99724.85288223112 4564611.703548852
- ll2 41.194605504439494 -95.4447973948245
-EPSG:32197
- ll -48.84985245161553 -89.02126471991042
- en 816757.4732279382 -5435920.403033372
- ll2 -48.8498524412179 -89.02126473394057
-EPSG:32198
- ll 88.20073507211406 -52.72182813146253
- en 90156.57219531164 5363786.554063093
- ll2 88.20073507211413 -52.72182813146253
-EPSG:32199
- ll 51.154537631541274 -88.11104641035894
- en 1249043.7151030079 2939233.7506046146
- ll2 51.15453763154127 -88.11104641035894
-EPSG:3220
- ll -16.68260683687619 161.38423076630434
- en -87491.63291450973 8910203.87142859
- ll2 -16.682606836876154 161.38423076630434
-EPSG:32201
- ll 43.59895156294996 -179.979297620167
- en 259516.47309600984 4831640.013800347
- ll2 43.598951562673356 -179.97929762017117
-EPSG:32202
- ll -79.73537285677963 -168.89893836710218
- en 541784.9495524232 -8852801.677180205
- ll2 -79.73537285670245 -168.89893836713767
-EPSG:32203
- ll -23.66067606917406 -168.01870023801504
- en 192052.30863103282 -2619920.6267854464
- ll2 -23.660676068994388 -168.01870023807336
-EPSG:32204
- ll 3.693323919762193 -155.77985474443156
- en 857753.2041980277 408872.3897657502
- ll2 3.693323919733875 -155.7798547446134
-EPSG:32205
- ll 73.47679871596895 -147.99863614100326
- en 658593.506403564 8160306.266664056
- ll2 73.47679871546153 -147.99863614273298
-EPSG:32206
- ll -75.98046118930723 -150.56016686974004
- en 403776.567382504 -8435905.34023945
- ll2 -75.98046118917071 -150.56016686969315
-EPSG:32207
- ll 70.74970924169742 -136.00168673958154
- en 683733.6763477924 7857050.130883304
- ll2 70.74970924100032 -136.00168674123526
-EPSG:32208
- ll -22.34896190854512 -129.1491002494961
- en 1103180.0707636322 -2483194.782288637
- ll2 -22.348961907651812 -129.14910024850255
-EPSG:32209
- ll 13.999516656103623 -125.32753517009834
- en 896818.0515458426 1550747.4484011454
- ll2 13.999516655978924 -125.32753517025604
-EPSG:3221
- ll -70.01277771818991 -82.05313087516869
- en 747524.9832444831 2202690.1479545846
- ll2 -70.0127777181899 -82.05313087516869
-EPSG:32210
- ll -25.9709758928689 -116.50743915967236
- en 1150768.0689820796 -2888664.861831915
- ll2 -25.970975890903585 -116.50743915679023
-EPSG:32211
- ll -26.659187883109233 -114.61436333521996
- en 737426.5561406804 -2950909.6666605296
- ll2 -26.659187882923895 -114.61436333524519
-EPSG:32212
- ll -64.13266428634805 -110.48247420784105
- en 525185.4986422379 -7111899.566907158
- ll2 -64.13266428617504 -110.48247420787588
-EPSG:32213
- ll -11.859465975162195 -98.8701022175687
- en 1168798.422917975 -1318390.858314818
- ll2 -11.859465974461992 -98.87010222091999
-EPSG:32214
- ll 40.14292848605919 -95.56086243347161
- en 792967.7062572305 4449288.279420913
- ll2 40.14292848572874 -95.56086243341869
-EPSG:32215
- ll -74.8858057485845 -87.19303579377102
- en 668758.101876192 -8319128.331559272
- ll2 -74.88580574773765 -87.19303580045353
-EPSG:32216
- ll 41.689796698376455 -93.59243478047233
- en -48766.17301700497 4636378.211000316
- ll2 41.689796692251946 -93.59243477813895
-EPSG:32217
- ll 38.268486245905706 -75.81933742757646
- en 953316.399507249 4248312.19368458
- ll2 38.26848624451545 -75.8193374269557
-EPSG:32218
- ll -51.00187950977522 -75.17523121684864
- en 487693.80907740386 -5650049.631761791
- ll2 -51.001879509558165 -75.17523121688346
-EPSG:32219
- ll 82.7199913935087 -72.19844459288842
- en 454771.2983462157 9186450.44554277
- ll2 82.71999139345105 -72.1984445928903
-EPSG:3222
- ll -82.48932741618344 -146.44841894584846
- en -735082.4125448273 552939.9071719011
- ll2 -82.48932741618344 -146.44841894584846
-EPSG:32220
- ll 11.026566819049862 -57.60985773712858
- en 1089582.0213893827 1224227.8955815737
- ll2 11.026566818726476 -57.609857738837675
-EPSG:32221
- ll 21.649196574479404 -53.129856697185076
- en 900661.7990205305 2398991.0294401115
- ll2 21.6491965742771 -53.1298566971557
-EPSG:32222
- ll -50.08602308531417 -57.79952954240356
- en 13759.986525543965 -5570374.353605446
- ll2 -50.08602307601344 -57.79952953036757
-EPSG:32223
- ll 79.6782247065978 -40.9134082812578
- en 581675.0866229524 8848534.435664251
- ll2 79.6782247064879 -40.913408281586015
-EPSG:32224
- ll -22.546623327051634 -44.449877535062654
- en -60976.356220039306 -2503587.2787483362
- ll2 -22.546623326415364 -44.449877535817876
-EPSG:32225
- ll 79.1511307925619 -35.18342040752639
- en 454128.9953349009 8787696.62652228
- ll2 79.15113079248023 -35.183420407560185
-EPSG:32226
- ll 6.763070331203167 -30.455644559571887
- en 117887.48104397161 748910.8369983401
- ll2 6.763070331145697 -30.455644559415884
-EPSG:32227
- ll -10.6441164649831 -19.174031208500587
- en 699726.0960972036 -1177221.6751565065
- ll2 -10.64411646489877 -19.174031208540526
-EPSG:32228
- ll -81.61217286737275 -10.698539072360358
- en 569985.5976687467 -9064135.327917216
- ll2 -81.61217286728548 -10.698539072868131
-EPSG:32229
- ll 0.9401932958317047 -14.66829214909956
- en -131709.33403780102 104429.17580557418
- ll2 0.9401932957928995 -14.668292145093806
-EPSG:3223
- ll -62.96915824164287 -8.746784828906783
- en 2823382.8399159447 1311610.9014353033
- ll2 -62.96915824164287 -8.746784828906783
-EPSG:32230
- ll 24.369127348711032 -9.038856813356904
- en -113223.28000641929 2708457.89831568
- ll2 24.36912734752435 -9.038856815125596
-EPSG:32231
- ll 21.485884755479134 -0.1514803119812047
- en 173404.8311212125 2379210.7479274916
- ll2 21.485884755315833 -0.15148031203019469
-EPSG:32232
- ll -46.87386047484026 3.088860521264796
- en 49586.69613233168 -5208135.640997915
- ll2 -46.87386047085648 3.0888605231752346
-EPSG:32233
- ll 25.498687297118792 11.980385216415588
- en 196428.40689353453 2823609.5811506445
- ll2 25.49868729693245 11.980385216347768
-EPSG:32234
- ll -46.54162322697278 22.030978071023814
- en 579036.4192495503 -5154746.029516118
- ll2 -46.54162322675056 22.03097807098911
-EPSG:32235
- ll -21.61115657396654 21.68518876123118
- en -50677.32503253175 -2399217.646332288
- ll2 -21.611156573428946 21.685188760711384
-EPSG:32236
- ll 81.57843324670668 31.574855281153916
- en 476698.0022553324 9058054.392907988
- ll2 81.57843324664334 31.574855281119113
-EPSG:32237
- ll -48.809051883546665 36.63058083579058
- en 326028.54615470034 -5408938.518050037
- ll2 -48.80905188330984 36.63058083574921
-EPSG:32238
- ll -46.591487504495035 50.75773218868018
- en 941006.6518989261 -5175894.505920289
- ll2 -46.59148750107761 50.7577321872965
-EPSG:32239
- ll 47.300836298705235 45.012198229779926
- en 47390.02798746573 5256003.471544079
- ll2 47.30083629438374 45.01219823215944
-EPSG:3224
- ll -30.331675554864304 -94.16100056662798
- en -3133723.118792998 6294880.052452828
- ll2 -30.331675554864308 -94.16100056662798
-EPSG:32240
- ll -26.255658291371645 62.22139143946331
- en 1021835.2036542278 -2914537.6100921794
- ll2 -26.25565829071043 62.22139144035912
-EPSG:32241
- ll 57.57525499250278 63.45622180981733
- en 527276.1595779022 6381510.848897884
- ll2 57.57525499230342 63.456221809782505
-EPSG:32242
- ll -73.26647105217235 73.02540166595762
- en 629271.292690244 -8134555.347925407
- ll2 -73.26647105194105 73.02540166568389
-EPSG:32243
- ll 39.196984313702615 70.13102046403749
- en 79442.10454992764 4349940.41842009
- ll2 39.196984312626945 70.13102046353562
-EPSG:32244
- ll -26.80304302944603 79.76822701671074
- en 377556.3623796244 -2965217.4729272216
- ll2 -26.803043029264227 79.76822701667567
-EPSG:32245
- ll 86.1001191770863 90.6205960003185
- en 527473.7513308973 9563415.895929297
- ll2 86.10011917705584 90.6205960001813
-EPSG:32246
- ll 74.67568111633224 90.7547151254272
- en 433774.10383466206 8288669.928436512
- ll2 74.67568111621793 90.75471512539364
-EPSG:32247
- ll 74.95017837020376 97.30355929310286
- en 450831.85019087006 8318747.419354014
- ll2 74.95017837009348 97.30355929306815
-EPSG:32248
- ll 82.74416578296618 102.07221321113306
- en 458731.81263115554 9188942.673367325
- ll2 82.74416578290982 102.07221321111311
-EPSG:32249
- ll 8.446814209828034 112.99341100129931
- en 719452.1180573945 934250.5414843948
- ll2 8.446814209766542 112.99341100125504
-EPSG:3225
- ll -46.86126750664506 -46.737184802524126
- en -2254041.3165521254 4422551.6677723685
- ll2 -46.861267506644936 -46.73718480252413
-EPSG:32250
- ll 88.99955432517388 117.49899833859467
- en 500972.4431462317 9886267.203207241
- ll2 88.99955432516627 117.49899833855987
-EPSG:32251
- ll -88.8772510602813 120.19078522600473
- en 493856.41204602714 -9872758.734098028
- ll2 -88.87725106027277 120.19078522598038
-EPSG:32252
- ll 21.39181879971683 130.92169289822857
- en 699205.0304053928 2366726.073009991
- ll2 21.391818799568007 130.92169289819395
-EPSG:32253
- ll 70.98348736183064 139.4774245257066
- en 662693.8328924351 7881564.766879279
- ll2 70.98348736141205 139.47742452506924
-EPSG:32254
- ll 78.89608522233115 142.21022750307998
- en 526014.4904626242 8758642.392996097
- ll2 78.89608522224847 142.21022750304513
-EPSG:32255
- ll 64.75197974508049 140.47066124050025
- en 189667.40440323064 7196826.921215177
- ll2 64.75197974014557 140.4706612565306
-EPSG:32256
- ll 26.102048653943783 152.30467322173604
- en 430457.1083360272 2887165.926351465
- ll2 26.10204865377044 152.30467322170122
-EPSG:32257
- ll -86.15628176141111 159.05442633953638
- en 500406.19211168913 -9568820.622500159
- ll2 -86.15628176138195 159.0544263395016
-EPSG:32258
- ll -70.41915359281391 166.44908428364351
- en 554190.70724859 -7813261.92571718
- ll2 -70.41915359267495 166.4490842836087
-EPSG:32259
- ll 79.63948628538947 172.07287902710354
- en 521535.894857489 8841542.282230772
- ll2 79.63948628531213 172.0728790270686
-EPSG:3226
- ll -43.98228676300146 29.67435954198085
- en 2931808.760425737 4425120.377216554
- ll2 -43.98228676300146 29.674359541980856
-EPSG:32260
- ll 23.641240205624 178.51589176719563
- en 654604.0111402199 2615323.013646415
- ll2 23.64124020546314 178.5158917671615
-EPSG:3227
- ll -75.79701693534972 -9.978257798117951
- en -435157.1349178361 1622214.9932850015
- ll2 -75.7970169353497 -9.978257798117951
-EPSG:3228
- ll -88.75160289047723 -13.33358361792176
- en -83635.63742552123 148147.44305025067
- ll2 -88.7516028904773 -13.333583617921768
-EPSG:3229
- ll -25.056377536966565 0.3511464561816098
- en -3622096.0127753895 6851547.726659793
- ll2 -25.05637753696655 0.3511464561816098
-EPSG:3230
- ll -39.64121010862085 -22.157424037504427
- en -5071275.053913284 2893340.5347957006
- ll2 -39.64121010862084 -22.15742403750444
-EPSG:32301
- ll 68.06726659448884 -178.25400174289368
- en 447725.50744703447 1.75508907298139E7
- ll2 68.06726659433649 -178.25400174292804
-EPSG:32302
- ll 73.51259900315185 -164.50772363897823
- en 705288.1017281027 1.8168825534594666E7
- ll2 73.51259900127621 -164.5077236569105
-EPSG:32303
- ll -83.30183166293627 -162.6046723855551
- en 531181.2395421838 749201.3815799598
- ll2 -83.30183166288536 -162.60467238559235
-EPSG:32304
- ll 13.25345679402892 -159.4333640427883
- en 453036.49223086453 1.1465200724267486E7
- ll2 13.253456793933013 -159.4333640428231
-EPSG:32305
- ll 31.638433294641587 -155.85648020033958
- en 229071.30469972495 1.3503899613806318E7
- ll2 31.63843329442338 -155.8564802004119
-EPSG:32306
- ll 3.9709346668572607 -152.58886208129536
- en -121417.70877734036 1.0441013952234525E7
- ll2 3.970934666698931 -152.58886207784877
-EPSG:32307
- ll 77.69445201480772 -134.46813638279812
- en 655094.0068401346 1.8632914551332213E7
- ll2 77.69445201391646 -134.46813640273658
-EPSG:32308
- ll -29.327368228141545 -134.17871098525117
- en 579726.5776067937 6755461.157322707
- ll2 -29.32736822794858 -134.17871098528596
-EPSG:32309
- ll -2.422113116338437 -122.82060456213306
- en 1188324.2929850654 9730704.420642445
- ll2 -2.4221131161545446 -122.82060456896005
-EPSG:3231
- ll -53.972324856226734 105.30646498250502
- en 3082359.950904956 2754333.84947658
- ll2 -53.97232485622672 105.30646498250502
-EPSG:32310
- ll 4.691099049678428 -123.11900604898511
- en 486784.598374944 1.0518515491240285E7
- ll2 4.691099049645717 -123.11900604901994
-EPSG:32311
- ll 20.4511241209634 -118.2392917529607
- en 370713.19625269156 1.2261887723291334E7
- ll2 20.451124120820758 -118.23929175299546
-EPSG:32312
- ll -18.89724991831514 -116.13639104285772
- en -41528.668770610704 7902661.366817012
- ll2 -18.89724991791303 -116.13639104290941
-EPSG:32313
- ll 87.22018371094026 -109.6568021797216
- en 474811.5222916964 1.968862275702389E7
- ll2 87.22018371091839 -109.65680217876009
-EPSG:32314
- ll 16.436358132184466 -98.91792794096027
- en 508745.28075030836 1.1817200751642637E7
- ll2 16.436358132066964 -98.9179279409951
-EPSG:32315
- ll 64.7332237617758 -94.52216559524385
- en 427502.7417528272 1.7179590375014022E7
- ll2 64.73322376160532 -94.52216559527872
-EPSG:32316
- ll 80.00579767497035 -89.76442543170542
- en 446456.875151768 1.888350189520204E7
- ll2 80.00579767489273 -89.76442543173157
-EPSG:32317
- ll 27.234343604857926 -76.46594368259724
- en 949170.0344956463 1.3020530439586764E7
- ll2 27.23434360445762 -76.46594368219044
-EPSG:32318
- ll -21.7943568189945 -81.878541219085
- en -212291.16192361817 7574003.48279584
- ll2 -21.794356816856126 -81.87854122104828
-EPSG:32319
- ll -88.57407069025342 -68.39340727531443
- en 501684.8611478894 161232.64503267594
- ll2 -88.57407069024259 -68.39340727534925
-EPSG:3232
- ll -69.95987085791694 81.97997810103234
- en 604253.4770695266 2252332.4440146415
- ll2 -69.95987085791694 81.97997810103234
-EPSG:32320
- ll 49.33695888944678 -60.07197918879769
- en 712689.3923577516 1.5469034279050952E7
- ll2 49.336958889169466 -60.07197918881713
-EPSG:32321
- ll 26.35669384871416 -54.017591730874614
- en 797631.9600342205 1.2918622360824432E7
- ll2 26.35669384852348 -54.01759173087527
-EPSG:32322
- ll 49.058353609085174 -47.922539345654116
- en 724803.800048522 1.543850035634256E7
- ll2 49.058353608787186 -47.92253934566957
-EPSG:32323
- ll -74.88029230082152 -46.14564196769993
- en 466641.47896116535 1689428.665016505
- ll2 -74.88029230071126 -46.14564196773476
-EPSG:32324
- ll -26.796171348117255 -36.053224171429505
- en 792951.9023110047 7032739.2572125215
- ll2 -26.796171347919984 -36.053224171430905
-EPSG:32325
- ll 25.167110639941384 -27.871185046063417
- en 1017273.3746071933 1.2793309746059867E7
- ll2 25.167110639377043 -27.871185045337725
-EPSG:32326
- ll 47.15981546007393 -31.420055960964312
- en 164979.14517884137 1.523240430593295E7
- ll2 47.159815459182106 -31.42005596101875
-EPSG:32327
- ll 69.64998033603456 -27.87490923426662
- en 233659.6661214488 1.774184117007882E7
- ll2 69.64998033178912 -27.874909205999533
-EPSG:32328
- ll -78.54447313788626 -8.40695229833483
- en 645876.5728449471 1272632.0244740266
- ll2 -78.54447313712389 -8.40695232021708
-EPSG:32329
- ll 20.58703674458738 -4.872489315728222
- en 930402.1292678462 1.2281897658638442E7
- ll2 20.58703674437107 -4.872489315704278
-EPSG:3233
- ll -61.52113659885394 101.21291342750861
- en 1217342.3168694563 3041266.501323209
- ll2 -61.52113659885395 101.21291342750861
-EPSG:32330
- ll -59.01413032469304 3.82717151160511
- en 891629.6189611666 3438335.4103853917
- ll2 -59.014130316129275 3.8271714912232624
-EPSG:32331
- ll -82.35934231079433 9.029108771252485
- en 589334.3303289 850397.527275579
- ll2 -82.35934231062161 9.029108761174605
-EPSG:32332
- ll 84.0398283143573 6.213799972355684
- en 467710.46567866625 1.933331793783991E7
- ll2 84.03982831431153 6.213799972330431
-EPSG:32333
- ll -64.65014887566284 19.89365186969498
- en 733594.3397782022 2821512.6062920066
- ll2 -64.65014887461813 19.893651868484078
-EPSG:32334
- ll 12.285365829873982 16.64177527354348
- en 25636.85896268417 1.1361948775507439E7
- ll2 12.285365829720297 16.641775273920977
-EPSG:32335
- ll 79.0698131394364 25.873910341432087
- en 476161.57681999373 1.877799231412277E7
- ll2 79.069813139355 25.873910341397277
-EPSG:32336
- ll -58.09650543135277 30.104918818711702
- en 329357.81395679177 3556883.7684919117
- ll2 -58.09650543110224 30.104918818679334
-EPSG:32337
- ll 32.81853954631178 37.03180209685964
- en 315734.2195112823 1.363288146426937E7
- ll2 32.818539546109335 37.03180209681985
-EPSG:32338
- ll -85.28963779797715 41.5027063894463
- en 467954.04901963 526959.1315172259
- ll2 -85.28963779794023 41.50270638948621
-EPSG:32339
- ll -35.49195658713791 49.14853099667999
- en 332044.3518363245 6070820.171873392
- ll2 -35.49195658692436 49.148530996641476
-EPSG:3234
- ll -15.412059135976278 51.94557519740863
- en -5357157.8270126805 7438082.899534352
- ll2 -15.412059135976264 51.945575197408616
-EPSG:32340
- ll -1.9715985225406172 62.60373769345641
- en 1124171.8878708226 9781021.16237669
- ll2 -1.9715985224540726 62.603737689704175
-EPSG:32341
- ll -13.665452384675802 66.13428391183169
- en 839092.1264329643 8487075.90780726
- ll2 -13.665452384562006 66.13428391173974
-EPSG:32342
- ll -46.766325090157835 75.29962652706669
- en 980944.5469489265 4801500.791557461
- ll2 -46.76632508447572 75.29962652313246
-EPSG:32343
- ll -20.634572904902498 76.13397646169574
- en 618127.0214771485 7717878.888407775
- ll2 -20.634572904753 76.13397646166088
-EPSG:32344
- ll 15.381577718624655 81.35120656036676
- en 537673.2238800755 1.170055663640893E7
- ll2 15.381577718514167 81.35120656033195
-EPSG:32345
- ll 52.50162311259089 89.91137092920599
- en 697593.1548603924 1.5820812154433254E7
- ll2 52.50162311231945 89.91137092917876
-EPSG:32346
- ll -77.5287521756494 89.23057109752263
- en 409186.7956755018 1391304.598605642
- ll2 -77.52875217552267 89.23057109762678
-EPSG:32347
- ll -46.48673154425596 98.5018777755229
- en 461757.0886497536 4851748.872507465
- ll2 -46.48673154403381 98.50187777548808
-EPSG:32348
- ll -42.1213736218917 106.45743857241766
- en 620460.4672737954 5335718.179982642
- ll2 -42.121373621669164 106.45743857238374
-EPSG:32349
- ll 83.01664436744667 107.59623505219535
- en 453822.382147494 1.9219675700027384E7
- ll2 83.01664436739044 107.59623505221835
-EPSG:3235
- ll -63.38870596504672 119.1076021349361
- en 849112.6529816387 2946191.575902882
- ll2 -63.38870596504672 119.1076021349361
-EPSG:32350
- ll -70.97548274872968 116.37192459571246
- en 477144.39429693396 2125220.0853932863
- ll2 -70.97548274859443 116.37192459567765
-EPSG:32351
- ll 31.34610243126849 117.98923646231165
- en 23083.141956681502 1.347882091751339E7
- ll2 31.346102430494224 117.989236461405
-EPSG:32352
- ll -59.94667419858112 123.00692734034153
- en 165479.07683731825 3339362.955315264
- ll2 -59.94667419463071 123.00692734671094
-EPSG:32353
- ll -47.10919207037001 138.5072824836477
- en 766075.4805875616 4776730.333274356
- ll2 -47.10919206998006 138.50728248365579
-EPSG:32354
- ll -6.603448702463069 142.07839594722347
- en 619197.4952852093 9269954.91354158
- ll2 -6.603448702408804 142.07839594718817
-EPSG:32355
- ll -15.75471722416843 141.48347660774192
- en -91737.4097250182 8250440.076795719
- ll2 -15.754717223688859 141.48347660844303
-EPSG:32356
- ll -74.8399258010032 149.1718665803837
- en 388318.72448771447 1690651.7225590292
- ll2 -74.83992580082895 149.17186658050406
-EPSG:32357
- ll 34.04389292299746 158.42508045814216
- en 446920.20575765736 1.3767166987182187E7
- ll2 34.04389292279361 158.42508045810732
-EPSG:32358
- ll -76.29590529639019 162.58717871561635
- en 436204.31626852043 1530492.2984233461
- ll2 -76.29590529628642 162.58717871558403
-EPSG:32359
- ll -40.180062970086865 173.85770526347042
- en 743294.7320786326 5548339.025260695
- ll2 -40.1800629698294 173.8577052634691
-EPSG:3236
- ll -66.25528342773516 169.4873625530054
- en 2167661.720468925 1684697.9771425705
- ll2 -66.25528342773516 169.4873625530054
-EPSG:32360
- ll -49.738942504733316 171.61279022346625
- en 111911.41962773312 4476450.808217287
- ll2 -49.73894250222561 171.61279022451393
-EPSG:3237
- ll -37.26612972559998 116.21838317231797
- en -980112.8396601487 6056391.380157349
- ll2 -37.26612972559999 116.21838317231797
-EPSG:3238
- ll -22.941426966431735 155.729568650335
- en 2307634.6915582092 7710393.192026674
- ll2 -22.941426966431717 155.729568650335
-EPSG:3239
- ll -82.36893662162976 132.3444506129293
- en -266632.4454915592 894840.3520841172
- ll2 -82.36893662162976 132.3444506129293
-EPSG:3240
- ll -43.89265489623478 150.62394389866407
- en -986742.1125966427 5226702.5761633655
- ll2 -43.892654896234774 150.62394389866407
-EPSG:32401
- ll -49.151164761217515 -174.8572889634675
- en 656226.6692849844 -5446469.806081669
- ll2 -49.15116476075747 -174.85728896337773
-EPSG:32402
- ll 5.704922015228831 -164.51057985023843
- en 1220052.6177254426 634650.5743742908
- ll2 5.704922014643251 -164.51057985843525
-EPSG:32403
- ll -68.82156452954803 -163.03931889198427
- en 579030.618068673 -7635725.267445277
- ll2 -68.82156452924093 -163.03931889189855
-EPSG:32404
- ll 58.094004540883674 -159.45828046037605
- en 472969.23019648995 6439264.889659203
- ll2 58.094004540487504 -159.45828046029007
-EPSG:32405
- ll -13.737243144815324 -159.6530923277851
- en -220753.4310982821 -1528638.822637488
- ll2 -13.737243143438109 -159.6530923235765
-EPSG:32406
- ll -28.853114686953525 -144.68817582972775
- en 725499.8807192326 -3193908.72397753
- ll2 -28.853114686557973 -144.68817582963192
-EPSG:32407
- ll -21.558590536826472 -134.13407871205638
- en 1212107.1567449686 -2399701.104642031
- ll2 -21.55859053457182 -134.13407871020794
-EPSG:32408
- ll -50.32003779068363 -138.2856146517311
- en 266104.0545937418 -5579378.744878968
- ll2 -50.32003779011594 -138.28561465166237
-EPSG:32409
- ll 27.444723212630166 -134.31087265456048
- en -25288.33489293279 3046933.2570596454
- ll2 27.444723211681822 -134.3108726555792
-EPSG:3241
- ll -64.00360787850965 167.70799638919263
- en -308770.78150960634 2981253.9492220874
- ll2 -64.00360787850965 167.70799638919263
-EPSG:32410
- ll -4.504360841435286 -116.8414548627667
- en 1184475.7165648688 -500776.60578840366
- ll2 -4.504360841066739 -116.84145486893564
-EPSG:32411
- ll -82.7515348973404 -117.0769263897483
- en 498913.2073504957 -9188720.58874505
- ll2 -82.75153489722776 -117.07692638966238
-EPSG:32412
- ll 79.69960774013347 -106.66805914923935
- en 586391.4864923527 8851269.471550656
- ll2 79.69960773993265 -106.66805914964985
-EPSG:32413
- ll 11.510919409418676 -99.71792702366362
- en 1076749.9035710106 1277786.85335757
- ll2 11.510919409035363 -99.71792702497072
-EPSG:32414
- ll -62.97073397474416 -92.50637256138486
- en 828821.9734059678 -6998950.101057229
- ll2 -62.97073396919432 -92.50637257590044
-EPSG:32415
- ll -33.87576116499706 -93.45277973182549
- en 458104.9399772526 -3748473.478681678
- ll2 -33.87576116457163 -93.45277973173957
-EPSG:32416
- ll 53.00936592258958 -93.63133702676137
- en 55325.01784667972 5893903.778337604
- ll2 53.009365914243375 -93.63133701498576
-EPSG:32417
- ll -26.774447184439893 -86.05458527852512
- en -2900.7151462099864 -2971464.7182722995
- ll2 -26.774447183654328 -86.05458527924232
-EPSG:32418
- ll 4.0688299120936335 -70.97377587934513
- en 947237.9617136501 450849.80904415954
- ll2 4.068829912026656 -70.97377587976156
-EPSG:32419
- ll -60.29544461446406 -65.8113840188066
- en 676206.541090607 -6688573.96137029
- ll2 -60.29544461398775 -65.81138401873646
-EPSG:3242
- ll -55.94495104038443 -122.85213975773341
- en 1877362.4512358278 3389277.2053895006
- ll2 -55.94495104038441 -122.85213975773341
-EPSG:32420
- ll -6.061653451925025 -62.86360787304039
- en 515067.723048746 -670023.4478844141
- ll2 -6.061653451818554 -62.863607872954475
-EPSG:32421
- ll 21.55659342101248 -56.5756432820535
- en 543914.1936369485 2383806.5836810316
- ll2 21.556593420715778 -56.57564328196759
-EPSG:32422
- ll 86.52338477955527 -56.853481484117324
- en 460436.1204745275 9611824.207459332
- ll2 86.52338477950092 -56.85348147617668
-EPSG:32423
- ll -36.34742099482565 -45.471943950452385
- en 457631.749312675 -4022587.379057674
- ll2 -36.34742099438756 -45.471943950366466
-EPSG:32424
- ll -70.77175194541297 -45.21212501449321
- en 272007.7681237779 -7863623.429783771
- ll2 -70.77175194312875 -45.21212500287504
-EPSG:32425
- ll 82.97193891524103 -27.139611395331116
- en 579915.7128302226 9217383.290731832
- ll2 82.97193891505893 -27.139611403044487
-EPSG:32426
- ll 68.78348262498156 -27.94329709035827
- en 461894.90017062164 7630509.274797614
- ll2 68.78348262468401 -27.943297090272363
-EPSG:32427
- ll 7.427462672811984 -25.98366090575932
- en -50635.226605542004 824103.415843996
- ll2 7.427462672601992 -25.983660904207614
-EPSG:32428
- ll 44.5798891119812 -14.858437725956257
- en 511220.55231079715 4936289.955316896
- ll2 44.579889111540275 -14.858437725870335
-EPSG:32429
- ll -12.620337017969959 -4.464516645503343
- en 993015.128487098 -1399422.065736522
- ll2 -12.620337017681013 -4.464516645907347
-EPSG:3243
- ll -88.63588446455006 -85.99011179510211
- en 125252.27021458944 116328.06762216197
- ll2 -88.63588446455007 -85.99011179510211
-EPSG:32430
- ll -79.79266828585601 -0.05765761862371832
- en 558180.9270901381 -8859912.735155936
- ll2 -79.79266828569446 -0.05765761855300012
-EPSG:32431
- ll 78.60091937934232 7.782359673709609
- en 605398.3728315841 8729745.350704642
- ll2 78.60091937906218 7.782359672595639
-EPSG:32432
- ll 22.78793282683479 10.791830833835768
- en 683913.046436556 2521155.715591569
- ll2 22.78793282652359 10.791830833922335
-EPSG:32433
- ll 30.812630679704498 15.878999239665664
- en 584058.1578279855 3409164.5161648723
- ll2 30.81263067931714 15.87899923975165
-EPSG:32434
- ll -60.58092176765621 14.625501142322985
- en 151058.66268669203 -6733043.27439941
- ll2 -60.58092176200506 14.625501153903866
-EPSG:32435
- ll 61.914236731362365 28.97341299999555
- en 603629.1693118408 6866197.621571447
- ll2 61.914236730991206 28.973413000081635
-EPSG:32436
- ll -1.8012162075247318 28.36733002536828
- en -15837.24664188904 -199747.6177759824
- ll2 -1.8012162074671525 28.3673300266436
-EPSG:32437
- ll 6.326572560306005 36.88562931827451
- en 266069.70581356896 699778.5690986273
- ll2 6.326572560218894 36.885629318374804
-EPSG:32438
- ll 85.43096057132846 42.74834268070103
- en 479977.2317387458 9488235.084962472
- ll2 85.43096057125854 42.748342680788355
-EPSG:32439
- ll -83.51702251447571 47.47149247253393
- en 455545.76105690433 -9275534.225748444
- ll2 -83.51702251437123 47.47149247270017
-EPSG:3244
- ll -27.384594959296138 -139.32733020415733
- en -2735340.863898768 6956757.197760942
- ll2 -27.384594959296116 -139.32733020415733
-EPSG:32440
- ll -78.76401853238502 63.33426382791791
- en 637519.4079083408 -8751098.34548631
- ll2 -78.76401853169729 63.33426381276811
-EPSG:32441
- ll -43.796605469722834 64.77114255884712
- en 642466.7055194092 -4850806.573192632
- ll2 -43.79660546926383 64.77114255893532
-EPSG:32442
- ll 66.6260454224564 73.5024071599807
- en 699176.4651964502 7396878.788605813
- ll2 66.62604542167763 73.50240715948503
-EPSG:32443
- ll 86.71852634535352 69.86871173727532
- en 467248.6918895541 9633056.975755248
- ll2 86.71852634530136 69.86871173975138
-EPSG:32444
- ll -75.00811816110803 77.94507863524622
- en 411818.34298973845 -8326782.180242688
- ll2 -75.00811816086659 77.94507863535254
-EPSG:32445
- ll 79.27672167888605 88.68825468081636
- en 535058.495159965 8801363.17053265
- ll2 79.27672167872497 88.6882546809022
-EPSG:32446
- ll -2.5179745278778825 97.07614296487847
- en 953496.1224467328 -279025.01940762356
- ll2 -2.517974527816007 97.07614296440349
-EPSG:32447
- ll -81.89361885711958 92.12921497906603
- en 392080.08754589496 -9099365.797171496
- ll2 -81.89361885673964 92.12921501185261
-EPSG:32448
- ll -31.830160910044164 102.11432467692629
- en 226858.41318355652 -3525240.900135034
- ll2 -31.83016090960768 102.11432467697233
-EPSG:32449
- ll -78.77112790477136 110.9308043471368
- en 498490.87344405917 -8744428.837378297
- ll2 -78.77112790459928 110.93080434722273
-EPSG:3245
- ll -81.34020517822921 -116.90326840423717
- en -299474.452496293 966771.4833783418
- ll2 -81.3402051782292 -116.90326840423717
-EPSG:32450
- ll 72.12823413292259 110.7596683590745
- en 286585.82685052557 8014307.572205587
- ll2 72.12823413094404 110.75966837143196
-EPSG:32451
- ll -86.50394416323938 119.73221311540176
- en 477762.47024274967 -9608268.06821122
- ll2 -86.50394416318431 119.73221311552841
-EPSG:32452
- ll -18.764346157275682 128.72043132252412
- en 470510.3403531317 -2074777.5077498546
- ll2 -18.764346156990324 128.72043132261007
-EPSG:32453
- ll -38.53015251163986 130.01928987500364
- en 65730.93237175932 -4276414.542222483
- ll2 -38.53015251024718 130.01928987453644
-EPSG:32454
- ll -6.452883129120309 137.11084115142017
- en 69608.21715005022 -714912.990670029
- ll2 -6.4528831289893525 137.1108411518795
-EPSG:32455
- ll -81.59613142056965 145.6022394993355
- en 477192.1387778623 -9060019.440322407
- ll2 -81.59613142043943 145.60223949942147
-EPSG:32456
- ll -46.1334625614396 151.6787687582198
- en 397923.1925077369 -5109724.740886392
- ll2 -46.13346256098314 151.67876875830532
-EPSG:32457
- ll -11.914347533364122 162.01565418202068
- en 828499.5858303229 -1318869.6590398971
- ll2 -11.914347533164582 162.01565418204697
-EPSG:32458
- ll 23.40288550281865 165.51138319805747
- en 552227.8690194985 2588210.1872238894
- ll2 23.402885502501206 165.51138319814342
-EPSG:32459
- ll -39.37156928928615 164.89163745122517
- en -26371.0514490559 -4375848.308669663
- ll2 -39.37156928549995 164.89163745098872
-EPSG:3246
- ll -75.6227250221769 -68.88934275492034
- en 333549.07075094356 1618817.748791127
- ll2 -75.6227250221769 -68.88934275492034
-EPSG:32460
- ll -13.426349332265005 171.9229102199116
- en -50282.97732642153 -1489958.5144968093
- ll2 -13.42634933186313 171.9229102208112
-EPSG:3247
- ll -30.167561071320392 -110.95272683677659
- en -5108124.038016743 4915778.378642457
- ll2 -30.16756107132038 -110.95272683677658
-EPSG:3248
- ll -87.37888652753742 -68.9821558389592
- en -207424.41036793997 244072.23321914067
- ll2 -87.37888652753742 -68.98215583895922
-EPSG:3249
- ll -50.13806370520559 2.810353548418405
- en 896880.718253785 4466589.984422533
- ll2 -50.13806370520551 2.8103535484184032
-EPSG:3250
- ll -60.82490241446297 71.83776329182976
- en 2881920.1839698907 1636559.2217526282
- ll2 -60.82490241446294 71.83776329182976
-EPSG:32501
- ll -66.57576716128897 -175.75479209844852
- en 555225.6355728946 2615361.82063998
- ll2 -66.57576716095875 -175.7547920983625
-EPSG:32502
- ll 30.87570562061103 -176.925718886472
- en -66940.27300559834 1.343090363091834E7
- ll2 30.87570561870623 -176.92571888843545
-EPSG:32503
- ll -77.31062241950993 -158.78924433015746
- en 652021.9640787115 1410518.9980026614
- ll2 -77.31062241865303 -158.78924434263072
-EPSG:32504
- ll 62.36267042402335 -162.53796066783906
- en 316952.3405872857 1.6919589348932907E7
- ll2 62.36267042351556 -162.53796066769922
-EPSG:32505
- ll 61.26236181406466 -151.47604367647023
- en 581726.4479735016 1.679296093235471E7
- ll2 61.26236181369153 -151.4760436763842
-EPSG:32506
- ll -71.57869167664018 -149.29570226395998
- en 419041.083227724 2056522.473856181
- ll2 -71.57869167636458 -149.29570226387267
-EPSG:32507
- ll -54.42029699033035 -136.69302044435983
- en 779369.2248128036 3961168.772242103
- ll2 -54.42029698929555 -136.69302044445718
-EPSG:32508
- ll -84.27633279681189 -134.85234850395213
- en 501641.5048803547 641057.5696633495
- ll2 -84.27633279672257 -134.8523485038662
-EPSG:32509
- ll -61.07772125536411 -125.56262909430949
- en 685387.155127174 3223687.561523094
- ll2 -61.07772125485016 -125.56262909426061
-EPSG:3251
- ll -66.70591807664374 29.683910263484677
- en 119272.9471922839 2646804.653227557
- ll2 -66.70591807664374 29.683910263484677
-EPSG:32510
- ll -9.083775948493852 -118.6959789318611
- en 973363.7314800342 8993073.410000606
- ll2 -9.083775948294106 -118.69597893232633
-EPSG:32511
- ll 20.23006086326258 -111.0764439888338
- en 1119551.4793859492 1.224803933970356E7
- ll2 20.230060862277426 -111.07644398826736
-EPSG:32512
- ll 16.421698131250196 -104.9320996396828
- en 1148837.0030159403 1.1825318687275836E7
- ll2 16.42169813032251 -104.93209964063125
-EPSG:32513
- ll -30.605446278492757 -101.46521203905633
- en 838916.0890612944 6608796.102311361
- ll2 -30.60544627802099 -101.46521203884839
-EPSG:32514
- ll -61.7373653718967 -105.26553128575124
- en 169359.84900092002 3139131.375773399
- ll2 -61.737365367017944 -105.26553127547174
-EPSG:32515
- ll 9.870254829865729 -88.46207175357439
- en 998001.1779019581 1.10944509362232E7
- ll2 9.870254829653723 -88.46207175418161
-EPSG:32516
- ll -70.76294392207502 -92.23036932718234
- en 307867.44577699696 2140756.137036468
- ll2 -70.7629439210618 -92.23036932465654
-EPSG:32517
- ll 20.02990363291663 -79.66146577527402
- en 639977.3492252658 1.2215347966568703E7
- ll2 20.029903632637936 -79.66146577518825
-EPSG:32518
- ll 42.89625064555557 -69.44834171115025
- en 953301.0616123279 1.4764263094768036E7
- ll2 42.89625064285184 -69.44834171114334
-EPSG:32519
- ll 53.97009550956821 -73.60955879854032
- en 197714.74166761345 1.5990034707146794E7
- ll2 53.97009550823688 -73.60955879809724
-EPSG:3252
- ll -24.66327487937214 129.38732173163035
- en 7768609.892081851 1212968.8584166456
- ll2 -24.663274879372135 129.38732173163035
-EPSG:32520
- ll -78.83308947121475 -61.192537550632466
- en 539066.6911629853 1248052.2202585358
- ll2 -78.83308947104327 -61.19253755054673
-EPSG:32521
- ll 51.2688312001288 -54.246197424447075
- en 692082.6522127981 1.5683319542813998E7
- ll2 51.268831199655985 -54.246197424352445
-EPSG:32522
- ll 34.60442457497659 -46.55628176630853
- en 907563.661412609 1.3838159833109241E7
- ll2 34.604424574200806 -46.55628176578965
-EPSG:32523
- ll 56.90071315693356 -49.441226613113535
- en 229582.48740009207 1.6315118219676305E7
- ll2 56.90071315583285 -49.44122661269918
-EPSG:32524
- ll 24.527554722774497 -42.232765709653755
- en 172408.66352211928 1.2716473160717981E7
- ll2 24.527554722422867 -42.2327657096107
-EPSG:32525
- ll 82.39817922876571 -26.99395753657888
- en 588543.0933399419 1.9153878309057064E7
- ll2 82.39817922853928 -26.993957546195162
-EPSG:32526
- ll 39.55070354265152 -20.36924445904935
- en 1069913.2306160117 1.4398938763712473E7
- ll2 39.550703536761816 -20.369244459924268
-EPSG:32527
- ll -10.861469910414499 -21.953375501022357
- en 395772.0929018023 8799172.898211816
- ll2 -10.86146991023612 -21.953375500936243
-EPSG:32528
- ll -24.50366194682806 -17.73948240602837
- en 222366.7862510293 7287253.91925583
- ll2 -24.503661946469567 -17.739482405957975
-EPSG:32529
- ll -22.67665390844894 -11.934885395264022
- en 198400.39829062345 7489292.833262192
- ll2 -22.67665390810746 -11.93488539519292
-EPSG:3253
- ll -34.20676870623361 68.31861568149442
- en 583388.6818312559 6519976.38960878
- ll2 -34.20676870623362 68.31861568149442
-EPSG:32530
- ll -74.96007065856973 -4.667943519425188
- en 451686.49374172324 1680170.9765269523
- ll2 -74.96007065834328 -4.667943519339184
-EPSG:32531
- ll 48.02676865061392 9.941532806209358
- en 1017387.5531297699 1.5342627166089242E7
- ll2 48.026768640248754 9.941532793955636
-EPSG:32532
- ll -84.74376924441377 11.311315144833605
- en 523631.25646409136 588400.9215007816
- ll2 -84.74376924433156 11.31131514491775
-EPSG:32533
- ll 57.08130043473389 10.843797168350534
- en 248147.1230856043 1.6334106769574497E7
- ll2 57.08130043386434 10.843797168608925
-EPSG:32534
- ll -87.51056444315 27.8473049540482
- en 533126.0470321411 278000.00460891053
- ll2 -87.51056444313849 27.847304921576367
-EPSG:32535
- ll -21.82805161649837 31.228287000845558
- en 937237.0644031918 7580198.11602913
- ll2 -21.82805161608418 31.228287001054824
-EPSG:32536
- ll -22.437555514974918 27.19245225000887
- en -98357.6652221143 7507137.445887461
- ll2 -22.437555513941717 27.192452249086706
-EPSG:32537
- ll 0.5623524999534908 41.291817468690084
- en 755052.9187078683 1.006220502802411E7
- ll2 0.5623524999565914 41.291817468750885
-EPSG:32538
- ll -77.40137747424772 50.20833508372054
- en 626654.2599305044 1402815.7320436537
- ll2 -77.4013774738173 50.208335081245195
-EPSG:32539
- ll 41.747165548967445 44.64218646671445
- en -28760.277311363723 1.4641279320300236E7
- ll2 41.74716554374124 44.64218646815411
-EPSG:3254
- ll -74.58813870436089 6.7400484593316605
- en -1675833.0482450752 564315.0237097285
- ll2 -74.58813870436087 6.7400484593316605
-EPSG:32540
- ll 67.97592227028076 51.87927667518177
- en 285902.4812234393 1.7549053970306978E7
- ll2 67.97592226910199 51.879276677184706
-EPSG:32541
- ll -29.35144917611092 56.56681515435769
- en -125168.58746461326 6735825.0233279085
- ll2 -29.351449173523893 56.566815151387324
-EPSG:32542
- ll 88.13222363391532 63.26471613385544
- en 479163.35483477777 1.979047000919258E7
- ll2 88.13222363388984 63.26471614049877
-EPSG:32543
- ll -52.22218069622154 80.97346018373797
- en 907847.4071337566 4197420.184675058
- ll2 -52.22218069149602 80.97346017975713
-EPSG:32544
- ll 71.9381805078128 75.43951343688728
- en 307816.33692551183 1.7990908797680873E7
- ll2 71.93818050665006 75.43951344129006
-EPSG:32545
- ll -9.61902360500386 91.19829437983302
- en 961007.2967555874 8933881.714743892
- ll2 -9.619023604801468 91.19829437946251
-EPSG:32546
- ll -59.2786456603455 97.74087020691125
- en 770009.5467046348 3419309.981065708
- ll2 -59.27864565898881 97.74087020628096
-EPSG:32547
- ll -43.22041957091484 92.46365580111609
- en -30947.88354767894 5193920.411775307
- ll2 -43.220419564440775 92.463655804378
-EPSG:32548
- ll 82.31170220845286 99.69868194790965
- en 420925.23482868855 1.9143248923431545E7
- ll2 82.31170220827558 99.6986819511348
-EPSG:32549
- ll -31.478877598043475 115.38127586865068
- en 916322.429243315 6509002.347150396
- ll2 -31.478877597370886 115.38127586915503
-EPSG:3255
- ll -55.28010402368451 117.85700202878235
- en 1229519.0175513797 3755467.5869705523
- ll2 -55.280104023684494 117.85700202878235
-EPSG:32550
- ll 76.23110004275173 123.91625404650603
- en 683350.5142829255 1.8471731955029607E7
- ll2 76.23110004103104 123.91625401373302
-EPSG:32551
- ll -20.827336346505234 128.18622735786414
- en 1040146.9758241479 7688252.1903307885
- ll2 -20.827336345883158 128.1862273582607
-EPSG:32552
- ll 0.9148020324807362 130.12186925806284
- en 624802.9807320302 1.0101130770982962E7
- ll2 0.9148020324783482 130.1218692581481
-EPSG:32553
- ll -32.0439007970042 139.43693415255945
- en 919055.05190747 6446078.74276821
- ll2 -32.04390079629545 139.43693415309448
-EPSG:32554
- ll 68.29871521753034 138.02359502855424
- en 377208.61689219 1.7579130400316484E7
- ll2 68.29871521719419 138.02359502865428
-EPSG:32555
- ll 15.382642671157043 153.078831961424
- en 1153379.597738346 1.1709865210904375E7
- ll2 15.3826426702638 153.07883195998815
-EPSG:32556
- ll -23.83720268620887 157.77871258746
- en 987016.9650646104 7355575.85031289
- ll2 -23.837202685634953 157.77871258796645
-EPSG:32557
- ll -39.7659055749182 161.54355197495133
- en 717850.1002916322 5595130.448675028
- ll2 -39.76590557444975 161.5435519750557
-EPSG:32558
- ll -21.96132029498004 170.42348020885683
- en 1060551.3062502102 7561511.498105723
- ll2 -21.96132029421269 170.42348020954833
-EPSG:32559
- ll 81.02286333901822 177.65752036857631
- en 615724.3450319764 1.9002401997427694E7
- ll2 81.02286333856094 177.65752034426575
-EPSG:3256
- ll -25.74079850550895 128.65299132214417
- en 1497505.2668424554 7561160.862827746
- ll2 -25.740798505508927 128.65299132214417
-EPSG:32560
- ll -17.461146943942197 173.56167463476464
- en 134715.48083397216 8066136.420976496
- ll2 -17.461146943654278 173.56167463488293
-EPSG:3257
- ll -39.743832408936676 152.68408008572152
- en 1704498.0357143895 5574963.758161218
- ll2 -39.74383240893668 152.68408008572152
-EPSG:3258
- ll -36.98510816333684 96.46091196431846
- en -5024335.649298255 3603204.46633895
- ll2 -36.985108163336825 96.46091196431846
-EPSG:3259
- ll -50.1312740334533 99.61157285456301
- en -4243251.763362412 1660419.8254777545
- ll2 -50.13127403345322 99.61157285456301
-EPSG:3260
- ll -78.11150489527463 -86.50724362977431
- en 1325511.4748634426 240428.11257925737
- ll2 -78.1115048952746 -86.50724362977431
-EPSG:32601
- ll -3.6495589856169564 -176.6243420458802
- en 541717.4179094827 -403400.10216600506
- ll2 -3.6495589856169572 -176.6243420458802
-EPSG:32602
- ll 38.43328988420372 -175.41454460919266
- en 114618.99293843785 4263130.091454168
- ll2 38.43328988374612 -175.41454460952983
-EPSG:32603
- ll 13.94169016223239 -165.2258799979927
- en 475600.84907209425 1541289.1313522912
- ll2 13.941690162232392 -165.2258799979927
-EPSG:32604
- ll 60.795772683636486 -162.92629418761828
- en 286368.74205743335 6746432.920970498
- ll2 60.795772683344204 -162.9262941874863
-EPSG:32605
- ll 74.2550224215632 -148.20602058272593
- en 645061.3242085864 8246334.553614197
- ll2 74.25502242129598 -148.206020583895
-EPSG:32606
- ll 80.62633417761566 -151.3471654538554
- en 421027.4006989514 8954452.981123418
- ll2 80.62633417757986 -151.34716545333885
-EPSG:32607
- ll 37.01455086032124 -143.30950802834204
- en 294532.771208573 4098980.301216907
- ll2 37.01455086031266 -143.30950802835395
-EPSG:32608
- ll -4.653539246315615 -133.56282320890344
- en 659414.7330360789 -514529.48258248396
- ll2 -4.653539246315588 -133.56282320890554
-EPSG:32609
- ll 56.32206179767012 -124.49220399516759
- en 778688.1176260733 6251055.828954968
- ll2 56.32206179689916 -124.4922039955295
-EPSG:3261
- ll -71.39884050693746 -111.86348661128883
- en 1094055.356771719 1789743.1584302213
- ll2 -71.39884050693745 -111.86348661128883
-EPSG:32610
- ll 36.921727279752915 -127.6633794079528
- en 84517.34786617843 4096359.518862353
- ll2 36.92172727917722 -127.6633794084422
-EPSG:32611
- ll 61.640118353720766 -116.73932035402463
- en 513814.44473742106 6834117.684981387
- ll2 61.64011835372076 -116.73932035402463
-EPSG:32612
- ll 61.69639866773598 -111.30686106393058
- en 483767.78639777703 6840397.679940908
- ll2 61.69639866773596 -111.30686106393058
-EPSG:32613
- ll 19.215134444138208 -106.20214869812588
- en 373630.15798722656 2125068.2388342214
- ll2 19.215134444138172 -106.20214869812575
-EPSG:32614
- ll 16.494900055550026 -94.60816731824863
- en 969103.02718262 1828791.6689797896
- ll2 16.494900055465273 -94.60816731840622
-EPSG:32615
- ll 83.61536918012229 -93.46595301371315
- en 494215.18645975593 9285178.496722516
- ll2 83.61536918012229 -93.46595301371315
-EPSG:32616
- ll 7.014249507069595 -87.71794057949658
- en 420703.10661247035 775384.7710192621
- ll2 7.014249507069594 -87.71794057949653
-EPSG:32617
- ll -3.3302161122148046 -82.19832562590992
- en 366870.3258670751 -368173.98172966286
- ll2 -3.330216112214798 -82.19832562590905
-EPSG:32618
- ll 57.18696286723503 -72.70001645536873
- en 639002.3152045447 6340543.350559951
- ll2 57.18696286722158 -72.70001645536749
-EPSG:32619
- ll 4.368358977092871 -64.53035238567001
- en 996425.9242046584 484321.4351426159
- ll2 4.36835897706066 -64.5303523865751
-EPSG:3262
- ll -73.75411637589234 -81.69813636009405
- en 1115552.5284721435 1455484.4352798616
- ll2 -73.75411637589232 -81.69813636009405
-EPSG:32620
- ll 34.50346552800408 -65.88643009548395
- en 234986.83576452546 3821764.743692566
- ll2 34.50346552797685 -65.886430095525
-EPSG:32621
- ll 66.32043205684387 -55.95233500732909
- en 546950.7762588888 7356020.1838912815
- ll2 66.32043205684377 -55.95233500732908
-EPSG:32622
- ll 22.880986672953505 -51.04852780641678
- en 495022.4465742254 2530345.9410378123
- ll2 22.880986672953505 -51.04852780641678
-EPSG:32623
- ll 50.70636597139303 -44.415105586563286
- en 541300.1696982854 5617335.645977161
- ll2 50.70636597139303 -44.41510558656328
-EPSG:32624
- ll 59.252750117784515 -34.1965937576106
- en 773788.3358998229 6578068.569788564
- ll2 59.25275011674721 -34.19659375841937
-EPSG:32625
- ll 74.83669811358862 -29.78636313505136
- en 593787.6709387399 8307926.133436134
- ll2 74.83669811356623 -29.78636313508345
-EPSG:32626
- ll 37.06395848498947 -23.32759913796584
- en 826543.5508567702 4108279.7965505077
- ll2 37.0639584848503 -23.32759913782102
-EPSG:32627
- ll 21.63205133470307 -16.125369909277662
- en 1004897.6651700148 2400032.057260954
- ll2 21.63205133448079 -16.12536990898981
-EPSG:32628
- ll 41.18279035975444 -12.509306446318838
- en 708900.236502887 4562039.633742347
- ll2 41.1827903597371 -12.509306446303356
-EPSG:32629
- ll -1.5056398202590895 -13.226571608432748
- en 29420.422256887017 -166875.5094258585
- ll2 -1.5056398202511811 -13.226571607731467
-EPSG:3263
- ll -78.67373259587185 -144.74321862749227
- en -949704.3705172882 864698.3504650032
- ll2 -78.67373259587184 -144.74321862749227
-EPSG:32630
- ll 60.97617864835311 -5.1456787213343365
- en 383876.63834851334 6762035.652463208
- ll2 60.97617864834533 -5.14567872133453
-EPSG:32631
- ll 21.778088372390226 3.293215716204843
- en 530312.9322228377 2408293.560193204
- ll2 21.778088372390222 3.293215716204843
-EPSG:32632
- ll 41.781405379957675 9.22208544650317
- en 518455.40721812454 4625530.209964115
- ll2 41.781405379957675 9.22208544650317
-EPSG:32633
- ll 13.769437443342966 12.459184391242701
- en 225263.60546491505 1523678.0820432757
- ll2 13.769437443340662 12.459184391261935
-EPSG:32634
- ll 52.60873639594413 23.627632522379443
- en 677915.0388393127 5831989.435537757
- ll2 52.6087363959124 23.62763252238513
-EPSG:32635
- ll 24.91594181729575 22.85543695478043
- en 81252.09010670852 2762028.164968506
- ll2 24.915941817190976 22.85543695457292
-EPSG:32636
- ll 77.06743470734551 36.30535071085872
- en 582537.5382539753 8556619.453966156
- ll2 77.06743470732813 36.30535071081636
-EPSG:32637
- ll 32.10582753915865 43.30138043198107
- en 905988.0719325282 3560274.864247289
- ll2 32.10582753891273 43.30138043235958
-EPSG:32638
- ll 84.48275616102283 40.84003411261602
- en 455384.49284733087 9383600.605592817
- ll2 84.48275616101726 40.84003411297204
-EPSG:32639
- ll 20.8498525813592 54.77860386823433
- en 893311.5371425161 2310151.24405175
- ll2 20.84985258131638 54.77860386827074
-EPSG:3264
- ll -85.93281652358444 -121.50866454468684
- en -351897.73122268426 312087.2217904773
- ll2 -85.93281652358446 -121.50866454468684
-EPSG:32640
- ll 68.00277995638268 59.474698114871416
- en 603418.7121789139 7545245.473853918
- ll2 68.0027799563714 59.47469811486892
-EPSG:32641
- ll 47.78264301956235 62.488952236723996
- en 461718.3278955673 5292268.799793791
- ll2 47.78264301956235 62.488952236723996
-EPSG:32642
- ll 0.9326717540981502 68.86233656489328
- en 484683.50743983604 103088.64292631688
- ll2 0.9326717540981504 68.86233656489328
-EPSG:32643
- ll 44.846170230678624 73.37627962027206
- en 371683.90711883584 4967144.466433703
- ll2 44.84617023067707 73.3762796202707
-EPSG:32644
- ll -4.662113413556391 78.17591049523084
- en 186656.29441169155 -515943.0662306993
- ll2 -4.662113413554603 78.17591049530117
-EPSG:32645
- ll 21.85298682592404 83.31084454724608
- en 118619.21146341297 2421129.4187642904
- ll2 21.852986825884233 83.31084454719576
-EPSG:32646
- ll 3.83090558426532 93.70522319656826
- en 578301.4840987213 423468.69845210185
- ll2 3.8309055842653192 93.7052231965682
-EPSG:32647
- ll 61.176701380634256 102.3049755772457
- en 677705.7939869761 6786961.547493738
- ll2 61.176701380531874 102.30497557722043
-EPSG:32648
- ll 65.52016341561 108.07283857420049
- en 642036.2912575123 7269895.30627316
- ll2 65.52016341555913 108.07283857418356
-EPSG:32649
- ll 50.51458481950146 112.2497647876952
- en 588606.0108627022 5596593.021201625
- ll2 50.514584819501096 112.24976478769543
-EPSG:3265
- ll -66.3972985210039 -81.62578267576328
- en -1445427.144051692 2234806.6470637955
- ll2 -66.39729852100389 -81.62578267576328
-EPSG:32650
- ll 30.317898015756754 115.83447351407865
- en 387943.86307312315 3354587.268048681
- ll2 30.31789801575668 115.83447351407838
-EPSG:32651
- ll 5.439835265269263 124.12634655970724
- en 624781.4030536099 601399.6368953339
- ll2 5.439835265269257 124.12634655970665
-EPSG:32652
- ll 24.04438471096761 126.6110765311061
- en 257056.08935752395 2661204.9573704787
- ll2 24.04438471096424 126.6110765311
-EPSG:32653
- ll 9.196967409095826 136.5941574268806
- en 675145.977776799 1017017.9715244349
- ll2 9.196967409095734 136.59415742687773
-EPSG:32654
- ll 8.828949468798196 138.3195101449139
- en 205136.37787458958 977000.6155269903
- ll2 8.82894946879594 138.31951014495678
-EPSG:32655
- ll 38.98881999790767 146.43370393605906
- en 450955.5466387597 4315688.422627139
- ll2 38.98881999790767 146.43370393605906
-EPSG:32656
- ll 16.65759552704404 154.97496292314585
- en 710634.5374776218 1842718.08837143
- ll2 16.657595527043448 154.97496292314267
-EPSG:32657
- ll 19.930570323715436 158.94732919399456
- en 494487.94613308937 2203799.1129321284
- ll2 19.930570323715436 158.94732919399456
-EPSG:32658
- ll 54.122258197403674 167.75166014723632
- en 679819.5341590004 6000624.159580531
- ll2 54.122258197362186 167.75166014724059
-EPSG:32659
- ll 25.934718860161414 166.12759614228142
- en 11746.201902320201 2877548.424394139
- ll2 25.934718859853856 166.12759614167322
-EPSG:3266
- ll -29.296141400217415 32.12324112709993
- en 5950818.704286176 4182027.511147306
- ll2 -29.296141400217394 32.12324112709993
-EPSG:32660
- ll 55.17620724777461 173.35757010739871
- en 268075.65214530524 6120455.0109896725
- ll2 55.17620724755481 173.35757010742768
-EPSG:32661
- ll -21.192242200380292 89.19817799664668
- en 2.0407238460984133E7 1742384.2989924871
- ll2 -21.192242200379425 89.19817799664669
-EPSG:32664
- ll 85.86125956493353 -97.23947194906243
- en 1686951.2382622936 3.128636439531439E7
- ll2 85.86125956493353 -97.23947194906258
-EPSG:32665
- ll -68.15549672954874 -99.87934909123314
- en 704847.9771626876 -2.485597220823368E7
- ll2 -68.15549672472093 -99.87934906353526
-EPSG:32666
- ll 20.757263312186183 -85.37085780725062
- en 2196860.017832521 7533247.458488131
- ll2 20.757263312185934 -85.37085780725076
-EPSG:32667
- ll 62.396876417548924 -78.72858823774715
- en 2025594.3010461528 2.270486433371959E7
- ll2 62.39687641753874 -78.72858823774745
-EPSG:3267
- ll -52.60002024465113 -19.678323892137342
- en -1405559.2106945864 4024892.046384998
- ll2 -52.60002024465107 -19.678323892137346
-EPSG:3268
- ll -61.175262600831225 106.22084644350937
- en 3212694.913121491 541574.8944717249
- ll2 -61.17526260083121 106.22084644350939
-EPSG:3269
- ll -39.62084835340015 52.740673628847915
- en 475062.6356631155 5856522.817811749
- ll2 -39.620848353400135 52.740673628847915
-EPSG:3270
- ll -77.71290237958158 122.24384685591326
- en 1052668.6844624653 910232.1363721186
- ll2 -77.71290237958158 122.24384685591326
-EPSG:32701
- ll -79.49425576683728 -175.17261235268
- en 537190.9449586726 1174278.8979089614
- ll2 -79.49425576683701 -175.1726123526802
-EPSG:32702
- ll -70.3636651216759 -169.0540165216635
- en 572973.9443382015 2192403.7379683387
- ll2 -70.36366512167382 -169.05401652166378
-EPSG:32703
- ll -64.07482155536479 -167.37347836794083
- en 384239.0067004758 2892491.3858757345
- ll2 -64.07482155535283 -167.37347836793978
-EPSG:32704
- ll -81.82759990266321 -161.36129957378873
- en 462536.10472126206 913651.2670078445
- ll2 -81.82759990266258 -161.3612995737866
-EPSG:32705
- ll -10.618519479667924 -152.80558677569005
- en 521265.3271498454 8826193.87547185
- ll2 -10.618519479667924 -152.80558677569005
-EPSG:32706
- ll -64.88702541974459 -146.77055628252265
- en 510865.456044635 2804116.415639016
- ll2 -64.88702541974459 -146.77055628252265
-EPSG:32707
- ll -17.014236124831925 -138.5560342625061
- en 760189.8126936387 8117245.628967978
- ll2 -17.01423612482971 -138.55603426251415
-EPSG:32708
- ll -19.360522286858412 -130.51521438438937
- en 971375.4749390932 7853156.144086994
- ll2 -19.360522286744782 -130.5152143843627
-EPSG:32709
- ll -48.12954384352628 -133.6701726707044
- en 152541.01484182908 4658745.420073688
- ll2 -48.129543842573156 -133.6701726706057
-EPSG:3271
- ll -59.64181072597338 43.35412173095102
- en -2688388.6317967013 2138432.551225114
- ll2 -59.64181072597337 43.354121730951015
-EPSG:32710
- ll -52.25433386074913 -125.22009755241042
- en 348463.814100175 4208351.4352864055
- ll2 -52.25433386073755 -125.22009755241353
-EPSG:32711
- ll -19.969438206831114 -112.40559811141517
- en 981089.1700443368 7785303.299711352
- ll2 -19.969438206693678 -112.40559811133507
-EPSG:32712
- ll -82.30598145289773 -111.54516447887035
- en 491851.53932606074 860976.4327960815
- ll2 -82.30598145289774 -111.54516447887035
-EPSG:32713
- ll -27.682129312431982 -108.88467228935836
- en 116766.25790056051 6931967.475112611
- ll2 -27.682129312341804 -108.88467228954218
-EPSG:32714
- ll -29.87122817201856 -96.79393969412426
- en 713070.2953358308 6693439.857568128
- ll2 -29.871228172014934 -96.79393969411608
-EPSG:32715
- ll -45.064525740600004 -91.06910863212093
- en 652012.8450233834 5008067.966598252
- ll2 -45.06452574059557 -91.06910863211765
-EPSG:32716
- ll -58.71229223259745 -84.44411361090351
- en 648042.0672957059 3489161.1944455327
- ll2 -58.71229223257323 -84.4441136109034
-EPSG:32717
- ll -38.802390463626864 -81.93995602944875
- en 418380.85195106186 5704732.436690546
- ll2 -38.802390463626814 -81.93995602944885
-EPSG:32718
- ll -3.3629289212908304 -73.44674961461307
- en 672563.3719880176 9628153.79325675
- ll2 -3.3629289212908007 -73.44674961461631
-EPSG:32719
- ll -33.89082357352943 -70.16473852068903
- en 392298.6823869158 6249338.709620055
- ll2 -33.890823573529325 -70.16473852068934
-EPSG:3272
- ll -41.965091045722566 160.88882671754314
- en 3582996.236148568 4270209.956553055
- ll2 -41.96509104572255 160.88882671754314
-EPSG:32720
- ll -37.963670491552506 -63.152637490725255
- en 486592.2238327504 5798204.815633274
- ll2 -37.963670491552506 -63.152637490725255
-EPSG:32721
- ll -30.671596491118876 -55.93485084612241
- en 602035.2371873851 6606308.651040089
- ll2 -30.671596491118827 -55.93485084612223
-EPSG:32722
- ll -48.33797560577525 -51.721136708686714
- en 446558.9035598788 4645882.823934053
- ll2 -48.33797560577523 -51.72113670868673
-EPSG:32723
- ll -67.34791270049992 -47.105492746268
- en 409523.37020129093 2528300.3134786803
- ll2 -67.34791270049536 -47.10549274626753
-EPSG:32724
- ll -18.480188081195536 -35.50757293618132
- en 868887.6679227422 7953120.194515212
- ll2 -18.480188081173253 -35.50757293619885
-EPSG:32725
- ll -79.65616002318849 -34.90810750981947
- en 461758.5777522838 1156165.0904284865
- ll2 -79.65616002318816 -34.90810750981917
-EPSG:32726
- ll -58.050904557642795 -25.614076588233253
- en 581801.0408022252 3564782.9190423815
- ll2 -58.05090455764215 -25.614076588233104
-EPSG:32727
- ll -11.074839610586821 -22.509236738018565
- en 335149.1342237338 8775328.359513316
- ll2 -11.074839610586741 -22.509236738016693
-EPSG:32728
- ll -30.22368423134398 -14.155511438653734
- en 581267.1474967783 6656126.712692542
- ll2 -30.223684231343977 -14.155511438653683
-EPSG:32729
- ll -30.227320596530838 -8.86299565287534
- en 513183.5389036891 6656017.312594214
- ll2 -30.227320596530845 -8.86299565287534
-EPSG:3273
- ll -60.83027648048197 108.80611074418914
- en -1864467.7594180214 2720140.071238515
- ll2 -60.83027648048196 108.80611074418914
-EPSG:32730
- ll -22.65541004612829 -6.752038540656425
- en 114321.06668815808 7489756.433066227
- ll2 -22.655410046081204 -6.752038540729204
-EPSG:32731
- ll -69.74387310983653 0.012693306356169387
- en 384612.2482139726 2259866.233212795
- ll2 -69.74387310980738 0.012693306371385216
-EPSG:32732
- ll -14.026991320173153 7.7093432661523185
- en 360626.7849871469 8448908.056413973
- ll2 -14.026991320173124 7.709343266152936
-EPSG:32733
- ll -56.45428458140137 12.50156596978745
- en 346029.859834271 3740559.3039238304
- ll2 -56.45428458137891 12.501565969785716
-EPSG:32734
- ll -74.32843031942343 16.893644195286917
- en 376277.33118247206 1747049.630020937
- ll2 -74.32843031931804 16.89364419557683
-EPSG:32735
- ll -40.275799278738035 28.62542011392181
- en 638188.6451233265 5540363.680742917
- ll2 -40.27579927873674 28.62542011392352
-EPSG:32736
- ll -65.04402451100779 28.088269872939605
- en 268942.9946001717 2777652.402489675
- ll2 -65.04402451013857 28.088269874169008
-EPSG:32737
- ll -56.12569031261057 41.91746685264795
- en 681335.3995626819 3776096.821628442
- ll2 -56.125690312553324 41.91746685264832
-EPSG:32738
- ll -65.97814099575966 44.72385383977286
- en 487455.97932662285 2682498.8077865345
- ll2 -65.97814099575966 44.72385383977286
-EPSG:32739
- ll -83.15794305226285 50.985294546824136
- en 499804.41073336825 765909.3128327597
- ll2 -83.15794305226287 50.985294546824136
-EPSG:3274
- ll -77.16154957226665 143.31116596388475
- en -594565.9708557924 1325969.226302274
- ll2 -77.16154957226664 143.31116596388475
-EPSG:32740
- ll -33.90612215333897 55.54340807914578
- en 365333.57714934775 6247297.92755664
- ll2 -33.90612215333855 55.543408079144754
-EPSG:32741
- ll 1.0575806364498845 59.26522425749987
- en 84186.93583129405 1.0117144976068648E7
- ll2 1.057580636447403 59.26522425784936
-EPSG:32742
- ll -46.178042726951354 66.69823879913768
- en 322343.7313900408 4883595.078895499
- ll2 -46.17804272693819 66.69823879913032
-EPSG:32743
- ll -39.73188174417527 76.95777139426251
- en 667772.5884305012 5600168.039095955
- ll2 -39.731881744171496 76.95777139426713
-EPSG:32744
- ll -58.90817409501413 83.51623833851097
- en 644926.6875630359 3467446.9295777064
- ll2 -58.908174094992205 83.51623833851113
-EPSG:32745
- ll -19.13355908174954 83.0612339731479
- en 85519.0860959157 7879719.5889365
- ll2 -19.13355908170016 83.06123397315149
-EPSG:32746
- ll -79.98303745799947 96.65795352222075
- en 570985.7969795148 1118075.2147644982
- ll2 -79.98303745798381 96.6579535221124
-EPSG:32747
- ll -60.228788602870765 98.77996463649609
- en 487811.7927914533 3323088.3854657905
- ll2 -60.22878860287079 98.77996463649609
-EPSG:32748
- ll -1.2400504086148914 101.47125324361218
- en 107180.32612776395 9862674.919377105
- ll2 -1.2400504086128725 101.47125324386658
-EPSG:32749
- ll -14.715058432512933 109.34888827185335
- en 322238.7089430217 8372538.683268954
- ll2 -14.715058432512757 109.34888827185527
-EPSG:3275
- ll 40.16054215816132 1.0855662727425113
- en 6504595.313565422 -2.6255484909765538E7
- ll2 40.16054215816115 1.0855662727425113
-EPSG:32750
- ll -41.801482732797645 121.04882913878397
- en 836386.1554515049 5364335.267253454
- ll2 -41.80148273246933 121.04882913894804
-EPSG:32751
- ll -40.71839008199499 127.058349678248
- en 842805.105964907 5484576.4785314975
- ll2 -40.71839008167962 127.05834967843458
-EPSG:32752
- ll -72.46474360436092 124.05481128660503
- en 333868.1451270664 1952386.7334246216
- ll2 -72.46474360393994 124.05481128811473
-EPSG:32753
- ll -33.78436189634808 133.38483653988797
- en 350459.69487856154 6260580.879620777
- ll2 -33.784361896347285 133.3848365398862
-EPSG:32754
- ll -41.877385502320905 140.28898118102205
- en 441002.03665171954 5363593.003169983
- ll2 -41.87738550232089 140.28898118102202
-EPSG:32755
- ll -71.6100953593816 150.91844203859793
- en 637888.143501346 2050080.8359526936
- ll2 -71.61009535926324 150.91844203841487
-EPSG:32756
- ll -2.4333551434362874 149.30198701386684
- en 88585.68516044872 9730475.224796725
- ll2 -2.43335514343096 149.30198701419152
-EPSG:32757
- ll -45.28058180582347 160.9894853454731
- en 656034.4343928326 4983954.453493886
- ll2 -45.28058180581812 160.98948534547688
-EPSG:32758
- ll -16.194478546960923 167.46553434377688
- en 763603.8925153038 8207969.773690785
- ll2 -16.194478546958713 167.46553434376645
-EPSG:32759
- ll -23.721981722945728 173.97823953505454
- en 803660.2707763889 7373376.457123788
- ll2 -23.7219817229332 173.97823953507645
-EPSG:3276
- ll -37.745872952154706 -97.58284866756546
- en 3776977.4308418776 4937017.788426461
- ll2 -37.745872952154464 -97.58284866756546
-EPSG:32760
- ll -71.2741256632004 177.7209727164633
- en 525833.0134556224 2091875.675395066
- ll2 -71.2741256632004 177.7209727164633
-EPSG:32761
- ll -36.79931595734151 -168.48503283551636
- en 731621.5248337251 -4225954.11863668
- ll2 -36.79931595734125 -168.48503283551636
-EPSG:32766
- ll 64.7007921260454 35.093983301674285
- en 456799.1166543604 1.717541794959726E7
- ll2 64.70079212604539 35.09398330167428
-EPSG:3277
- ll 49.69525590340058 -114.95848521516241
- en -5917350.068958273 3.37017359071632E7
- ll2 49.69525590338868 -114.95848521516241
-EPSG:3278
- ll 52.5066101627655 1.0149835350406988
- en 3.58952612451009E7 8939723.864983305
- ll2 52.506610162758314 1.0149835350406988
-EPSG:3279
- ll -16.430633302940933 120.65314398160581
- en 2342811.606825718 -9159912.186654089
- ll2 -16.430633302940002 120.65314398160581
-EPSG:3280
- ll 38.01503038088714 12.48630766502157
- en 1.1898455216666339E7 2.2870062201567817E7
- ll2 38.01503038088691 12.48630766502157
-EPSG:3281
- ll -37.34261965378623 165.18781397505205
- en 3117816.6866298122 -5441330.9531406015
- ll2 -37.342619653785974 165.18781397505205
-EPSG:3282
- ll 0.8125078442826492 -20.014966789840415
- en -1.1602722888684398E7 5406749.088374309
- ll2 0.8125078442717417 -20.014966789840415
-EPSG:3283
- ll -88.08448614013197 -103.71934168466147
- en -4747.592740559416 -212368.6875196604
- ll2 -88.08448614013197 -103.71934168466146
-EPSG:3284
- ll -23.80777000697367 166.04826776288522
- en 7218063.133048423 3993092.360079779
- ll2 -23.807770006972877 166.04826776288522
-EPSG:3285
- ll -16.87772299499774 146.9482484758354
- en 1941623.220801153 9175362.458017621
- ll2 -16.877722994996805 146.9482484758354
-EPSG:3286
- ll -10.975370275679182 154.160325550042
- en -1960025.1457211296 1.0236297176949028E7
- ll2 -10.975370275678385 154.160325550042
-EPSG:3287
- ll 40.71333267195061 -135.71753436483579
- en 6757903.472555841 2.6546251454705708E7
- ll2 40.713332671950454 -135.71753436483579
-EPSG:3288
- ll -81.31841245512562 -52.830333111132276
- en 582689.1581095523 768509.1153144275
- ll2 -81.31841245512543 -52.830333111132276
-EPSG:3289
- ll -44.98050051588047 -2.93037935388017
- en 2391581.860318701 4679677.610265711
- ll2 -44.98050051588038 -2.93037935388017
-EPSG:3290
- ll -3.4355946293206614 -78.38451831571211
- en -1.1284423662989533E7 -3750441.892939877
- ll2 -3.4355946293203607 -78.38451831571213
-EPSG:3291
- ll -13.597564369253718 122.81755220608608
- en 5391628.246355442 8360543.483775471
- ll2 -13.597564369252824 122.81755220608608
-EPSG:3292
- ll 43.53385787560964 32.98006794622793
- en -2.6071632252668746E7 -1.3295586633436328E7
- ll2 43.533857875609556 32.98006794622793
-EPSG:3293
- ll -21.500582601505926 -176.70383655730146
- en -495323.7886841953 -8600498.012219341
- ll2 -21.500582601505062 -176.70383655730146
-EPSG:3294
- ll -65.00152221581087 93.57294503788297
- en -2594661.860025101 -254892.82559477084
- ll2 -65.00152221581085 93.57294503788297
-EPSG:3296
- ll 56.87377508700061 -155.04338394684177
- en 375459.4839906116 1.6305195466207258E7
- ll2 56.87377508699438 -155.0433839468426
-EPSG:3297
- ll 10.905504834762354 -144.97753149212525
- en 721055.0581389039 1.1206269391095806E7
- ll2 10.905504834762143 -144.9775314921336
-EPSG:3298
- ll 7.019821438096315 -146.62413480590402
- en -122141.90766896389 1.07796807960067E7
- ll2 7.019821437867841 -146.62413480278076
-EPSG:3299
- ll -50.225130436398814 -133.87673107265593
- en 580123.3619106101 4435733.618333012
- ll2 -50.22513043639889 -133.8767310726557
-EPSG:3300
- ll 20.74914860812494 34.313267903981085
- en 1783215.1911608821 2115078.696027468
- ll2 20.749148608125086 34.31326790398093
-EPSG:3301
- ll 57.66827326755869 27.38651646246947
- en 702033.9136823909 6396888.581339597
- ll2 57.66827326755868 27.38651646246947
-EPSG:3302
- ll -69.98451063325237 -137.4614305656406
- en 634983.6995679085 2231966.5686343107
- ll2 -69.98451061177562 -137.46143060901608
-EPSG:3303
- ll 71.02885842480714 -142.7066308073498
- en 438248.0089440794 1.7877654668951478E7
- ll2 71.02884646004593 -142.70662723023418
-EPSG:3304
- ll -23.706754587888142 -152.01705543319792
- en -11880.586047644145 7369060.114809384
- ll2 -23.706754587293222 -152.01705543556116
-EPSG:3305
- ll 42.19039385943944 -144.32925329768474
- en 720647.1412327521 1.4674223397975655E7
- ll2 42.190393805206156 -144.32925328469298
-EPSG:3306
- ll 37.02573118390863 -154.84055106132956
- en 336260.16016669734 1.4099305915569685E7
- ll2 37.02573117921741 -154.8405510624313
-EPSG:3307
- ll 17.36013451506159 44.261762083591634
- en -217224.49153524474 1932020.4733673453
- ll2 17.360134513618487 44.261762084961546
-EPSG:3308
- ll -31.05071269252126 170.8833225850995
- en 1.1559462279965399E7 4484290.209301482
- ll2 -31.050712692519536 170.88332258509956
-EPSG:3310
- ll 26.375001969907643 35.49110184400786
- en 9576042.05873655 8976974.966621015
- ll2 26.37500196990769 35.49110184400786
-EPSG:3311
- ll 61.63881234935022 23.684538945908827
- en 5780498.070570402 7992867.558220649
- ll2 61.638812349350836 23.684538945908823
-EPSG:3312
- ll -17.448001252143115 -60.52318082659639
- en 125723.70657933352 -1932662.4245146187
- ll2 -17.44800124532878 -60.52318083148653
-EPSG:3313
- ll -38.83326684730647 -54.778046399506444
- en 692864.0369520457 -4300619.93195864
- ll2 -38.83326684729882 -54.77804639949715
-EPSG:3316
- ll -64.82234234105776 23.4813289811886
- en 570338.627747294 2808637.3815093357
- ll2 -64.82234234105708 23.48132898118864
-EPSG:3317
- ll 7.316313257460067 28.661821481043827
- en 1015266.506951899 1.0811559146439955E7
- ll2 7.31631325739069 28.661821480020336
-EPSG:3318
- ll 2.13862730612594 10.714443510168055
- en 356991.24691299035 1.0236492702108022E7
- ll2 2.1386273061259273 10.71444351016936
-EPSG:3319
- ll -49.1802071612656 10.554565095088105
- en 248836.86897093573 4545471.158805276
- ll2 -49.18020716110564 10.554565095061124
-EPSG:3320
- ll -73.36279520616763 13.631142563130997
- en 424287.2877859018 1855329.758576952
- ll2 -73.362795206163 13.631142563133004
-EPSG:3321
- ll -44.23631976922234 24.358464452947768
- en 1007959.0399176341 5081015.148764182
- ll2 -44.23631976380624 24.35846445022074
-EPSG:3322
- ll 86.00326325190565 25.682755792198854
- en 544166.6901689381 1.9556662488317158E7
- ll2 86.00326325189937 25.682755786201923
-EPSG:3323
- ll 0.4097271237404243 17.308042791703347
- en -22838.61407461838 1.0045449926163228E7
- ll2 0.4097271237360023 17.308042793033867
-EPSG:3324
- ll 0.8201285197224877 30.67403754007788
- en 1244510.0901685436 1.009129055168103E7
- ll2 0.8201285196260943 30.67403752846905
-EPSG:3325
- ll -69.01996316461991 22.75523439466746
- en 370349.9669594969 2337936.0624310747
- ll2 -69.01996316456739 22.755234394699123
-EPSG:3326
- ll 74.6816144545711 33.19546575132383
- en 653084.1436527057 1.8297055152943708E7
- ll2 74.68161445416486 33.195465748895415
-EPSG:3327
- ll 30.01158669878548 34.73515875898355
- en 957055.0854273097 1.333026655459456E7
- ll2 30.011586698411804 34.73515875963568
-EPSG:3328
- ll -27.97630130405524 -45.120346449933464
- en -1.1219535581616143E7 -8129022.382583739
- ll2 -27.97630129996512 -45.120346418073375
-EPSG:3329
- ll 61.802719038923044 19.74130428876213
- en 5750012.551479446 6864213.870619817
- ll2 61.80271903821972 19.741304301012416
-EPSG:3330
- ll -53.35198084319306 21.248931401761343
- en 6716461.42790837 -5918757.069097662
- ll2 -53.35198082869494 21.24893145527508
-EPSG:3331
- ll -33.07079700885442 21.59922161933907
- en 7556088.882418895 -3660743.6959027783
- ll2 -33.07079699424563 21.599221650953762
-EPSG:3332
- ll -86.20918561185258 29.255024098178026
- en 8538909.052550027 -9580462.505545381
- ll2 -86.20918560025846 29.255024641417158
-EPSG:3333
- ll -42.67495454015824 18.669621292076513
- en 3800959.821956483 -4733163.479687039
- ll2 -42.67495452543004 18.669621333621148
-EPSG:3334
- ll -30.11031406802502 22.000656174948684
- en 4596578.724059667 -3332741.9691881104
- ll2 -30.11031405369516 22.000656204353596
-EPSG:3335
- ll 47.0032966914558 27.391069265730405
- en 5529861.665874414 5207805.395945283
- ll2 47.00329669169025 27.39106927266678
-EPSG:3336
- ll -15.438061828135886 68.53301469320641
- en 450100.3089770062 8293033.493343698
- ll2 -15.438061844447816 68.53301472306343
-EPSG:3337
- ll -45.04808291746847 50.10580789679667
- en 351702.1615639948 -1865184.5448184125
- ll2 -45.04808290737997 50.10580785988078
-EPSG:3338
- ll -88.57101489172248 -29.929685537232587
- en 1.3147285657949623E7 8833848.42480445
- ll2 -88.57101489172297 -29.929685537232558
-EPSG:3339
- ll -83.26797975008945 12.862900972121775
- en 511434.0318618511 750966.4731204174
- ll2 -83.26797975559948 12.862900845208108
-EPSG:3340
- ll -82.09293662047395 16.03421989419813
- en 531378.6748400646 881715.1498429757
- ll2 -82.092936625732 16.034219788620167
-EPSG:3341
- ll 87.33200997549275 19.44727974198566
- en 518039.006096426 1.9703338029644832E7
- ll2 87.33201002573962 19.44727822928695
-EPSG:3342
- ll -6.644066817376697 9.418331096481092
- en -117783.85397131601 9262276.294283915
- ll2 -6.644066813881147 9.418331104266356
-EPSG:3343
- ll -37.45217433180984 -16.983906205088054
- en 324521.3821393237 -4146883.3038900117
- ll2 -37.4521743318063 -16.98390620509329
-EPSG:3344
- ll -22.813022648584692 -10.742126221747176
- en 321199.88586108165 -2523875.8372845096
- ll2 -22.813022648584106 -10.742126221747723
-EPSG:3345
- ll 48.195191142835455 -5.825562075039187
- en 290031.47550079296 5341856.05535303
- ll2 48.19519114278842 -5.82556207505497
-EPSG:3346
- ll -72.4965761829573 21.18694851544432
- en 405578.82486431516 -8048143.433866137
- ll2 -72.49657618294378 21.186948515453675
-EPSG:3347
- ll 74.73911780458526 -77.94211478021433
- en 6601505.824749662 4278512.727219936
- ll2 74.73911780458528 -77.94211478021433
-EPSG:3348
- ll 73.20432413673824 -100.15484319254261
- en 5937833.634238766 4082614.146171818
- ll2 73.2043241367392 -100.15484319254263
-EPSG:3350
- ll -24.839762989682242 23.35255200404102
- en 391897.85697806405 -2760041.5604056735
- ll2 -24.839762975295724 23.352552028087594
-EPSG:3351
- ll 87.65559272175497 21.730252035995107
- en 1235438.4619477873 9729608.804036418
- ll2 87.65559272079562 21.730252160681577
-EPSG:3352
- ll -39.16654200191486 31.664435148855205
- en 2571177.8121737298 -4354601.2665901
- ll2 -39.16654198480858 31.6644351775463
-EPSG:3353
- ll 40.45145169248457 9.242314426245443
- en 520547.97072178713 1.4477971423619019E7
- ll2 40.45145169248457 9.242314426245443
-EPSG:3354
- ll -30.88069773807836 11.445795338848525
- en 733824.54828061 6581006.785134506
- ll2 -30.880697738070907 11.445795338863931
-EPSG:3355
- ll -0.04483492423979385 26.110860307047894
- en 69905.97417740105 -2515128.8596038087
- ll2 -0.04483492413275244 26.11086031307001
-EPSG:3358
- ll 19.47195923625892 -96.571690240957
- en -1292650.3184103924 -1434390.6278839293
- ll2 19.471959236258897 -96.57169024095701
-EPSG:3360
- ll -8.610781474115623 -77.47249710163867
- en 1110978.3889457094 -4897296.581028383
- ll2 -8.610781474115605 -77.47249710163867
-EPSG:3361
- ll 34.80177023987789 2.8807546205175356
- en 2.450738674844925E7 1.0750803909388814E7
- ll2 34.80177023987806 2.880754620517535
-EPSG:3362
- ll -13.781458385332346 -126.92089889587459
- en -7107859.7602094505 -4706295.961375923
- ll2 -13.781458385332321 -126.92089889587459
-EPSG:3363
- ll 1.4009284295545363 -3.5638977675369574
- en 3.177750378228812E7 -1631859.615046988
- ll2 1.4009284295545625 -3.5638977675369574
-EPSG:3364
- ll 26.726772156763722 -31.72962736247385
- en 5094214.123154859 -213852.98720623396
- ll2 26.72677215676323 -31.72962736247386
-EPSG:3365
- ll 9.389326840388684 -54.088955547962286
- en 1.1604716595716964E7 -1.0116809974027744E7
- ll2 9.3893268403887 -54.088955547962286
-EPSG:3367
- ll 25.74590928407183 -21.248641862713534
- en -127485.64834025677 2862215.1159095694
- ll2 25.745909282651002 -21.248641865165073
-EPSG:3368
- ll 70.90910540330796 -2.8724501981986155
- en 723357.9393158507 7878319.395442829
- ll2 70.90910540145829 -2.872450208407696
-EPSG:3369
- ll -4.296270236153788 2.045902366132836
- en 1060647.3289054043 -476685.27922098764
- ll2 -4.296270236080879 2.045902364234225
-EPSG:3372
- ll -33.94401284093012 177.70899713330803
- en 1120503.9270474575 -3776289.3307196177
- ll2 -33.94401283690746 177.70899713565458
-EPSG:3373
- ll 87.58740389375788 171.20291560249007
- en 472800.6785731337 9729977.828355165
- ll2 87.58740389376098 171.20291560970463
-EPSG:3374
- ll 78.51817978564588 -6.922293464247268
- en 546163.1110204371 8717274.610948097
- ll2 78.51817978564512 -6.9222934642479235
-EPSG:3375
- ll 7.603884751165741 103.82187654429599
- en 647063.1666895939 841122.6117818714
- ll2 7.603884751165123 103.82187654429599
-EPSG:3376
- ll 5.904708830453727 117.43436244027046
- en 859407.5182544761 654817.3311130892
- ll2 5.9047088304532265 117.43436244027046
-EPSG:3377
- ll 47.11421619055568 103.19030958443444
- en -32844.9163092507 4994126.090052973
- ll2 47.11421619056101 103.19030958443244
-EPSG:3378
- ll 78.7974274072389 101.13949854254088
- en -14451.384896908814 8450153.972984662
- ll2 78.7974274072917 101.13949854293958
-EPSG:3379
- ll 15.63252242978811 103.23799863641491
- en 85887.51103978144 1318852.5411865967
- ll2 15.632522429909951 103.23799863682747
-EPSG:3380
- ll 13.786935398008808 101.90297586830187
- en 20729.76868430928 1173862.930983331
- ll2 13.78693539801997 101.90297586832556
-EPSG:3381
- ll 42.025086023901 103.08671915591242
- en 20956.06883215178 4107532.2933163065
- ll2 42.025086023901004 103.08671915591242
-EPSG:3382
- ll -38.28044588242306 100.85467659396859
- en 44626.005783910034 -4838186.478426828
- ll2 -38.28044588252797 100.8546765940623
-EPSG:3383
- ll 46.70050828072263 100.78322067694343
- en 11231.039654125318 4514400.371860767
- ll2 46.70050828072342 100.78322067694361
-EPSG:3384
- ll -19.995914853059404 100.68989383586937
- en -13137.068780516976 -2615764.4429493556
- ll2 -19.995914853059514 100.68989383586933
-EPSG:3385
- ll -3.1187752316797486 103.18763128381843
- en 112422.04595029319 -996595.5273965616
- ll2 -3.1187752316773554 103.1876312838392
-EPSG:3386
- ll 29.670505799768463 23.49477400554146
- en 1032494.6467061947 3296379.395517965
- ll2 29.67050582623625 23.494774021054813
-EPSG:3387
- ll -52.76171335269074 30.94887825309963
- en 5361478.9723264165 -5850183.20981463
- ll2 -52.7617133395343 30.948878280585614
-EPSG:3388
- ll -33.52980750015729 -89.23225275232632
- en -1.1618576386593E7 -2934113.795874448
- ll2 -33.52980750284078 -89.23225276237449
-EPSG:3389
- ll -81.30600192486517 173.41336666779384
- en 6.038888937359719E7 -9037415.984878898
- ll2 -81.30600191086585 173.41336645373553
-EPSG:3390
- ll -14.405842497397487 178.07028454731855
- en 6.0291723273757115E7 -1594062.865175887
- ll2 -14.405842485032583 178.0702845286069
-EPSG:3391
- ll -56.672532176584824 41.782966134616466
- en 670808.7637569912 -6284428.10174258
- ll2 -56.672531974173424 41.78296579639844
-EPSG:3392
- ll -15.989738986371705 45.45172114513009
- en 548619.5919380804 -1768082.6896635909
- ll2 -15.989738893619213 45.45172107429904
-EPSG:3393
- ll -40.95992404191779 54.929769573542735
- en 830983.6759479851 -4541848.290955922
- ll2 -40.95992382759875 54.92976939302422
-EPSG:3394
- ll 74.15536902239852 118.43437962803992
- en 4548183.947118388 7471576.263002212
- ll2 74.1553690365719 118.43437942320531
-EPSG:3395
- ll 51.515745208819084 -58.83560333089507
- en -6549549.40331027 6679566.501710905
- ll2 51.51574520881046 -58.83560333089507
-EPSG:3396
- ll -45.81696628875136 15.951572409267717
- en 4040160.373235602 -5098782.563833476
- ll2 -45.81696627931158 15.951572399392127
-EPSG:3397
- ll -63.26328466956737 18.25205501207654
- en 4813542.384278078 -7032290.278704176
- ll2 -63.26328466550116 18.252055001636723
-EPSG:3398
- ll 85.9780107715087 8.689501002962531
- en 4474083.07103348 9552434.938065065
- ll2 85.97801077150814 8.689501003008159
-EPSG:3399
- ll -47.00503459201144 21.583301724317067
- en 6000514.0658448525 -5228353.258120056
- ll2 -47.00503458491645 21.583301717864135
-EPSG:3400
- ll 36.060961069412514 -112.59410362962392
- en 716603.7218344051 3991790.928437771
- ll2 36.060961069402246 -112.5941036296089
-EPSG:3401
- ll -87.09981808139845 -108.76053485609228
- en 35163.216639868086 -9672207.308703326
- ll2 -87.0998180814057 -108.7605348701099
-EPSG:3402
- ll -19.751612175075905 -116.04119973912626
- en 390954.2356007589 -2183456.0085545313
- ll2 -19.751612175075852 -116.04119973912621
-EPSG:3403
- ll -47.60171093293293 -110.94493348263906
- en 304665.76071424107 -5277892.003868185
- ll2 -47.60171093252753 -110.94493348259796
-EPSG:3404
- ll 65.52994087854837 -56.53895611001036
- en 6028301.850484862 1.2684101978991548E7
- ll2 65.52994087854914 -56.53895611001035
-EPSG:3405
- ll 49.078539254353615 106.19415864467432
- en 587008.3855027112 5436955.099474885
- ll2 49.07853924569182 106.1941586748976
-EPSG:3406
- ll -37.619994996060285 112.8248730526147
- en 660858.6891887006 -4165151.267081174
- ll2 -37.619994986865436 112.82487301857175
-EPSG:3407
- ll 18.28927839423487 114.75683619787524
- en 332638.8656906112 -1398223.448785388
- ll2 18.289278394274163 114.75683619794566
-EPSG:3408
- ll 56.4371653980418 120.02992240054527
- en 3185162.285679176 1841172.8831228162
- ll2 56.437165398041806 120.02992240054527
-EPSG:3409
- ll -36.475388175685204 -48.605928844375356
- en -4304382.437151196 3794032.0550085097
- ll2 -36.475388175685204 -48.605928844375356
-EPSG:3411
- ll 62.504702046397696 25.766304207014116
- en 2865362.3254268947 -999714.600756276
- ll2 62.50470204639703 25.766304207014116
-EPSG:3412
- ll 5.5456145506551735 113.44116465196214
- en 1.2456540624047967E7 -5401055.202958997
- ll2 5.545614550654708 113.44116465196215
-EPSG:3413
- ll -51.11789234221518 -43.8924520774672
- en 671732.6281162747 -3.474581088126993E7
- ll2 -51.11789234220589 -43.8924520774672
-EPSG:3414
- ll 31.97641154465049 97.36646387676508
- en -583803.1317721747 3445195.1412286814
- ll2 31.976411541865634 97.36646387397886
-EPSG:3415
- ll -30.994992732808946 167.7480124219903
- en 8166766.404719275 -4836695.045242775
- ll2 -30.994992732400487 167.74801242207616
-EPSG:3416
- ll 77.3225647750454 47.43942575855422
- en 1388474.7018671655 4146950.758757076
- ll2 77.32256477504627 47.43942575855422
-EPSG:3417
- ll 44.18912651285786 -69.4111928109586
- en 1.1156594569550347E7 5155392.16415742
- ll2 44.18912651285788 -69.4111928109586
-EPSG:3418
- ll 26.938583580368167 -91.4657893497869
- en 2322711.1245551677 -4796180.891872249
- ll2 26.938583580368203 -91.4657893497869
-EPSG:3419
- ll 67.88431942722714 -176.30459798723385
- en -9836616.34205612 1.6471274662641015E7
- ll2 67.88431942722715 -176.30459798723388
-EPSG:3420
- ll 40.452698214977424 -135.39152432357076
- en -8698143.721725613 4698172.109362132
- ll2 40.45269821497747 -135.39152432357076
-EPSG:3421
- ll 82.97404543007596 -121.24191206227495
- en 402966.17943179625 4.387667961953648E7
- ll2 82.97404543001254 -121.24191205659197
-EPSG:3422
- ll 68.46803685747142 -113.28129519299648
- en 2095284.3567691345 3.2003430167592432E7
- ll2 68.46803685740099 -113.28129519304241
-EPSG:3423
- ll -6.174819984855887 -117.34891563696742
- en 3072892.600015271 -1736762.9784013836
- ll2 -6.174819984855873 -117.34891563696834
-EPSG:3424
- ll 17.76892851912754 -77.17849501286652
- en -439925.32295796886 -7651997.469073983
- ll2 17.76892851912345 -77.17849501285711
-EPSG:3425
- ll 41.89559392176718 -41.642822446773465
- en 1.8171617387101337E7 7621380.740088956
- ll2 41.89559392176728 -41.64282244677345
-EPSG:3426
- ll 26.257297293977366 -163.03365535739607
- en -1.946104556594506E7 3854535.230148632
- ll2 26.25729729397692 -163.03365535739607
-EPSG:3427
- ll 75.48138533758546 -19.41804434997502
- en 9840026.013028406 1.8751518416512903E7
- ll2 75.48138533758639 -19.418044349975023
-EPSG:3428
- ll -3.2632493857092797 -40.098891568436414
- en 2.659828647559929E7 -6281944.969050034
- ll2 -3.263249385709247 -40.098891568436414
-EPSG:3429
- ll -48.73993302976968 -116.12940825330406
- en 524405.7556904682 -4090489.6862795884
- ll2 -48.73993302976983 -116.12940825330406
-EPSG:3430
- ll 86.97387520734867 -109.7143358373049
- en 1774569.169149492 3.8776199838355966E7
- ll2 86.97387520738172 -109.7143358746389
-EPSG:3431
- ll -31.287638892482306 -122.03710578964368
- en 1545550.4625017778 -1.0873157533564959E7
- ll2 -31.287638892419203 -122.03710578975253
-EPSG:3432
- ll -39.553639743676406 -72.7251957504364
- en 992547.1787108394 -2.8479627421938367E7
- ll2 -39.553639743674346 -72.72519575043363
-EPSG:3433
- ll 81.33389074814349 -82.9864241854618
- en 2192070.7037630053 2.0148902527433183E7
- ll2 81.33389074814347 -82.9864241854618
-EPSG:3434
- ll 72.74486353891946 -137.63768009282362
- en -5328533.964882087 1.89273443951022E7
- ll2 72.74486353891946 -137.63768009282362
-EPSG:3435
- ll 37.2031192971326 -83.06649199018429
- en 2518783.9876683555 238029.20217079236
- ll2 37.20311929592064 -83.06649198938639
-EPSG:3436
- ll 33.64273552130247 -86.88462170005735
- en 3295667.2187014595 -1084743.7502631657
- ll2 33.642735521247495 -86.88462169997355
-EPSG:3437
- ll -20.256971204519388 -70.70825693053003
- en 1312763.9934131093 -2.2795390141161755E7
- ll2 -20.256971204519388 -70.70825693053006
-EPSG:3438
- ll -40.3474034106329 -74.07044497850174
- en -388432.39843934175 -2.959655592148037E7
- ll2 -40.347403410612834 -74.07044497852075
-EPSG:3439
- ll -21.579634118744806 54.347820029957006
- en 846488.3448870167 -2390129.364059749
- ll2 -21.579634006525414 54.34781999553333
-EPSG:3440
- ll -13.105716432922563 52.027531446996626
- en -39851.38193721336 -1454296.1212398775
- ll2 -13.10571635123028 52.02753140908053
-EPSG:3441
- ll 58.55017474509812 -42.51419050865866
- en 1.1257082451606248E7 1.1639597459959814E7
- ll2 58.55017474509858 -42.51419050865866
-EPSG:3442
- ll 16.002708680265336 -98.75991058123783
- en -1173433.0920369439 -4765735.763456243
- ll2 16.002708680265314 -98.75991058123783
-EPSG:3443
- ll -19.312494843096033 -87.75495316935326
- en 1183670.5919460664 -2.032714256311467E7
- ll2 -19.312494843096015 -87.75495316935327
-EPSG:3444
- ll -54.023563455361746 -84.14072924098583
- en 3591472.114125421 -3.301925658027603E7
- ll2 -54.02356345088337 -84.14072924602446
-EPSG:3445
- ll -62.042626343656096 -74.9672978525904
- en 417826.22703040845 -3.80342589947304E7
- ll2 -62.04262634355939 -74.96729785256353
-EPSG:3446
- ll 43.96793662737352 -69.27073622395608
- en 915016.548741198 1059206.2723238212
- ll2 43.967936627363486 -69.27073622394867
-EPSG:3447
- ll 15.38096991183301 65.26351272233433
- en 7017854.464059286 -1003996.6670107152
- ll2 15.380969911833008 65.26351272233431
-EPSG:3448
- ll -1.9282004121779508 -35.17480647361137
- en 5644935.047339973 -1043992.5617861091
- ll2 -1.928200412177917 -35.17480647361138
-EPSG:3449
- ll 10.283952947138616 -77.71232824150604
- en 860183.1832664197 1138653.9646149524
- ll2 10.283952947129384 -77.71232824161828
-EPSG:3450
- ll 3.653378769593502 -70.35305018743156
- en 1016611.221288545 405150.76893541793
- ll2 3.6533787695583313 -70.35305018859384
-EPSG:3451
- ll 19.88427761270284 -14.191113943129778
- en 2.8430650922890116E7 5614659.558221754
- ll2 19.884277612702856 -14.191113943129793
-EPSG:3452
- ll -16.42727303083369 -67.51847819221294
- en 1.4641667555755984E7 -1.705854323068911E7
- ll2 -16.42727303083367 -67.51847819221294
-EPSG:3453
- ll 59.991134547484606 -66.69333042192497
- en 8764425.645312538 1.3908740934695555E7
- ll2 59.99113454748456 -66.69333042192497
-EPSG:3455
- ll 54.015982419045486 -160.22853088578228
- en -1.0033358488434633E7 8808930.872904269
- ll2 54.01598241904547 -160.2285308857823
-EPSG:3456
- ll -23.335326668418418 -82.71904282833681
- en 8426097.890641205 -2.271399728554935E7
- ll2 -23.335326668418233 -82.71904282833681
-EPSG:3457
- ll 33.2880950441068 -101.56676893289617
- en 152660.3990930262 1881984.7520761113
- ll2 33.288095044107 -101.5667689328962
-EPSG:3458
- ll 76.33302593073726 -99.62591510249126
- en 2008775.6697410636 1.265003688487506E7
- ll2 76.3330259307382 -99.62591510249128
-EPSG:3459
- ll -10.639471046810076 -59.13460605125768
- en 2.325012086174388E7 -1.6863726605813857E7
- ll2 -10.639471046810058 -59.134606051257684
-EPSG:3460
- ll 74.61848525140107 179.22022394812495
- en 2013920.9077521877 1.4163187604458874E7
- ll2 74.61848525128906 179.22022394809127
-EPSG:3461
- ll 70.1492549529807 -19.004465134347782
- en 348321.62350217847 7787358.368443727
- ll2 70.14925493778371 -19.004465130489944
-EPSG:3462
- ll 17.12958650497488 -14.74031206605041
- en -111474.29148346849 1902820.2817433076
- ll2 17.129586506862328 -14.740312066247833
-EPSG:3463
- ll 1.7837645123114356 -62.52568744867912
- en 1235900.5749602045 -4619613.498893951
- ll2 1.7837645121232057 -62.525687459143114
-EPSG:3464
- ll -18.634314024364073 -62.47915244728682
- en 1202517.4974198479 -6892381.5532120345
- ll2 -18.634314022982227 -62.47915244758263
-EPSG:3465
- ll 57.50266941138753 -84.89022177791148
- en 256536.6308567793 3000624.0619624415
- ll2 57.502669411387885 -84.89022177791145
-EPSG:3466
- ll 78.13639510727023 -85.39379084560053
- en 648343.4039377524 5357461.4065726
- ll2 78.1363951072702 -85.3937908456013
-EPSG:3467
- ll -73.9862526727856 -122.75997024118863
- en 6172109.842855089 -7334457.406133478
- ll2 -73.98625267278658 -122.75997024118861
-EPSG:3468
- ll 55.27914835098413 -133.07430605327352
- en 856334.8798987279 383668.5920409644
- ll2 55.27914835098039 -133.07430605327355
-EPSG:3469
- ll 38.46365783455556 -144.9643674132817
- en 241279.660728812 -1722613.7429639571
- ll2 38.46365783451337 -144.96436741332553
-EPSG:3470
- ll 48.43754605068554 -144.40491083331452
- en 618010.4648986936 -617544.5445526908
- ll2 48.43754605068414 -144.40491083331355
-EPSG:3471
- ll 3.3087131612919194 -146.21000156994472
- en 921467.4654345941 -5618685.950678178
- ll2 3.308713161283496 -146.21000157031008
-EPSG:3472
- ll -7.241491222457199 -152.8939769203309
- en 622141.5422324135 -6786151.303047174
- ll2 -7.24149122245726 -152.89397692033145
-EPSG:3473
- ll 65.57558286838966 -157.2809945879935
- en 533183.9855294368 1289659.4280454733
- ll2 65.57558286839043 -157.28099458799343
-EPSG:3474
- ll 21.009374213828266 -156.3264758591752
- en 1090504.6079513696 -3650929.376377546
- ll2 21.009374213270338 -156.32647585860425
-EPSG:3475
- ll -21.865421140992893 -159.27993897548575
- en 1195671.626980296 -8419216.239118796
- ll2 -21.865421139277384 -159.2799389736892
-EPSG:3476
- ll 55.297549956417896 -170.35776329182823
- en 477277.31318651454 144483.2897294878
- ll2 55.29754995641826 -170.35776329182826
-EPSG:3477
- ll 25.40445587287391 -104.3099772181692
- en 7716711.964684211 708721.61411889
- ll2 25.404455872873566 -104.30997721816921
-EPSG:3478
- ll 52.86338430164224 -116.81236493110359
- en -116218.33551094239 2439436.8117295033
- ll2 52.86338430032937 -116.8123649305159
-EPSG:3479
- ll -32.97241803583459 -118.22829466878433
- en -1237191.1067047212 -2.3286412587982155E7
- ll2 -32.97241803322729 -118.22829467114373
-EPSG:3480
- ll 1.627074183332624 -106.04412299210513
- en 672448.1195431768 -3250266.605687427
- ll2 1.6270741833253684 -106.04412299271232
-EPSG:3481
- ll 54.87977988690082 -110.16959519672837
- en 699383.3665940337 8702780.551524833
- ll2 54.879779886901154 -110.16959519672838
-EPSG:3482
- ll -43.995918179390834 -118.23859947862826
- en -146667.3885973519 -8313595.4411054645
- ll2 -43.99591817872292 -118.23859947877528
-EPSG:3483
- ll -19.26589475158805 -111.09022044947245
- en 1617539.952298596 -1.825409256186685E7
- ll2 -19.26589475158366 -111.09022044947608
-EPSG:3484
- ll -17.462581974004117 -170.45141699333098
- en -1.0814839117271848E7 -1900520.4648175146
- ll2 -17.462581974004085 -170.45141699333104
-EPSG:3485
- ll 43.20298185741652 -158.73063634540284
- en -1.529962643345025E7 9093603.917525707
- ll2 43.20298185741659 -158.73063634540281
-EPSG:3486
- ll 69.7770803634056 -19.80513445181407
- en 3730691.6583130136 6091974.836480111
- ll2 69.77708036340651 -19.805134451814073
-EPSG:3487
- ll 41.544023005765865 -9.873348524173139
- en 2.1636914531747848E7 1.3172503804395353E7
- ll2 41.544023005765936 -9.873348524173139
-EPSG:3488
- ll -83.63419952079393 22.014501552909223
- en 1.683996332038739E7 7083092.09856865
- ll2 -83.63419952079464 22.01450155290922
-EPSG:3489
- ll 74.64075090762618 -107.16179495655916
- en 2561051.774803074 4775118.132277053
- ll2 74.64075090762714 -107.16179495655916
-EPSG:3490
- ll -2.5143364808140127 -59.653328036010365
- en 3.364793287031159E7 -4983525.884679978
- ll2 -2.5143364808139768 -59.65332803601038
-EPSG:3491
- ll 54.40285546104802 -115.76856274830942
- en 2420529.6480387193 2396477.4233952197
- ll2 54.40285546104834 -115.76856274830942
-EPSG:3492
- ll 69.24647844210506 -109.3425020787793
- en 8524902.655783555 1.3947658172664968E7
- ll2 69.24647844210598 -109.34250207877932
-EPSG:3493
- ll 39.96451046293556 -39.88629514792382
- en 8070900.135230476 3673977.8885507267
- ll2 39.96451046293564 -39.88629514792382
-EPSG:3494
- ll 83.49365064620203 -140.6656817029858
- en 5012856.891255203 2.2076608973426435E7
- ll2 83.4936506462026 -140.6656817029858
-EPSG:3495
- ll -21.479089462572542 -52.5996087167715
- en 1.2341106401932186E7 -3260974.4596206164
- ll2 -21.479089462572418 -52.5996087167715
-EPSG:3496
- ll 40.28017017515979 -107.20666383843667
- en 9850491.411712062 3644831.562767039
- ll2 40.28017017515991 -107.2066638384367
-EPSG:3497
- ll 53.15316622767642 -68.27006631430517
- en 5380619.826329514 3575492.646943226
- ll2 53.1531662276767 -68.27006631430518
-EPSG:3498
- ll -0.1938757686988275 -118.56168321111116
- en 6317688.703786873 -1.137180548796184E7
- ll2 -0.1938757686987933 -118.56168321111117
-EPSG:3499
- ll 1.6146021805470419 -48.23305341558418
- en 1.0131056924036564E7 -307931.29605835455
- ll2 1.614602180547075 -48.233053415584166
-EPSG:3500
- ll 50.39050885119015 -169.59602757660915
- en -5938696.853240131 1.1648884342224179E7
- ll2 50.390508851190376 -169.59602757660915
-EPSG:3501
- ll 78.48749514741456 -148.8452631386203
- en -443539.93060253735 5676745.342012753
- ll2 78.48749514741544 -148.8452631386203
-EPSG:3502
- ll 11.017647910465598 -40.26338412359357
- en 2.6937388454389364E7 -154991.5188640482
- ll2 11.01764791046563 -40.263384123593575
-EPSG:3503
- ll 70.14606901205501 -53.19365772908357
- en 3153373.230592276 4605922.39234271
- ll2 70.14606901205596 -53.19365772908355
-EPSG:3504
- ll -0.8531378234559703 -174.56372444137574
- en -2.576334466784155E7 -3057548.570158678
- ll2 -0.8531378234559315 -174.5637244413757
-EPSG:3505
- ll -12.922344979992939 -131.4419856110465
- en -3088731.368285379 -5384902.473154039
- ll2 -12.922344979992918 -131.4419856110465
-EPSG:3506
- ll 31.230597419539926 -153.64634358130226
- en -1.1484060688210374E7 2834314.453984081
- ll2 31.230597419538125 -153.64634358130223
-EPSG:3507
- ll 14.829246034295508 -108.92820961182844
- en -3871807.1975934412 -1944645.8612390636
- ll2 14.829246034295519 -108.92820961182844
-EPSG:3508
- ll 18.464936132471067 -150.15209044505107
- en -2.4188603680794083E7 4249879.987360305
- ll2 18.464936132471056 -150.15209044505113
-EPSG:3509
- ll 86.9624721314905 -79.17243892097271
- en 177786.98050517947 5455897.34725968
- ll2 86.96247213149034 -79.17243892082975
-EPSG:3510
- ll 46.65357841868175 -73.1877730989668
- en 1215909.678509967 3161565.9732637233
- ll2 46.65357841867084 -73.18777309896079
-EPSG:3511
- ll -22.200796476462756 -82.98446902518077
- en -4648.198365824355 -5149280.529031362
- ll2 -22.200796476461715 -82.98446902518161
-EPSG:3512
- ll -70.73789968603366 -84.03626384886903
- en 289409.33672195335 -3.459865567717435E7
- ll2 -70.73789968600592 -84.03626384885096
-EPSG:3513
- ll 29.882704127228095 -141.7465632078823
- en -4968729.885207496 1933400.5144312847
- ll2 29.882704127226823 -141.7465632078823
-EPSG:3514
- ll 23.849988819498975 -22.456974393319967
- en 6648422.983969588 1115561.4876389855
- ll2 23.849988819498794 -22.456974393319978
-EPSG:3515
- ll 51.980769320771635 -43.460970937816356
- en 1.1784793830392316E7 1.0370422242815468E7
- ll2 51.98076932077188 -43.460970937816356
-EPSG:3516
- ll 74.84720930987424 -87.66589459990342
- en 34858.32393759041 5625232.86491344
- ll2 74.84720930923176 -87.6658945945815
-EPSG:3517
- ll 18.603120349567433 -81.48560493708129
- en 834270.6199207432 -2081216.8962623046
- ll2 18.6031203495674 -81.48560493708128
-EPSG:3518
- ll -56.07695396634822 -82.06949435771202
- en 206050.19084120836 -9536295.19215372
- ll2 -56.076953966348604 -82.069494357712
-EPSG:3519
- ll -37.25144573303203 -88.35250888683622
- en -1145093.832189857 -2.448080791239921E7
- ll2 -37.25144572987917 -88.35250888787122
-EPSG:3520
- ll -6.873050752997713 -87.60800597152337
- en 319460.8272831567 -4081093.3385948795
- ll2 -6.873050752988863 -87.60800597133803
-EPSG:3521
- ll 38.49568265916788 -81.93121820350775
- en 2936371.2382702986 3099338.8153543794
- ll2 38.495682659160096 -81.93121820349809
-EPSG:3522
- ll 27.359121118295022 -111.80047467412024
- en 717635.5065501658 -1585186.3895117417
- ll2 27.359121118291586 -111.80047467411369
-EPSG:3523
- ll 75.76657162341809 -120.99639377727215
- en 1011580.1945632893 1.2496856533036584E7
- ll2 75.7665716216415 -120.99639374099078
-EPSG:3524
- ll -19.592943762574194 -107.62822156707453
- en 676507.771591702 -6787898.866761831
- ll2 -19.59294376244989 -107.62822156702786
-EPSG:3525
- ll 5.655256650006947 -109.78895720584116
- en 1520556.335969037 -1.3085663987044694E7
- ll2 5.65525665000622 -109.78895720586843
-EPSG:3526
- ll 29.5521155894713 -119.67841818690907
- en 419142.17209375644 -1337611.8207329602
- ll2 29.552115589355953 -119.67841818712527
-EPSG:3527
- ll -36.7186686917453 -111.66875149738559
- en 3821111.2625461733 -2.8500921139854185E7
- ll2 -36.71866869148953 -111.66875149713003
-EPSG:3528
- ll 66.28977848692853 -95.04408653300331
- en -764.4252860956476 3311701.5815421636
- ll2 66.2897784819686 -95.04408651169285
-EPSG:3529
- ll -42.343134734419 -81.52707916999866
- en 2824705.19686001 -2.8777995245269082E7
- ll2 -42.34313472708146 -81.52707917436642
-EPSG:3530
- ll 15.787563951722476 -87.32646085262886
- en 1004407.8478707017 -2311193.851184748
- ll2 15.787563951717274 -87.32646085265179
-EPSG:3531
- ll -71.0895744131576 -85.78258645298801
- en 2816631.179555087 -3.922269127428474E7
- ll2 -71.08957441291165 -85.78258645348735
-EPSG:3532
- ll -13.590129309827887 -87.09800321363026
- en -54912.3931883465 -5405266.983989717
- ll2 -13.590129309827812 -87.09800321362916
-EPSG:3533
- ll -71.30156296520352 -84.82757912293202
- en 426618.2498940204 -3.876634142180364E7
- ll2 -71.30156296520441 -84.82757912293201
-EPSG:3534
- ll -26.593571439642297 -90.84257150704994
- en 525395.531488511 -6849870.052261228
- ll2 -26.593571439574834 -90.84257150718877
-EPSG:3535
- ll -73.81730001350874 -93.48130704397715
- en 2300665.610064705 -3.972168687911971E7
- ll2 -73.81730001197059 -93.48130702822925
-EPSG:3536
- ll 29.675073130081906 -174.77555994577608
- en -5374433.715563448 3261226.48129079
- ll2 29.675073130080698 -174.7755599457763
-EPSG:3537
- ll 78.58441958196116 -24.79626456174836
- en 1.0992225916845141E7 2.069431352465775E7
- ll2 78.58441958196204 -24.796264561748377
-EPSG:3538
- ll 50.56206473122687 -105.50276438240007
- en -359760.3887005184 1238032.516230829
- ll2 50.56206473122708 -105.50276438240007
-EPSG:3539
- ll 22.890388614865174 -52.95399384649079
- en 1.5440777746762784E7 -3056328.465529645
- ll2 22.89038861486502 -52.95399384649079
-EPSG:3540
- ll 5.712638843383566 -30.039831247560954
- en 8404436.758004656 -665650.7071147216
- ll2 5.712638843383611 -30.039831247560954
-EPSG:3541
- ll 66.91007007748243 -134.122927701796
- en -4540095.52625586 1.2093712954211377E7
- ll2 66.91007007748324 -134.122927701796
-EPSG:3542
- ll 86.76774070913261 -97.04088241706604
- en 422272.94652887346 7313467.614872933
- ll2 86.76774070913288 -97.04088241706604
-EPSG:3543
- ll 30.398818360306727 -56.419769233082874
- en 1.4239912468533851E7 1991913.826570972
- ll2 30.39881836030527 -56.419769233082874
-EPSG:3544
- ll 18.448068427794695 -154.07641476183983
- en -6581824.255253992 666096.3080378005
- ll2 18.44806842779468 -154.07641476183983
-EPSG:3545
- ll -14.958350134238644 -82.95268186542633
- en 2326546.7084640516 -2.1986426099877756E7
- ll2 -14.958350134238634 -82.95268186542633
-EPSG:3546
- ll 35.61058315289325 -161.7718911284307
- en -4655174.731303556 3575347.4105189955
- ll2 35.61058315289341 -161.77189112843072
-EPSG:3547
- ll -10.883123953673984 -164.1307852189833
- en -2.9948755646754414E7 -485029.19385696005
- ll2 -10.88312395367396 -164.13078521898336
-EPSG:3548
- ll -0.1670542189300228 -132.85540634780267
- en -5628692.76320277 -2272852.233372302
- ll2 -0.16705421893000208 -132.85540634780267
-EPSG:3549
- ll 70.10557527737436 -125.57737986100663
- en -4358390.536945895 1.6095201702870682E7
- ll2 70.10557527737528 -125.57737986100663
-EPSG:3550
- ll 68.20464459325194 -87.17122398969882
- en 1288151.2922287416 4550371.170286727
- ll2 68.20464459325278 -87.17122398969882
-EPSG:3551
- ll -23.124629413198058 -102.16257463530202
- en -1791639.7273564283 -2.2600090696068946E7
- ll2 -23.124629413197887 -102.16257463530201
-EPSG:3552
- ll -0.7956268858565565 -121.60763210904318
- en -2819395.5672218814 -2896851.4639341007
- ll2 -0.7956268858565299 -121.60763210904317
-EPSG:3553
- ll 39.34508600685591 -57.485047614357185
- en 1.2845182363250846E7 5384945.919892925
- ll2 39.345086006855986 -57.48504761435721
-EPSG:3554
- ll 78.39930743525821 -72.6639852121036
- en 420571.4306088282 3890473.001134058
- ll2 78.39930743523963 -72.66398521202424
-EPSG:3555
- ll 4.526967338225958 -67.23094368073187
- en 771473.9084710939 -4354608.549567792
- ll2 4.526967338225954 -67.23094368073191
-EPSG:3556
- ll -11.872015777787524 -75.20048025206579
- en -226317.3076399163 -6061577.759677992
- ll2 -11.872015777664672 -75.200480251286
-EPSG:3557
- ll -23.89736774889451 -64.67518746435442
- en 689646.2847408468 -7485233.167629692
- ll2 -23.8973677488356 -64.67518746424611
-EPSG:3558
- ll 1.3333630271354622 -71.59424225468845
- en 741114.5172359842 -4596569.48943599
- ll2 1.3333630271354446 -71.59424225468628
-EPSG:3559
- ll 49.47407667534159 -110.95589460437122
- en -2048449.4382519936 1779519.553168131
- ll2 49.47407667534176 -110.95589460437122
-EPSG:3560
- ll 29.65451649353067 -95.8887603733244
- en 6669229.645871362 -180718.5687760208
- ll2 29.65451649353067 -95.8887603733244
-EPSG:3561
- ll -48.995473981464 -151.746113478898
- en 1400218.9948289548 -2.466763042234545E7
- ll2 -48.995474012375226 -151.7461135530634
-EPSG:3562
- ll 42.17878042303144 -155.28361297599514
- en 873933.3709941851 7950773.009507042
- ll2 42.178780357517 -155.28361291565793
-EPSG:3563
- ll -59.19408552996596 -152.78274177206094
- en 1476676.1378109003 -2.925587677828289E7
- ll2 -59.194085550940414 -152.78274184189303
-EPSG:3564
- ll 83.31255203726658 -161.72482885050903
- en 404144.9405563425 2.244202571031081E7
- ll2 83.3125519858995 -161.72482766209836
-EPSG:3565
- ll -23.476811071595364 -157.31688735294873
- en 1454494.2771864124 -1.6393842384284118E7
- ll2 -23.476811077860233 -157.31688742018
-EPSG:3566
- ll 33.14235120757385 -64.04337139318041
- en 1.5585700551648665E7 8455688.815432295
- ll2 33.14235120757407 -64.0433713931804
-EPSG:3567
- ll 38.2733531986243 -81.42393867907248
- en 1.0126783891048443E7 1.180409961519428E7
- ll2 38.27335319862438 -81.42393867907248
-EPSG:3568
- ll -3.217639145868379 -34.876949927027624
- en 3.3795614921039365E7 1023170.6861577802
- ll2 -3.2176391458683398 -34.87694992702761
-EPSG:3569
- ll 82.37326624973724 -73.67455958722535
- en 4602463.792274298 2.5643550977295462E7
- ll2 82.37326624973792 -73.67455958722532
-EPSG:3570
- ll 68.09733540767013 -127.02698930283078
- en -890474.7138439451 2.2171998626052156E7
- ll2 68.09733540767101 -127.02698930283078
-EPSG:3571
- ll 80.906666863196 157.2583660657162
- en -392189.14640555927 -935648.0245750285
- ll2 80.90666685766577 157.2583660657162
-EPSG:3572
- ll 7.458553403075413 -85.50430370630873
- en 7588315.883389931 -3620140.6988160303
- ll2 7.458553390877322 -85.50430370630873
-EPSG:3573
- ll 9.389423929435495 -19.828770252110616
- en 8124767.661644364 -1407592.8809790297
- ll2 9.389423914766367 -19.828770252110616
-EPSG:3574
- ll 86.88744519611893 -139.0755239273402
- en -343255.831003588 54830.289689090096
- ll2 86.88744519396403 -139.0755239273402
-EPSG:3575
- ll 75.77170633130498 -127.5909829883412
- en -1068825.424838967 1170143.315165106
- ll2 75.77170632441342 -127.59098298834118
-EPSG:3576
- ll -41.19090654920276 -22.732691872939355
- en -1.069674474156258E7 4481718.303884528
- ll2 -41.19090654862296 -22.732691872939355
-EPSG:3577
- ll -70.69411278767791 102.6093739680284
- en -1880672.563729591 -7421943.654252078
- ll2 -70.6941127876789 102.6093739680284
-EPSG:3578
- ll -43.55107821999116 -83.91886752230685
- en 9049660.470569529 -4728528.9628829025
- ll2 -43.55107821999112 -83.91886752230684
-EPSG:3579
- ll -87.53206332110824 -160.31488937325003
- en -5199133.470945952 -7991277.508466363
- ll2 -87.53206332110925 -160.31488937325005
-EPSG:3580
- ll 86.08601540505187 -107.57897980953747
- en 37637.712563972054 1.1096089622392321E7
- ll2 86.08601540505191 -107.57897980953747
-EPSG:3581
- ll 78.84441152236248 -76.27789358504533
- en 752602.7831028522 1.0454632633373374E7
- ll2 78.84441152236333 -76.27789358504533
-EPSG:3582
- ll 32.69642374721615 -80.48832380350322
- en 233394.63787258632 -1792637.5211306317
- ll2 32.69642374721638 -80.48832380350322
-EPSG:3583
- ll 49.533571823305365 -84.12928474818644
- en -492980.77264107915 1029798.9959023794
- ll2 49.53357182330553 -84.12928474818644
-EPSG:3584
- ll 69.28303791111506 -46.144671150884434
- en 5271826.967716137 1.1343446214559099E7
- ll2 69.28303791111595 -46.14467115088444
-EPSG:3585
- ll 50.87904722700023 -101.48090797298238
- en -1891906.3101378093 2223344.3103070604
- ll2 50.879047227000456 -101.48090797298237
-EPSG:3586
- ll 34.91273542954879 -43.783685799757635
- en 8884128.109985871 1585738.5497299617
- ll2 34.91273542954897 -43.783685799757635
-EPSG:3587
- ll 35.33990665960241 -16.444653184396174
- en 1.1551063098078027E7 1580058.521341926
- ll2 35.33990665960256 -16.444653184396177
-EPSG:3588
- ll 81.7176049545015 -160.57840291415033
- en 1.4737849189220717E7 1.7977419748100176E7
- ll2 81.71760495450222 -160.57840291415033
-EPSG:3589
- ll 80.35434153868107 -67.57239402690617
- en 8480884.860296778 4352536.5501328735
- ll2 80.35434153868187 -67.57239402690618
-EPSG:3590
- ll 40.009403523951974 -110.3332885878961
- en 1.97677600999498E7 -783533.6354598604
- ll2 40.009403523952074 -110.3332885878961
-EPSG:3591
- ll 48.280164905619294 -82.53748689224133
- en 756793.5368136673 864626.219876145
- ll2 48.28016490560443 -82.53748689224135
-EPSG:3592
- ll 30.25737082034415 -4.243788002284475
- en 1.0750701391220797E7 2220552.747719694
- ll2 30.257370820342743 -4.24378800228449
-EPSG:3593
- ll 22.09463106502065 -68.6374628261594
- en 1.8748493724966004E7 -6690137.168378862
- ll2 22.094631065020543 -68.6374628261594
-EPSG:3594
- ll 35.774658279877215 -83.26606558212708
- en 1805915.1573811069 -860825.5245499235
- ll2 35.77465827987737 -83.26606558212708
-EPSG:3595
- ll 78.59091000208359 -122.2549495257889
- en 15887.371705034748 4055302.788321709
- ll2 78.59091000208446 -122.2549495257889
-EPSG:3596
- ll 58.74231879531966 -66.64229056063294
- en 2408911.4557060497 2140666.1016472364
- ll2 58.74231879532012 -66.64229056063293
-EPSG:3597
- ll 41.98441503563987 -84.40920164505735
- en 666652.5012570894 1394626.3769683263
- ll2 41.98441503507738 -84.40920164483487
-EPSG:3598
- ll -59.90371642721018 -83.81679555358205
- en 1904665.7570009136 -3.2539881063598935E7
- ll2 -59.90371642589996 -83.81679555483059
-EPSG:3599
- ll 77.57065862518724 -86.83842199212147
- en 783954.8560139622 5351445.792367854
- ll2 77.57065862516635 -86.83842199219181
-EPSG:3600
- ll -14.759376917132997 -84.82673048517742
- en 4244303.438477499 -1.60895145234754E7
- ll2 -14.759376916792409 -84.82673048615685
-EPSG:3601
- ll -53.400148476542505 -95.85377833789464
- en 276975.52734831127 -9890786.40860728
- ll2 -53.400148476406315 -95.85377833789522
-EPSG:3602
- ll 44.99231972566355 -87.35505047127737
- en 497986.0950316398 1021787.6083350943
- ll2 44.99231972558123 -87.3550504712398
-EPSG:3603
- ll -62.785909958045224 -97.76799844928482
- en 683252.1698942977 -1.0972143641494483E7
- ll2 -62.7859099579578 -97.767998449259
-EPSG:3604
- ll 57.02697929633108 -85.41537326193821
- en 2062662.3286502662 1653246.2435231542
- ll2 57.02697929633152 -85.41537326193821
-EPSG:3605
- ll 62.87768352948514 -167.21078999102428
- en -7206463.04268432 1.0422155464900317E7
- ll2 62.877683529485786 -167.21078999102428
-EPSG:3606
- ll 0.6037900085328047 -15.475421268460963
- en 1.0550748340079978E7 625833.2904639206
- ll2 0.6037900085328416 -15.475421268460966
-EPSG:3607
- ll 80.46374106619137 -110.51992441113362
- en 613514.6111698191 1.1095565462183353E7
- ll2 80.46374106592826 -110.51992442292615
-EPSG:3608
- ll 88.62947168070929 -113.20044358023435
- en 1670775.529473987 3.937560247176302E7
- ll2 88.6294716807094 -113.20044358030398
-EPSG:3609
- ll -30.22946646619193 -110.49657445347593
- en 689939.786021456 797342.3517275266
- ll2 -30.229466465615246 -110.49657445253244
-EPSG:3610
- ll -54.136540286072005 -118.4383579724036
- en 44079.92449529816 -6072020.842199184
- ll2 -54.1365402860206 -118.43835797240789
-EPSG:3611
- ll 51.791313657126295 -123.13450102159366
- en 486092.4488194511 5902881.801014566
- ll2 51.79131365627654 -123.13450102137118
-EPSG:3612
- ll -30.548962907082846 -123.05438254431598
- en 1216631.9925297408 -1.0615553899648484E7
- ll2 -30.54896290680946 -123.05438254478022
-EPSG:3613
- ll 84.1933541513927 -68.51993265345021
- en 335539.02297335624 4647061.081636545
- ll2 84.19335415139193 -68.51993265347889
-EPSG:3614
- ll -63.16095653098144 -71.30333747150625
- en 1044318.1008380915 -3.842893415849778E7
- ll2 -63.1609565309821 -71.30333747150627
-EPSG:3615
- ll 38.231638854024695 -69.27436037890922
- en 607637.0603345771 -53850.36197086769
- ll2 38.231638852788954 -69.27436037823178
-EPSG:3616
- ll 37.789128376693824 -69.12357831956064
- en 2046256.4459088596 -335486.00984750036
- ll2 37.7891283752707 -69.1235783187719
-EPSG:3617
- ll 77.10484076435418 -111.4943826170658
- en 369475.2270278558 5136237.367829259
- ll2 77.10484076409008 -111.49438261434749
-EPSG:3618
- ll 6.900412373527189 -111.44128882215743
- en -244241.3326995403 -8741876.918508938
- ll2 6.9004123733957865 -111.44128882022287
-EPSG:3619
- ll 53.91302116575639 -107.3301744979763
- en -31884.25912287293 2549191.843407941
- ll2 53.91302116568739 -107.33017449798061
-EPSG:3620
- ll -65.75265409160642 -98.14077523864137
- en 1471452.1271360577 -3.5233672951103285E7
- ll2 -65.75265408836424 -98.14077524882083
-EPSG:3621
- ll 1.7639524451418396 -101.18750172232886
- en 1571072.4109609742 -3234328.7633642578
- ll2 1.7639524449463886 -101.18750173328273
-EPSG:3622
- ll 6.914963696659257 -103.80384133193394
- en 4185168.404877974 -8740825.150149109
- ll2 6.914963696634571 -103.80384133237776
-EPSG:3623
- ll -87.43866582509004 -78.66516002946496
- en 239611.6149192393 -1.4144715551931877E7
- ll2 -87.43866582509028 -78.66516002946426
-EPSG:3624
- ll 69.48148978462604 -80.97954417034839
- en 256227.5406495968 1.0786010317103518E7
- ll2 69.48148978432465 -80.97954416985039
-EPSG:3625
- ll -61.942973875011155 -68.3625061618849
- en 471818.51112634584 -1.118469216526434E7
- ll2 -61.942973871068865 -68.36250617038479
-EPSG:3626
- ll 16.82818934061386 -74.29965209393798
- en 562175.5745818686 -8000160.610979791
- ll2 16.828189340613854 -74.29965209393798
-EPSG:3627
- ll 11.144560556608848 -73.31620657661112
- en 384459.19435546437 -3356873.424624185
- ll2 11.144560556608889 -73.31620657661112
-EPSG:3628
- ll 78.70083869958611 -68.394152418379
- en 1554424.77705038 1.5585926991820335E7
- ll2 78.70083869958695 -68.39415241837901
-EPSG:3629
- ll 64.27400324164293 -84.65965719654173
- en 55952.61030600086 2714766.816791575
- ll2 64.27400323841117 -84.65965718826317
-EPSG:3630
- ll 49.6875267817922 -81.06036295090932
- en 561938.8645717101 3541470.1135886037
- ll2 49.68752678177043 -81.06036295091657
-EPSG:3631
- ll -18.964481529162562 -127.44163678509172
- en -6887009.543298195 -4923617.968945006
- ll2 -18.964481529162477 -127.44163678509175
-EPSG:3632
- ll 35.98906976995593 -104.42040535703525
- en -5438442.693596364 1772550.2995553273
- ll2 35.989069769956075 -104.42040535703526
-EPSG:3633
- ll -0.8595040461789765 -160.42342602653227
- en -7685658.982902069 -2548076.9402509006
- ll2 -0.8595040461789549 -160.42342602653224
-EPSG:3634
- ll 49.821536849247835 -28.01084922198578
- en 1.6670014513351513E7 8510777.132639432
- ll2 49.82153684924803 -28.01084922198576
-EPSG:3635
- ll 33.13108136935225 -54.08928331070341
- en 4793273.240983946 -129412.11487783777
- ll2 33.1310813693525 -54.089283310703394
-EPSG:3636
- ll 78.40689011050503 -113.70336435093706
- en 747403.403335453 1.2889985895264463E7
- ll2 78.40689011050588 -113.70336435093706
-EPSG:3637
- ll 61.57753457550591 -128.57130483853174
- en -1916484.188850128 3173229.042158205
- ll2 61.577534575506505 -128.57130483853174
-EPSG:3638
- ll 23.077313838856348 -145.53841263579312
- en -5577464.511903239 570619.7997621138
- ll2 23.077313838856192 -145.5384126357931
-EPSG:3639
- ll 71.7060922436773 -178.67095627494157
- en -2680364.7615580317 5869686.61710898
- ll2 71.70609224367827 -178.67095627494191
-EPSG:3640
- ll 67.6515582604081 -145.99127910114066
- en -5830693.917162242 1.4610746172414973E7
- ll2 67.65155826040898 -145.9912791011407
-EPSG:3641
- ll 44.38885679678788 -52.43263975786505
- en 4162624.289036799 2050820.2287781422
- ll2 44.38885679678798 -52.43263975786504
-EPSG:3642
- ll 17.931688647930613 -27.15707198500192
- en 2.5544695755737673E7 2950172.6723076417
- ll2 17.93168864793061 -27.157071985001906
-EPSG:3643
- ll 38.02199732320736 -162.5461074882279
- en -3152029.826321552 514854.44043290545
- ll2 38.02199732320746 -162.54610748822785
-EPSG:3644
- ll 66.00183899985912 -59.458368929935176
- en 1.0343666624203071E7 1.259801143983148E7
- ll2 66.00183899985993 -59.45836892993515
-EPSG:3645
- ll 71.49612176250487 -103.13077981646184
- en 3201818.613294053 3303647.455213882
- ll2 71.49612176250581 -103.13077981646185
-EPSG:3646
- ll 7.0451598440276975 -132.205889580995
- en 3051066.258066407 -1.3918637052874988E7
- ll2 7.045159844027764 -132.205889580995
-EPSG:3647
- ll 48.148166312844566 -92.3734970144389
- en 3561573.968177663 1070421.6190099951
- ll2 48.1481663128447 -92.37349701443891
-EPSG:3648
- ll 54.81569752675685 -100.31610069024872
- en 9231973.520147437 5349583.705358809
- ll2 54.815697526757184 -100.31610069024869
-EPSG:3649
- ll -15.136427836502357 -43.3688347987209
- en 6231683.097156915 -6054302.762627811
- ll2 -15.136427836502328 -43.368834798720904
-EPSG:3650
- ll 44.051465555815646 -45.04014288488308
- en 1.037405374781932E7 3022414.2692305534
- ll2 44.051465555815724 -45.04014288488308
-EPSG:3651
- ll 62.58265674902681 -155.87514048221988
- en -3236215.9521781527 4473839.86938062
- ll2 62.58265674902745 -155.87514048221988
-EPSG:3652
- ll -15.541684218082368 -36.0554676760767
- en 2.393994559279671E7 -1.8042250051163267E7
- ll2 -15.541684218082334 -36.0554676760767
-EPSG:3653
- ll 72.66034743162629 -77.52096880659127
- en -100066.10938311493 3526012.926080104
- ll2 72.66034743032986 -77.52096879764369
-EPSG:3654
- ll 85.87841058206917 -67.86606201616969
- en 423727.9302558903 1.6380152226286668E7
- ll2 85.8784105820685 -67.8660620162755
-EPSG:3655
- ll 62.67668449980427 -110.95883697847388
- en -1160536.1156888949 3851860.6240288527
- ll2 62.67668449980489 -110.95883697847388
-EPSG:3656
- ll -11.451177970745704 -154.89248305359888
- en -3.0490571500823423E7 -5314074.1002612095
- ll2 -11.451177970745677 -154.8924830535989
-EPSG:3657
- ll 79.88154881807503 -89.86473643550542
- en 867764.6804806693 4384790.460230547
- ll2 79.88154881807581 -89.86473643550543
-EPSG:3658
- ll 80.50171669265181 -43.120399306818
- en 6314839.470564559 1.6233044898811512E7
- ll2 80.5017166926526 -43.120399306817994
-EPSG:3659
- ll 40.93827604066515 -107.19134818058379
- en 22551.265794434934 -131170.43859086605
- ll2 40.93827604066524 -107.19134818058379
-EPSG:3660
- ll 5.089558362281931 -51.09605923214613
- en 2.2649622690312013E7 -8238496.324435525
- ll2 5.089558362281969 -51.096059232146146
-EPSG:3661
- ll -23.258533570189922 -170.76581718065165
- en -1.2089302563557895E7 -1781162.4636833933
- ll2 -23.25853357018975 -170.7658171806516
-EPSG:3662
- ll -11.607109099979949 -10.370176203134264
- en 3.566032783631081E7 -4997577.118766097
- ll2 -11.607109099979942 -10.370176203134248
-EPSG:3663
- ll 88.5915323956641 -17.463133088573528
- en 1703695.676812386 1.2682220018149447E7
- ll2 88.59153239566434 -17.4631330885735
-EPSG:3664
- ll 39.94759355331924 -64.19684460681914
- en 1.2376214594162945E7 1.5249359905344823E7
- ll2 39.947593553319315 -64.19684460681914
-EPSG:3665
- ll -4.126787589687055 -129.45977014108513
- en -2247713.257150341 4233151.611831471
- ll2 -4.126787589687104 -129.45977014108513
-EPSG:3666
- ll 56.246133901693966 -41.55609610342336
- en 5348751.306387228 1.0392151604062412E7
- ll2 56.246133901694364 -41.55609610342338
-EPSG:3667
- ll 27.614973766882848 -73.1607568437319
- en 2983822.6821400784 691321.4882154088
- ll2 27.614973766882173 -73.1607568437319
-EPSG:3668
- ll 41.02874148367167 -26.02633531065186
- en 1.960680601852372E7 1.3449893913287047E7
- ll2 41.028741483671745 -26.026335310651845
-EPSG:3669
- ll 32.16158406330346 -147.14347311630334
- en -3826151.0540037164 3098321.3238016795
- ll2 32.161584063303714 -147.1434731163033
-EPSG:3670
- ll 84.66532957385535 -24.72675756463036
- en 7428325.2447345955 3.2799917142895985E7
- ll2 84.66532957385581 -24.726757564630333
-EPSG:3671
- ll 63.47051236149119 -177.69416269727662
- en -4472377.736270547 1.10928469721433E7
- ll2 63.470512361491856 -177.69416269727654
-EPSG:3672
- ll 68.35186585643582 -99.02491442007286
- en 883382.363540531 3.372966684207777E7
- ll2 68.35186585643672 -99.02491442007286
-EPSG:3673
- ll 75.91727366542283 -152.4951636285976
- en -1744608.2921192097 1.0760309082415635E7
- ll2 75.91727366542379 -152.49516362859762
-EPSG:3674
- ll 9.171540608779125 -47.16540912217471
- en 2.1151200129788976E7 1.0521229596257512E7
- ll2 9.171540608779145 -47.16540912217471
-EPSG:3675
- ll 64.40157840383682 -59.28131993467849
- en 3158784.0116244964 5797655.438366169
- ll2 64.40157840383756 -59.281319934678514
-EPSG:3676
- ll 88.43279130894138 -53.18611650463619
- en 3228228.9092866057 3.0145018837724186E7
- ll2 88.43279130894163 -53.18611650463618
-EPSG:3677
- ll 21.99984349178304 -179.3370039995506
- en -2.0165059040256213E7 9210729.868348336
- ll2 21.99984349178294 -179.33700399955063
-EPSG:3678
- ll 78.65214142351297 -157.04951039759263
- en -842212.1363169572 6063191.550814685
- ll2 78.65214142351384 -157.04951039759263
-EPSG:3679
- ll 9.677766706470951 -179.6793323535171
- en -2.374530835991123E7 2083204.1189353943
- ll2 9.677766706470965 -179.67933235351396
-EPSG:3680
- ll 28.73881575865851 -134.46540245360967
- en -5799863.064973203 15243.260593853109
- ll2 28.738815758657584 -134.4654024536097
-EPSG:3681
- ll 29.496108345119254 -43.857756946603644
- en 6562620.406795198 4495170.043186211
- ll2 29.4961083451181 -43.85775694660364
-EPSG:3682
- ll 53.11907552382739 -154.02726689582204
- en -7742784.473674977 1.8083863532833118E7
- ll2 53.11907552382766 -154.02726689582204
-EPSG:3683
- ll 11.36045781314192 -126.31250581063557
- en -4188990.6612275094 780259.2086261753
- ll2 11.360457813141931 -126.31250581063561
-EPSG:3684
- ll 49.2036150458666 -76.00851656210152
- en 244356.06209818102 750998.3734818073
- ll2 49.203615045691265 -76.00851656212724
-EPSG:3685
- ll 18.033865528684807 -5.295711806203258
- en 1.0886683115719985E7 2888958.798756426
- ll2 18.03386552868481 -5.295711806203272
-EPSG:3686
- ll 1.3546724903552487 -129.91457910050542
- en -1.0139754083928812E7 -1347068.0723128724
- ll2 1.3546724903552878 -129.91457910050542
-EPSG:3687
- ll 19.388674370260823 -150.8480391765862
- en -3702911.6305524856 1994336.972182067
- ll2 19.38867437026078 -150.84803917658618
-EPSG:3688
- ll 59.23774746420061 -83.13818906746089
- en 1.0538198751398182E7 1.1878630058223553E7
- ll2 59.23774746420108 -83.13818906746089
-EPSG:3689
- ll -5.797077219867925 -171.14602260501533
- en -7150300.344257792 -4131137.946015743
- ll2 -5.797077219867897 -171.1460226050154
-EPSG:3690
- ll -2.131023975882952 -86.8262113545105
- en 1.847160719157758E7 -1.6370857996921575E7
- ll2 -2.131023975882918 -86.82621135451048
-EPSG:3691
- ll 35.44679555154206 -132.78671633230442
- en -630850.2948533599 -1016933.4215759671
- ll2 35.44679555154223 -132.78671633230442
-EPSG:3692
- ll 86.28225162140734 -158.1868712883345
- en 162337.70879836142 1.7434036877871297E7
- ll2 86.28225162140765 -158.18687128833446
-EPSG:3693
- ll 68.03893544883405 -54.69855572586826
- en 1796786.982332944 3613411.248989141
- ll2 68.03893544883493 -54.69855572586827
-EPSG:3694
- ll 18.924259872286314 -113.52088604552486
- en -2937896.589466123 -1414588.174083549
- ll2 18.924259872286306 -113.52088604552486
-EPSG:3695
- ll 26.81276823167216 -148.51992386417277
- en -4977130.061107029 181483.80090416904
- ll2 26.81276823167163 -148.51992386417277
-EPSG:3696
- ll 69.86939816934084 -70.23152388879683
- en 4756097.033230264 1.0206617907118576E7
- ll2 69.86939816934175 -70.23152388879683
-EPSG:3697
- ll 54.28865125699869 -140.08321016999065
- en -2481978.6550498595 2022904.880354101
- ll2 54.28865125699902 -140.08321016999068
-EPSG:3698
- ll 76.97421441060565 -101.7097295995727
- en 775554.7532710221 1.2455621071428023E7
- ll2 76.97421441060659 -101.70972959957271
-EPSG:3699
- ll -4.4316726930849875 -75.32623001568129
- en 2816995.5162044284 -5558040.621155027
- ll2 -4.431672693084947 -75.32623001568129
-EPSG:3700
- ll 9.698095703937678 -107.5133207395868
- en -5347217.492671416 -1.164767411343899E7
- ll2 9.698095703937684 -107.5133207395868
-EPSG:3701
- ll -64.72167566099102 -86.09009859270725
- en 706202.2030381166 -1.1663184434739623E7
- ll2 -64.7216756607638 -86.0900985928599
-EPSG:3702
- ll -28.946391469917344 -109.69585675111414
- en -241765.4380578737 -7696357.897399067
- ll2 -28.94639146966069 -109.69585675159315
-EPSG:3703
- ll -57.798123336701494 -107.72300594701913
- en 376829.5308645132 -1.079323304155073E7
- ll2 -57.798123336701956 -107.72300594701913
-EPSG:3704
- ll 56.295112155551834 -111.32547619271932
- en 440566.1169470252 1759245.4066302713
- ll2 56.29511215552519 -111.32547619272115
-EPSG:3705
- ll -86.36583987217728 -106.53396338273467
- en 825110.9194046501 -1.3981002576980527E7
- ll2 -86.36583987217702 -106.53396338282037
-EPSG:3706
- ll 2.198399164339776 169.02575102865234
- en 280432.5108065269 243135.51088626697
- ll2 2.1983991643396816 169.02575102866373
-EPSG:3707
- ll 8.172381105776381 170.666535992899
- en -199022.74739979638 908863.8282226364
- ll2 8.17238110519459 170.66653599895676
-EPSG:3708
- ll -46.79748603214507 -173.55950357270072
- en 762542.6457702594 -5188409.148036337
- ll2 -46.79748603199639 -173.559503572658
-EPSG:3709
- ll 48.949156674349126 -174.90392403976762
- en 214196.88758400892 5429151.890032889
- ll2 48.949156674017985 -174.90392403979004
-EPSG:3710
- ll 49.67640609484002 -163.89922608542486
- en 579416.6964418007 5503234.71785649
- ll2 49.67640609484003 -163.89922608542474
-EPSG:3711
- ll -35.98136640647082 -158.97173668390528
- en 502547.9046216674 -3981882.0878673256
- ll2 -35.98136640647085 -158.9717366839053
-EPSG:3712
- ll 61.91579344290108 -152.15644122748165
- en 544304.3244859084 6865087.261084163
- ll2 61.91579344290167 -152.15644122748168
-EPSG:3713
- ll -40.46363086641564 -151.32866571424756
- en 132961.87808959838 -4488224.841131185
- ll2 -40.463630865958166 -151.32866571450083
-EPSG:3714
- ll -76.89408381075897 -146.11351939179883
- en 370719.1988001176 -8540576.649228355
- ll2 -76.8940838105206 -146.11351938963998
-EPSG:3715
- ll -88.48863022441468 -133.33535223522458
- en 504901.33136468026 -9829293.138952749
- ll2 -88.48863022441483 -133.33535223522466
-EPSG:3716
- ll -50.28292285822361 -130.04090653500106
- en 425840.71225764777 -5570606.322698251
- ll2 -50.28292285822369 -130.04090653500117
-EPSG:3717
- ll 18.05115790249245 -127.05916468209769
- en 70117.70665781997 2000569.6350466718
- ll2 18.051157902436543 -127.05916468205412
-EPSG:3718
- ll 49.723588943738946 -119.1387890842962
- en 345848.0684689198 5510094.350511022
- ll2 49.723588943730014 -119.13878908429986
-EPSG:3719
- ll 62.22601745889153 -106.27620065568348
- en 745427.4424098148 6908318.078896462
- ll2 62.22601745806997 -106.27620065647277
-EPSG:3720
- ll 6.023212307830903 -103.2907049711999
- en 689186.3289017021 666066.6882611794
- ll2 6.02321230783082 -103.29070497120478
-EPSG:3721
- ll -38.05402448307751 -102.92586649106352
- en 155507.1609351029 -4219090.538049918
- ll2 -38.05402448285604 -102.92586649125886
-EPSG:3722
- ll -25.51714486929732 -97.69798702186134
- en 27595.924235907733 -2830568.0613924135
- ll2 -25.51714486905935 -97.69798702233304
-EPSG:3723
- ll 47.57419392617203 -93.84377695177635
- en -14590.836519011296 5291712.940887284
- ll2 47.57419391711991 -93.84377694154438
-EPSG:3724
- ll 19.147780192397377 -74.54207021044641
- en 1180232.429236821 2129791.031720387
- ll2 19.147780191227362 -74.5420702103432
-EPSG:3725
- ll -49.60690131254084 -72.13192789913343
- en 707203.6316008063 -5498876.971197657
- ll2 -49.606901312488276 -72.13192789911982
-EPSG:3726
- ll -0.6747363937938644 -73.38615070801846
- en 11484.392883217079 -74799.20439459992
- ll2 -0.6747363937893301 -73.38615070714403
-EPSG:3727
- ll -72.50544781800821 54.912546010325386
- en 139772.91931376373 -5661814.528395356
- ll2 -72.50544617550734 54.91254935321859
-EPSG:3728
- ll 45.03234204972459 -11.52055712597226
- en 1.839864385628898E7 9037574.499486448
- ll2 45.03234204972467 -11.520557125972257
-EPSG:3729
- ll -19.272312428710418 -89.01054458521948
- en -1692312.1379258842 -2.465914276401645E7
- ll2 -19.272312428710347 -89.01054458521948
-EPSG:3730
- ll -50.74234154506165 -105.38493841390844
- en 605622.4595819534 -3.316221055588164E7
- ll2 -50.74234154506183 -105.38493841390843
-EPSG:3731
- ll 11.560715903419975 -106.03773171423816
- en 1775984.3314510428 -1.019039129938986E7
- ll2 11.560715903419942 -106.03773171423899
-EPSG:3732
- ll 48.03343789286566 -113.11482350159285
- en 900711.8821683015 2776472.7021153714
- ll2 48.033437892230474 -113.11482350158919
-EPSG:3733
- ll 23.606363426638794 -109.49600318278343
- en 2821317.2829059744 -5817302.529285993
- ll2 23.606363426638612 -109.49600318278343
-EPSG:3734
- ll 7.969903471473653 -24.81600121066097
- en 2.4524484126831207E7 -4420591.585561802
- ll2 7.969903471473682 -24.81600121066098
-EPSG:3735
- ll 54.368612100535444 -14.340037267337863
- en 1.566513723770624E7 1.1465870188486319E7
- ll2 54.36861210053546 -14.340037267337863
-EPSG:3736
- ll 87.53684691576046 -107.46347068492143
- en 620006.7748084475 1.7197119290288553E7
- ll2 87.53684691576045 -107.46347068491974
-EPSG:3737
- ll 9.827175043025576 -111.59079674015256
- en -221157.3419934255 -1.081076966346989E7
- ll2 9.827175042978505 -111.59079673966816
-EPSG:3738
- ll 1.4120684475384166 -111.71336455217052
- en 886126.6928612547 -1.420085430312826E7
- ll2 1.412068447537649 -111.71336455207268
-EPSG:3739
- ll 38.729753046360614 -115.43891369558946
- en 1096410.4350307651 -271950.22096931736
- ll2 38.72975304488614 -115.4389136962549
-EPSG:3740
- ll 24.300870956036306 -122.77627816251253
- en 522701.81090130366 2687556.0352673386
- ll2 24.300870956036054 -122.77627816251254
-EPSG:3741
- ll 47.75531664931444 -111.71240769812188
- en 896238.0917122797 5302658.662858226
- ll2 47.75531664733265 -111.7124076987205
-EPSG:3742
- ll 9.105770395153257 -116.62221284180242
- en -118729.47950240842 1011361.6598753836
- ll2 9.10577039487208 -116.62221283914792
-EPSG:3743
- ll 69.62206698329419 -99.73367091032367
- en 704439.8156699568 7732543.162715303
- ll2 69.62206698242538 -99.73367091286869
-EPSG:3744
- ll -59.10756423496157 -98.39245351109922
- en 534795.714972786 -6552187.768146141
- ll2 -59.10756423496208 -98.39245351109922
-EPSG:3745
- ll -29.07417312233548 -91.1767764306621
- en 677470.8486056647 -3217575.843356248
- ll2 -29.07417312233339 -91.17677643065939
-EPSG:3746
- ll -32.2473595972709 -86.27703576812907
- en 568104.651454347 -3568083.446156061
- ll2 -32.2473595972709 -86.27703576812904
-EPSG:3747
- ll 8.499740768942587 -84.78009754007941
- en 83668.46933711803 941577.7789365829
- ll2 8.499740768923173 -84.7800975398001
-EPSG:3748
- ll 26.710296037489158 -70.75349203411298
- en 922624.5185480815 2961396.531108842
- ll2 26.710296037346613 -70.7534920338237
-EPSG:3749
- ll -14.606935062411509 -70.17674672605503
- en 373254.9760062748 -1615180.277936464
- ll2 -14.60693506241148 -70.17674672605467
-EPSG:3750
- ll 14.342564562733344 -163.630134737199
- en 257.157487980905 1590622.7811430127
- ll2 14.342564562626384 -163.63013473680044
-EPSG:3751
- ll -33.623725469593836 -149.57092597673247
- en 818130.964953149 -3725711.9623995204
- ll2 -33.62372546952243 -149.57092597662555
-EPSG:3753
- ll 68.85300206031279 -38.55200261799109
- en 8443037.20897523 1.2816186877356434E7
- ll2 68.8530020603137 -38.5520026179911
-EPSG:3754
- ll 77.39013475290989 -131.83812001458435
- en -3310821.4256571606 1.7345511175014913E7
- ll2 77.39013475291077 -131.83812001458435
-EPSG:3755
- ll 58.752619671928386 -108.61372308494057
- en 1733.06861227158 6676723.290047011
- ll2 58.75261967178369 -108.61372308491084
-EPSG:3756
- ll 6.744684736384087 -112.81460373056234
- en -678628.455695001 -1.1927715392911082E7
- ll2 6.7446847361982885 -112.81460372784828
-EPSG:3757
- ll 3.6209963785832997 -114.93714360707197
- en -290940.75181752245 -1.339250505015282E7
- ll2 3.620996378342799 -114.93714360042934
-EPSG:3758
- ll -83.93752488164132 -104.19105158661182
- en 2852292.66257245 -4.498870812973672E7
- ll2 -83.93752488159679 -104.19105159485348
-EPSG:3759
- ll 17.18347733281432 -152.71273912626563
- en 3487940.5123180854 -1421326.0893339117
- ll2 17.183477332523303 -152.71273912656034
-EPSG:3760
- ll 16.824012450381474 -158.78849017775818
- en 1364687.6107817474 -1576528.2895666866
- ll2 16.82401245038146 -158.78849017775818
-EPSG:3761
- ll 40.68927758051498 -50.984885573823476
- en 501277.09716540703 4504264.96777862
- ll2 40.68927758051502 -50.98488557382348
-EPSG:3762
- ll -12.513109701182316 -43.9015604878914
- en -939140.4662263448 5050051.379892514
- ll2 -12.5131097011823 -43.9015604878914
-EPSG:3763
- ll -18.53590097921196 -5.360340260734349
- en 292841.9938952334 -6445246.431697642
- ll2 -18.535900979206605 -5.360340260741751
-EPSG:3764
- ll 43.285427333971825 -171.91268616322026
- en 772342.1120262358 1.0478483020997215E7
- ll2 43.285427333232384 -171.91268616303753
-EPSG:3765
- ll -35.922677840928024 14.531981805921376
- en 322389.9495533104 -3978355.4458553265
- ll2 -35.922677840925 14.531981805916274
-EPSG:3766
- ll 76.81373383686926 19.008355785093897
- en 80901.78078837127 9275913.858064584
- ll2 76.8137338368702 19.008355785093908
-EPSG:3767
- ll 52.35751477577335 11.163696765846414
- en 238788.42190514368 5807732.274041974
- ll2 52.35751477546743 11.16369676586845
-EPSG:3768
- ll 30.715752716627406 18.255589235148605
- en 237179.58941432234 3401317.4868044625
- ll2 30.715752716611227 18.2555892351196
-EPSG:3769
- ll -45.94480936098984 -58.61493961773868
- en 839818.0183270618 -5097336.551984906
- ll2 -45.94480919133304 -58.614939576564446
-EPSG:3770
- ll -42.72376527375718 -59.685594846609135
- en 964844.9148252187 -8186341.4573276155
- ll2 -42.7237652724549 -59.6855948464117
-EPSG:3775
- ll -34.49948137372136 -111.99224871899156
- en -91121.20173886785 -3819132.3853849955
- ll2 -34.499481373721316 -111.9922487189917
-EPSG:3776
- ll 81.57624566895038 -113.49110048967188
- en 8325.279894308524 9060281.773670368
- ll2 81.57624566895039 -113.49110048967188
-EPSG:3777
- ll -41.784983419331894 -116.95630852770044
- en 3631.669089413348 -4627292.877747099
- ll2 -41.7849834193319 -116.95630852770044
-EPSG:3779
- ll -60.26000086605754 -114.34552940989207
- en -185141.8295367511 -6687067.68477389
- ll2 -60.26000086594335 -114.345529409866
-EPSG:3780
- ll -70.88988548305917 -109.84021207942935
- en 151935.48123371016 -7872690.515969093
- ll2 -70.88988548287507 -109.84021207973942
-EPSG:3781
- ll 86.91441893592079 -120.01054845923476
- en -18089.784756516012 9656837.209787337
- ll2 86.91441893592092 -120.0105484592153
-EPSG:3783
- ll 34.641819844516306 -130.76658103917083
- en -45726.51806999961 6624199.643266535
- ll2 34.64181984451631 -130.7665810391709
-EPSG:3784
- ll 38.24058125740309 -132.21567828273842
- en 218519.88876271568 1.4237374669170098E7
- ll2 38.24058125069149 -132.21567828507307
-EPSG:3788
- ll 43.089443729854054 162.47466807390018
- en 3212946.0189618366 1.477869328974387E7
- ll2 43.089443729702225 162.47466807382264
-EPSG:3789
- ll -64.41326531161566 164.19627605214436
- en 3268593.4230230926 2845318.471990874
- ll2 -64.41326531082056 164.196276053132
-EPSG:3790
- ll -64.01218669277671 178.95215697221337
- en 3497659.9771349006 2898786.4763174476
- ll2 -64.01218669277743 178.95215697221406
-EPSG:3791
- ll -22.47360863087968 -175.20716680719158
- en 3787507.6822015517 7511075.191334367
- ll2 -22.473608630871972 -175.2071668071816
-EPSG:3793
- ll -14.333883573633713 -174.68701803727612
- en 3695606.4261784926 8413946.844256483
- ll2 -14.333883573633406 -174.68701803727927
-EPSG:3794
- ll -47.750039071994806 9.623942780909246
- en 96972.69856517052 -1.0304121639062583E7
- ll2 -47.75003906980782 9.623942781647955
-EPSG:3798
- ll 37.83778219614783 -59.371809440136275
- en 1745994.2286784197 -623931.552674238
- ll2 37.837782196147884 -59.371809440136275
-EPSG:3799
- ll 12.03920019636514 -94.18059666733615
- en -2279862.574856354 -3300287.1621252485
- ll2 12.039200196365156 -94.18059666733616
-EPSG:3801
- ll -13.804323026561022 -115.43871744963624
- en 493603.6241554095 -1531238.9364144318
- ll2 -13.804323026466628 -115.43871745004695
-EPSG:3802
- ll 12.879027134924513 -125.65789514375373
- en -614936.5669981423 1430968.9088561651
- ll2 12.879027134551036 -125.65789514203865
-EPSG:3812
- ll 49.80549712200476 6.084016018795101
- en 773476.5758068399 556329.0585747092
- ll2 49.805497122004766 6.084016018795101
-EPSG:3814
- ll -70.7856005780424 -96.58842170230469
- en 249228.05879888695 -1.0166170710015573E7
- ll2 -70.78560057456902 -96.58842167481727
-EPSG:3815
- ll 32.02025961630467 -87.4426550379265
- en 717970.0124450376 1249137.645506629
- ll2 32.0202596162989 -87.44265503791499
-EPSG:3816
- ll 53.26303152081522 -93.96934868632576
- en 218568.44418060698 3614521.630663425
- ll2 53.26303152027587 -93.96934868620598
-EPSG:3819
- ll -75.77272128173301 125.77689361924922
- en 125.80206101328903 -75.7718514593883
- ll2 -75.77272155192387 125.77688961401888
-EPSG:3821
- ll -48.83431064522698 -70.57534780624361
- en -70.57534780624361 -48.83431064522698
- ll2 -48.83431064522698 -70.57534780624361
-EPSG:3824
- ll 78.6876820407463 35.763475596383245
- en 35.763475596383245 78.68768204110901
- ll2 78.68768204074713 35.763475596383245
-EPSG:3825
- ll -10.285309169997134 117.77306466089058
- en 115602.35208714049 -1137555.7365854764
- ll2 -10.28530916999711 117.77306466089131
-EPSG:3826
- ll -33.11968811941974 120.67486697741623
- en 219659.33325582094 -3665702.5513098724
- ll2 -33.119688119419756 120.67486697741624
-EPSG:3827
- ll -66.05435556351051 118.61726936203517
- en 232660.97065169155 -7328246.127495804
- ll2 -66.05435556351051 118.61726936203517
-EPSG:3828
- ll 14.814811276967703 119.52477621756307
- en 91203.18737912347 1638863.4698717387
- ll2 14.814811276967614 119.52477621756415
-EPSG:3829
- ll -77.24540816264614 124.38546488643378
- en 533311.1726114763 -8574692.842895864
- ll2 -77.2454081165748 124.3854630777446
-EPSG:3832
- ll -44.23922317703756 -29.769571951763883
- en -2.001185720979511E7 -5472716.770722946
- ll2 -44.23922317703746 -29.76957195176388
-EPSG:3833
- ll -11.518986628231247 6.526166541232193
- en 2230168.058415142 -1274988.3603741706
- ll2 -11.518986613811604 6.526166570236531
-EPSG:3834
- ll -25.05384889679663 15.643916420155703
- en 3171521.639304838 -2788532.2946292604
- ll2 -25.05384888031992 15.64391644900351
-EPSG:3835
- ll -82.86417527913844 12.080463901424716
- en 3459633.420157469 -9206144.570749383
- ll2 -82.86417527643768 12.080464163596977
-EPSG:3836
- ll 53.73634166882317 16.04709414816736
- en 4173403.3224010407 5968101.226061922
- ll2 53.7363416695921 16.047094161146045
-EPSG:3837
- ll -24.64934007807804 4.631621923254801
- en 3057607.5676760054 -2734238.8615580862
- ll2 -24.649340063642015 4.631621958678775
-EPSG:3838
- ll -61.847829054743585 9.446285961508785
- en 4365691.744341031 -6862698.16106469
- ll2 -61.84782904708908 9.446286040076783
-EPSG:3839
- ll 0.8507939109425706 28.17111969313088
- en 9630484.266726535 94176.92962048594
- ll2 0.8507939179595179 28.171119705993664
-EPSG:3840
- ll -21.215329865854628 24.447822733607723
- en 9923013.12934834 -2357008.700316131
- ll2 -21.215329852586326 24.447822756078534
-EPSG:3841
- ll 32.296838052272335 11.488438501472398
- en 5886240.323612009 3593576.8199805846
- ll2 32.2968380555244 11.488438512750498
-EPSG:3844
- ll 82.54586046083779 -46.41017593161061
- en -402171.2426204374 5331617.0069654295
- ll2 82.54586046948961 -46.41017589004339
-EPSG:3845
- ll -76.9495682404704 5.78229428451298
- en 1360919.7835201728 -8551819.80154327
- ll2 -76.94956824010139 5.7822942888510065
-EPSG:3846
- ll -66.12106425578477 12.989417745914418
- en 1474429.2734526019 -7337164.399678339
- ll2 -66.1210642557856 12.989417745914418
-EPSG:3847
- ll -71.9538088082028 17.88347136011308
- en 1571901.3986342463 -7988925.871612783
- ll2 -71.9538088082012 17.8834713601125
-EPSG:3848
- ll 5.7322284654291025 23.559775355935326
- en 2110614.7202585437 636128.2770631165
- ll2 5.732228465263421 23.55977535299262
-EPSG:3849
- ll 42.03473436322898 23.48795448686699
- en 1763576.0591543403 4659749.33552975
- ll2 42.03473436315061 23.487954486918955
-EPSG:3850
- ll -45.46853800401267 28.47690753431036
- en 1963108.8935854286 -5054796.030784322
- ll2 -45.46853800036445 28.476907532812454
-EPSG:3851
- ll -43.090009932828536 172.96050283252026
- en 2996787.958048548 6768235.306206955
- ll2 -43.09000993282859 172.96050283252032
-EPSG:3852
- ll -84.86326360765544 173.49639767829711
- en 664310.1317160765 567875.2268464302
- ll2 -84.86326360765591 173.4963976782973
-EPSG:3854
- ll 39.15354781032525 20.527076869095872
- en 313630.65254394984 -2162186.1110597653
- ll2 39.153547810310556 20.52707686911199
-EPSG:3857
- ll -8.186665784258565 -98.88476391842832
- en -1.1007801566612512E7 -914452.3460527665
- ll2 -8.186665784258583 -98.88476391842832
-EPSG:3873
- ll -73.30643379067533 13.141996202654589
- en 1.9312374950201742E7 -8147115.681889233
- ll2 -73.3064337896713 13.141996209701889
-EPSG:3874
- ll -5.422485448810136 23.265499482610167
- en 2.0862091693322603E7 -600581.2319855732
- ll2 -5.422485448804991 23.265499482460715
-EPSG:3875
- ll -28.160128211477186 18.319420093347528
- en 2.123667029134141E7 -3119095.7478429824
- ll2 -28.1601282114664 18.31942009332568
-EPSG:3876
- ll -40.697512790016724 25.47921025711053
- en 2.279408551262564E7 -4512807.942225966
- ll2 -40.69751278989142 25.479210257200137
-EPSG:3877
- ll -9.977991409413036 17.016882373427997
- en 2.2842839661387824E7 -1109381.936806809
- ll2 -9.977991408954635 17.016882377013186
-EPSG:3878
- ll -43.59085986339718 24.89592429589815
- en 2.4572350783095855E7 -4828753.572634266
- ll2 -43.59085986339719 24.895924295898244
-EPSG:3879
- ll 85.51255259097826 19.695994667928016
- en 2.5453714548171572E7 9502892.571990034
- ll2 85.51255259096952 19.695994671136585
-EPSG:3880
- ll 49.58210255389784 29.181634283646783
- en 2.6730062064840604E7 5499231.859811578
- ll2 49.58210255379982 29.18163428366615
-EPSG:3881
- ll 87.13879409616644 21.960835393465373
- en 2.747194092367031E7 9683622.098486742
- ll2 87.13879409616594 21.960835395496527
-EPSG:3882
- ll -8.536494054814 26.043172570945842
- en 2.828452401995758E7 -944532.8334934604
- ll2 -8.536494054813689 26.043172570954386
-EPSG:3883
- ll 84.53346638916261 23.951450827265553
- en 2.944635102546231E7 9393759.939200414
- ll2 84.53346638914786 23.95145082931046
-EPSG:3884
- ll -85.871943283798 31.082182889686685
- en 3.050870050608145E7 -9540976.658823222
- ll2 -85.87194328379839 31.082182889686628
-EPSG:3885
- ll -10.98298103672883 33.934284723316026
- en 3.1820830154224098E7 -1216149.653095799
- ll2 -10.98298103672409 33.93428472325873
-EPSG:3889
- ll -89.95953426786187 -82.6348534332911
- en -82.6348534332911 -89.9595342678629
- ll2 -89.9595342678613 -82.6348534332911
-EPSG:3890
- ll -28.527155647657928 39.524534527042704
- en 551320.7916951271 -3155712.543956971
- ll2 -28.527155647657057 39.52453452704272
-EPSG:3891
- ll 39.620110737019615 41.19397027503948
- en 173279.98164819274 4392520.251567326
- ll2 39.62011073681741 41.193970274888294
-EPSG:3892
- ll -74.87435724076657 56.03597496640941
- en 646518.2010110407 -8315808.994136148
- ll2 -74.87435724044576 56.03597496457229
-EPSG:3893
- ll -48.61960047481655 42.795231173727096
- en 527040.403030958 -8601036.611102285
- ll2 -48.619600449451916 42.795231179244794
-EPSG:3901
- ll 11.744498345545708 31.95184700312381
- en 4040501.4671878642 1303659.9610406917
- ll2 11.744498376339287 31.951847018138306
-EPSG:3902
- ll 68.47778911794381 20.204404348923227
- en 222256.63512634241 7611480.440733736
- ll2 68.47778911358911 20.20440437386595
-EPSG:3903
- ll 33.46601176318107 24.44594196698376
- en 262641.6494998534 3705869.4658590914
- ll2 33.46601176316907 24.44594196696297
-EPSG:3906
- ll 88.47493446360036 39.50735189810317
- en 39.70645845481397 88.47833300950103
- ll2 88.47493436612969 39.50734621581372
-EPSG:3907
- ll -82.83077069667546 13.256072869855121
- en 5476074.531755141 -9200330.536596578
- ll2 -82.83076971115456 13.256068608611038
-EPSG:3908
- ll -10.74951288025602 12.266949241592492
- en 5872434.841238485 -1194959.099249708
- ll2 -10.749512707255935 12.266949138431567
-EPSG:3909
- ll -83.86713267722226 19.02266253726212
- en 7476850.568249625 -9316034.798909348
- ll2 -83.86713174340174 19.022656626047656
-EPSG:3910
- ll 25.6061798015143 20.63304168720624
- en 8162167.346959375 2836692.697957953
- ll2 25.606179804540037 20.633041681121874
-EPSG:3911
- ll 40.56669540261731 14.453225518158895
- en 454073.7253507708 4491662.292639795
- ll2 40.56669539957973 14.453225561272006
-EPSG:3912
- ll -43.7901668885683 13.347449941472139
- en 367386.58106575784 -9851559.492514499
- ll2 -43.79016629380858 13.34744953061938
-EPSG:3920
- ll -13.467235534878768 -66.6409297730483
- en 105642.15194326924 -1491630.4723739093
- ll2 -13.467235534709436 -66.64092977403652
-EPSG:3942
- ll 43.31076698835789 4.775330742390713
- en 1844045.6093504836 1347101.5148460106
- ll2 43.31076698835793 4.775330742390712
-EPSG:3943
- ll 45.24385797787262 6.491715701959931
- en 1974249.979588893 2455068.3748714346
- ll2 45.24385797787265 6.491715701959932
-EPSG:3944
- ll 44.60632258869744 0.6721665250429165
- en 1515235.2084579398 3269976.487566871
- ll2 44.60632258869745 0.6721665250429147
-EPSG:3945
- ll 46.04260135928741 2.316103441625539
- en 1647060.175456604 4316096.661231255
- ll2 46.04260135928743 2.316103441625539
-EPSG:3946
- ll 48.120511286262946 -2.638924617409179
- en 1280270.8431755006 5450639.6088787
- ll2 48.12051128626297 -2.638924617409182
-EPSG:3947
- ll 47.56070109322637 -4.454770213125427
- en 1139846.2284764382 6289004.41408339
- ll2 47.56070109322638 -4.4547702131254265
-EPSG:3948
- ll 48.0131835185863 -4.883573621462191
- en 1112910.0334047128 7231508.515722865
- ll2 48.01318351858632 -4.883573621462193
-EPSG:3949
- ll 46.872150221597146 4.348689107452911
- en 1802876.0001255975 7964286.625010995
- ll2 46.872150221597174 4.348689107452911
-EPSG:3950
- ll 50.19462980520668 5.1422282362682346
- en 1852934.6091613166 9223837.40459054
- ll2 50.194629805206695 5.142228236268235
-EPSG:3968
- ll 70.04321534021533 -24.18195305425448
- en 2435898.4023416466 4770545.474122734
- ll2 70.04321534021534 -24.18195305425448
-EPSG:3969
- ll 70.80621301614974 -70.59201191187084
- en 405882.348757277 4144700.8315587407
- ll2 70.80621301615069 -70.59201191187086
-EPSG:3970
- ll 41.49707144647299 -12.04988796677165
- en 5153611.005026159 2576327.674465142
- ll2 41.497071446473086 -12.049887966771648
-EPSG:3976
- ll -77.68104271083337 87.39542388495539
- en 1338052.800021618 60867.71082698869
- ll2 -77.68104271083338 87.3954238849554
-EPSG:3978
- ll 12.611024375328316 -172.68859853953887
- en -8658301.38214046 1499579.7642448458
- ll2 12.611024375328347 -172.68859853953887
-EPSG:3979
- ll 39.55496616425742 -163.9176810431591
- en -5060136.837786224 1972749.968486704
- ll2 39.554966164257515 -163.91768104315906
-EPSG:3986
- ll -70.13453419102274 35.371114955671686
- en 403510.5536773418 -6297584.952288883
- ll2 -70.13453418822118 35.37111493774117
-EPSG:3987
- ll -31.081071771813797 27.38503372309295
- en 141276.58369847323 -1944694.6777598592
- ll2 -31.081071767154388 27.385033719516606
-EPSG:3988
- ll -24.808915324699882 19.84056703490203
- en -423578.1800374732 -1263549.5976943297
- ll2 -24.80891531768861 19.840567031071483
-EPSG:3989
- ll -62.12445474489444 26.403631520726815
- en 325379.1535489494 -5397727.900367469
- ll2 -62.1244547441057 26.403631513480814
-EPSG:3991
- ll -37.531927130841595 -128.17067819377576
- en -2.846822149179805E7 -1.895526723631625E7
- ll2 -37.53192712966881 -128.17067819424955
-EPSG:3992
- ll 76.64408582616727 -123.37936842885637
- en -1.0512828374497494E7 2.9522242379727103E7
- ll2 76.6440858011938 -123.37936847850408
-EPSG:3994
- ll 36.886050838664644 125.47629963684625
- en 2143453.18596762 3323692.672587198
- ll2 36.886050838664374 125.47629963684625
-EPSG:3995
- ll -8.095761940943959 177.52138529929903
- en 615729.2337426373 1.4224347375902625E7
- ll2 -8.095761940943298 177.52138529929903
-EPSG:3996
- ll -21.274883207438315 47.065545324672996
- en 1.3348791880344525E7 -1.241943022126996E7
- ll2 -21.274883207437437 47.06554532467299
-EPSG:3997
- ll 13.146179773395914 49.69907016671033
- en -111762.34302572033 1460740.2073968863
- ll2 13.146179773027912 49.699070168305056
-EPSG:4001
- ll 22.38737863146642 -39.44662580888922
- en -39.44662580888922 22.38737863146642
- ll2 22.38737863146642 -39.44662580888922
-EPSG:4002
- ll -45.29563387189171 18.609971929989086
- en 18.609971929989086 -45.29563387189171
- ll2 -45.29563387189171 18.609971929989086
-EPSG:4003
- ll 61.9144367366961 -112.12438756004539
- en -112.12438756004539 61.9144367366961
- ll2 61.9144367366961 -112.12438756004539
-EPSG:4004
- ll 62.0806607905871 -61.46181933583358
- en -61.46181933583358 62.080660790587096
- ll2 62.0806607905871 -61.46181933583358
-EPSG:4005
- ll 73.81127060291672 -123.21518934866839
- en -123.21518934866837 73.81127060291672
- ll2 73.81127060291672 -123.21518934866839
-EPSG:4006
- ll 29.45528534264139 -93.0816564635215
- en -93.0816564635215 29.455285342641393
- ll2 29.455285342641393 -93.0816564635215
-EPSG:4007
- ll 69.8414766929975 53.574426545729835
- en 53.57442654572984 69.8414766929975
- ll2 69.8414766929975 53.57442654572984
-EPSG:4008
- ll 34.8578622279487 27.424830396921863
- en 27.42483039692186 34.8578622279487
- ll2 34.8578622279487 27.42483039692186
-EPSG:4009
- ll 61.4264798703976 -118.35043223159616
- en -118.35043223159616 61.426479870397586
- ll2 61.426479870397586 -118.35043223159616
-EPSG:4010
- ll -37.302910208440146 78.91394672917022
- en 78.91394672917022 -37.302910208440146
- ll2 -37.302910208440146 78.91394672917022
-EPSG:4011
- ll 36.92637801300043 75.88660823556702
- en 75.88660823556702 36.92637801300043
- ll2 36.92637801300043 75.88660823556702
-EPSG:4012
- ll 81.70233570961551 -128.60491570932982
- en -128.60491570932982 81.70233570961551
- ll2 81.70233570961551 -128.60491570932982
-EPSG:4013
- ll 26.904955362401026 72.67459017956207
- en 72.67459017956207 26.904955362401026
- ll2 26.904955362401026 72.67459017956207
-EPSG:4014
- ll 48.864766735495095 139.98891905195586
- en 139.98891905195586 48.8647667354951
- ll2 48.8647667354951 139.98891905195586
-EPSG:4015
- ll -82.79628234595097 -118.02242733922405
- en -118.02242733922407 -82.79628234595097
- ll2 -82.79628234595097 -118.02242733922407
-EPSG:4016
- ll -83.75597899266614 31.82509769071885
- en 31.82509769071885 -83.75597899266614
- ll2 -83.75597899266614 31.82509769071885
-EPSG:4018
- ll 33.8880179369463 137.79603618165157
- en 137.79603618165157 33.8880179369463
- ll2 33.8880179369463 137.79603618165157
-EPSG:4019
- ll 84.55693233434906 -178.50406941221954
- en -178.50406941221954 84.55693233434906
- ll2 84.55693233434906 -178.50406941221954
-EPSG:4020
- ll 78.9917366408902 -135.30537329162266
- en -135.30537329162266 78.9917366408902
- ll2 78.9917366408902 -135.30537329162266
-EPSG:4021
- ll -84.85923796449786 -157.40351034045102
- en -157.40351034045102 -84.85923796449786
- ll2 -84.85923796449786 -157.40351034045102
-EPSG:4022
- ll -38.52488967994672 -109.3974653593884
- en -109.3974653593884 -38.52488967994672
- ll2 -38.52488967994672 -109.3974653593884
-EPSG:4023
- ll -39.81586873309661 -53.95424329129453
- en -53.95424329129453 -39.81586873402473
- ll2 -39.81586873309664 -53.95424329129453
-EPSG:4024
- ll 23.92372849347022 -0.11818936295983917
- en -0.11818936295983917 23.92372849347022
- ll2 23.92372849347022 -0.11818936295983917
-EPSG:4025
- ll -19.955412761451896 -149.7024648889003
- en -149.7024648889003 -19.955412761451896
- ll2 -19.955412761451896 -149.7024648889003
-EPSG:4026
- ll -86.77018825925502 29.78825998203371
- en 208734.78430303078 -1.4640746247678524E7
- ll2 -86.7701882592553 29.788259982033676
-EPSG:4027
- ll -13.977388285297337 54.21359047171052
- en 54.213590471710525 -13.977388285297337
- ll2 -13.977388285297337 54.213590471710525
-EPSG:4028
- ll 13.060742557283874 27.017398638227206
- en 27.017398638227206 13.060742557283874
- ll2 13.060742557283874 27.017398638227206
-EPSG:4029
- ll -62.86246433605672 140.2861420989188
- en 140.2861420989188 -62.86246433605671
- ll2 -62.86246433605671 140.2861420989188
-EPSG:4030
- ll 71.20645530771719 -6.909055867147771
- en -6.909055867147771 71.20645530771719
- ll2 71.20645530771719 -6.909055867147771
-EPSG:4031
- ll 70.25175071874133 -15.939796553877244
- en -15.939796553877246 70.25175071874133
- ll2 70.25175071874133 -15.939796553877246
-EPSG:4032
- ll -41.086323840945994 87.08052015419639
- en 87.08052015419639 -41.086323840945994
- ll2 -41.086323840945994 87.08052015419639
-EPSG:4033
- ll 74.31522954564656 85.02086587169475
- en 85.02086587169475 74.31522954564656
- ll2 74.31522954564656 85.02086587169475
-EPSG:4034
- ll -23.200515826466287 140.51423654146305
- en 140.51423654146305 -23.200515826466287
- ll2 -23.200515826466287 140.51423654146305
-EPSG:4035
- ll -28.44671318742632 -175.12559157758415
- en -175.12559157758415 -28.446713187426322
- ll2 -28.446713187426322 -175.12559157758415
-EPSG:4036
- ll 67.20295356268525 -138.44710157875804
- en -138.44710157875804 67.20295356268525
- ll2 67.20295356268525 -138.44710157875804
-EPSG:4037
- ll -78.02704957045333 30.930354174511283
- en 590954.9909334709 -8664441.417620478
- ll2 -78.02704957041377 30.930354174307826
-EPSG:4038
- ll -88.3864273409295 36.21165980937626
- en 510091.7336858142 -9818093.966588518
- ll2 -88.38642734092947 36.211659809341285
-EPSG:4041
- ll 13.850372666730621 -43.45713426695846
- en -43.45713426695846 13.850372666730621
- ll2 13.850372666730621 -43.45713426695846
-EPSG:4042
- ll 17.183864307165663 106.46220293854077
- en 106.46220293854077 17.183864307165663
- ll2 17.183864307165663 106.46220293854077
-EPSG:4043
- ll 81.33543791193893 -28.821244353582102
- en -28.821244353582102 81.33543791193894
- ll2 81.33543791193894 -28.821244353582102
-EPSG:4044
- ll -43.145953260271334 125.71063387188582
- en 125.71063387188582 -43.145953260271334
- ll2 -43.145953260271334 125.71063387188582
-EPSG:4045
- ll 75.76472132415512 95.95367322399244
- en 95.95367322399244 75.76472132415512
- ll2 75.76472132415512 95.95367322399244
-EPSG:4046
- ll -5.634325588223618 125.3731169371386
- en 125.37311693713859 -5.634325588408243
- ll2 -5.634325588223628 125.3731169371386
-EPSG:4047
- ll -86.1805951382654 -102.12051789997017
- en -102.12051789997017 -86.1805951382654
- ll2 -86.1805951382654 -102.12051789997017
-EPSG:4048
- ll 67.19211394823122 8.40815703265389
- en 344648.24345177645 1.7459524055360567E7
- ll2 67.19211394811904 8.408157032729934
-EPSG:4049
- ll -66.87871246534296 12.515992028508986
- en 434956.9435791553 2579139.607343532
- ll2 -66.87871246534323 12.515992028508972
-EPSG:4050
- ll -84.59675616796045 13.481259346560027
- en 473520.64375861676 601886.3417937718
- ll2 -84.59675616796068 13.481259346563892
-EPSG:4051
- ll -78.29819853007179 22.080221450833
- en 592337.8097573798 1302521.428712735
- ll2 -78.29819853002631 22.080221450547192
-EPSG:4052
- ll 17.783713747304276 100.57233542090302
- en 100.57233542090302 17.783713747304276
- ll2 17.783713747304276 100.57233542090302
-EPSG:4053
- ll -68.18143944497889 -60.531212110852636
- en -60.53121211085263 -68.18143944497889
- ll2 -68.18143944497889 -60.531212110852636
-EPSG:4054
- ll 62.33548829972335 128.97414654739146
- en 128.97414654739146 62.33548829972335
- ll2 62.335488299723345 128.97414654739146
-EPSG:4055
- ll -70.3014394234102 -66.95265471593476
- en -66.95265471593476 -70.17899194932687
- ll2 -70.3010777477093 -66.95265471593476
-EPSG:4056
- ll -30.952677850072533 15.206814494342893
- en 41796.89547824196 6564742.828337599
- ll2 -30.952677849643088 15.206814493657136
-EPSG:4057
- ll -45.07064289808597 16.422744826327477
- en 60837.25540245173 4992547.5481675835
- ll2 -45.0706428955575 16.422744826899663
-EPSG:4058
- ll -64.31741851184177 27.453013612584037
- en 666962.8037112466 2860937.681635103
- ll2 -64.31741851173109 27.453013612536417
-EPSG:4059
- ll 37.17809960940663 25.47402419815385
- en 453295.92893922766 1.411599426522621E7
- ll2 37.17809960940663 25.47402419815385
-EPSG:4060
- ll 82.7334444216605 21.597738098069428
- en 409746.9026960209 1.9194467371805802E7
- ll2 82.73344442153493 21.597738115411858
-EPSG:4061
- ll 46.24511973055775 8.467046073332368
- en -3575.358196611225 1.5142063670368437E7
- ll2 46.24511972388982 8.467046078711874
-EPSG:4062
- ll 41.43736202767238 19.988206472905645
- en 415471.0350248018 1.4587804210397739E7
- ll2 41.437362027672336 19.98820647290551
-EPSG:4063
- ll -5.579880709000577 33.86251780027874
- en 1261833.2708953605 9378783.697057327
- ll2 -5.57988070826624 33.862517788292095
-EPSG:4071
- ll -0.04715457385454158 -44.22810724029551
- en 585824.2894482934 9994821.054864913
- ll2 -0.04715457490093067 -44.22810723802031
-EPSG:4075
- ll 48.41438609014847 48.308405403823286
- en 48.30840540382328 48.41438609108489
- ll2 48.41438609014861 48.30840540382327
-EPSG:4081
- ll -57.51741207364208 117.27073919069858
- en 117.27073919069858 -57.517412074496306
- ll2 -57.51741207364252 117.27073919069858
-EPSG:4082
- ll -55.673178339073495 -24.172236497466884
- en 300525.28769941826 -6174268.40885486
- ll2 -55.67317833897853 -24.172236497463647
-EPSG:4083
- ll -73.51851502225747 -14.05945579201006
- en 529783.0272531286 -8158557.5281906575
- ll2 -73.51851502225843 -14.059455792010064
-EPSG:4093
- ll 73.01656578995389 8.608231494265825
- en 187222.45603028694 3105449.657878653
- ll2 73.01656578995483 8.608231494265826
-EPSG:4094
- ll 62.52782304991092 3.5256777402181365
- en 67055.20852001244 1952333.2481219852
- ll2 62.52782304468475 3.5256777542621043
-EPSG:4095
- ll 86.7732424031739 11.320309884903335
- en 597298.6436900581 4641377.463830503
- ll2 86.7732424031742 11.320309884903327
-EPSG:4096
- ll -54.07025630549164 14.901799283034528
- en 793571.2608754842 -1.0993740413648605E7
- ll2 -54.07025630549195 14.90179928303452
-EPSG:4097
- ll -22.682265371340947 6.596748412399393
- en -47006.652276748966 -7511299.321263591
- ll2 -22.68226537133773 6.596748412395372
-EPSG:4098
- ll -54.82922684356665 5.905774008365491
- en 136962.54070364073 -1.1085785719292212E7
- ll2 -54.82922684312241 5.905774008476861
-EPSG:4099
- ll -54.40920091221992 7.050190646396774
- en 294953.36124898435 -1.1041526589400202E7
- ll2 -54.40920091120168 7.050190646854977
-EPSG:4100
- ll -73.08295614151312 15.20950312703711
- en 806807.20588821 -1.311299093226637E7
- ll2 -73.08295614151407 15.20950312703711
-EPSG:4120
- ll -68.29846959563403 44.66916875870413
- en 44.66916875870413 -68.29846959563403
- ll2 -68.29846959563403 44.66916875870413
-EPSG:4121
- ll 10.422784054300081 55.21019708279937
- en 55.2083082749609 10.420505158262467
- ll2 10.422784056868263 55.210197084914206
-EPSG:4122
- ll 76.70111997765252 50.756044628053786
- en 50.756044628053786 76.70111997765252
- ll2 76.70111997765252 50.756044628053786
-EPSG:4123
- ll -59.347437572306994 -22.444149572043898
- en -22.443788278240596 -59.34656283112315
- ll2 -59.34743757331043 -22.444149509713338
-EPSG:4124
- ll -16.123650513658774 -45.95985674493684
- en -45.960787055958804 -16.12897025114233
- ll2 -16.123649940656097 -45.95985643177101
-EPSG:4125
- ll -40.11041354032608 20.95713624497236
- en 20.94792779392529 -40.10936629580724
- ll2 -40.110413679092 20.957137460794996
-EPSG:4126
- ll 22.094025100051056 -128.63007133078753
- en -128.63007133078753 22.094025100051056
- ll2 22.094025100051056 -128.63007133078753
-EPSG:4127
- ll 88.27667500460214 39.770887726670736
- en 39.77852891217005 88.27574221684431
- ll2 88.27667506290396 39.77088724881344
-EPSG:4128
- ll 80.65887240825242 -121.7071550078996
- en -121.70715500789959 80.65887240825242
- ll2 80.65887240825242 -121.70715500789959
-EPSG:4129
- ll 64.30188977610351 106.87865364099696
- en 106.87538426792787 64.3043227871687
- ll2 64.30188960294748 106.87865387335896
-EPSG:4130
- ll 86.92678536084577 95.22550779314781
- en 95.22550779314781 86.92678536084591
- ll2 86.92678536084605 95.22550779314781
-EPSG:4131
- ll 80.40055676617331 39.88673092083445
- en 39.85723171587728 80.40587012801929
- ll2 80.40055655851766 39.88673207260142
-EPSG:4132
- ll -38.41968256204226 153.25660056493018
- en 153.25368248363776 -38.42633667513493
- ll2 -38.4196823973653 153.25660063684276
-EPSG:4133
- ll -0.9945740378812076 76.07069458227937
- en 76.07069815670204 -0.9945772719221722
- ll2 -0.9945740378812599 76.0706945822793
-EPSG:4134
- ll -83.98966253074808 125.94095393991665
- en 125.91760097746409 -83.98930961096585
- ll2 -83.98966251788191 125.94095528589
-EPSG:4135
- ll 81.93625837320948 46.34896693407626
- en 46.36433818376086 81.93562420787636
- ll2 81.93625840947695 46.348966054673134
-EPSG:4136
- ll -34.20134443659458 -0.8924040152575685
- en -0.8924040152575685 -34.20134443659458
- ll2 -34.20134443659458 -0.8924040152575685
-EPSG:4137
- ll -36.616654003427705 144.85878564789942
- en 144.85878564789942 -36.616654003427705
- ll2 -36.616654003427705 144.85878564789942
-EPSG:4138
- ll -35.52791455549315 -172.3814685209731
- en -172.3814685209731 -35.52791455549315
- ll2 -35.52791455549315 -172.3814685209731
-EPSG:4139
- ll 24.72769945857206 88.2471872455099
- en 88.24727415399656 24.73042941095441
- ll2 24.727699480639103 88.24718724620853
-EPSG:4140
- ll 72.49933092160293 -103.82090214686986
- en -103.82090214686986 72.4993309221437
- ll2 72.49933092160389 -103.82090214686986
-EPSG:4141
- ll 68.0541183802604 -52.421335534469705
- en -52.42122770847093 68.05333822526845
- ll2 68.05411837769752 -52.421335534115684
-EPSG:4142
- ll -32.07228093017588 -99.28530206895617
- en -99.28390496634319 -32.07852783217583
- ll2 -32.07228067314963 -99.28530212615856
-EPSG:4143
- ll 54.451329286096836 15.799982799657727
- en 15.7986729164663 54.45109288923548
- ll2 54.451329278705316 15.799982758790893
-EPSG:4144
- ll -62.89226966639894 -162.50699776595104
- en -162.49318746815547 -62.88846465960285
- ll2 -62.89227035570027 -162.5070002650436
-EPSG:4145
- ll -46.94301154608069 -15.007824084526248
- en -15.017438835406953 -46.94341687503368
- ll2 -46.94301149252695 -15.00782281942764
-EPSG:4146
- ll 76.62889535962222 -30.91549050137405
- en -30.945806803995403 76.62652856436969
- ll2 76.6288955234209 -30.915488402077592
-EPSG:4147
- ll -42.706615231822326 90.17824363917941
- en 90.17802580750998 -42.70551725501339
- ll2 -42.706615219402146 90.1782436367242
-EPSG:4148
- ll 30.89157561291789 -150.58133287661764
- en -150.58133287661764 30.891575612917066
- ll2 30.891575612916245 -150.58133287661764
-EPSG:4149
- ll -74.14692888573099 90.2446149575137
- en 90.26672564872045 -74.1477110629842
- ll2 -74.14692875526876 90.24461127687006
-EPSG:4150
- ll -76.33517036219865 94.60658570271437
- en 94.63211037512043 -76.33541177965913
- ll2 -76.33517032119866 94.60658139276522
-EPSG:4151
- ll -42.26808870482092 121.5731613895901
- en 121.57316138959008 -42.26808870576004
- ll2 -42.26808870482097 121.57316138959008
-EPSG:4152
- ll 76.53130569701983 -98.1344080635737
- en -98.13440806357372 76.53130569744695
- ll2 76.53130569702077 -98.13440806357372
-EPSG:4153
- ll -87.0297076625921 -23.73014144606617
- en -23.695944073563435 -87.02919141581236
- ll2 -87.02970763719 -23.730139761369777
-EPSG:4154
- ll -57.70397411439384 5.794942404886399
- en 5.796946890721658 -57.70294480050341
- ll2 -57.703974073249256 5.794942484861882
-EPSG:4155
- ll -76.24840015238894 104.41506048093606
- en 104.41237915358039 -76.25060578899512
- ll2 -76.24840004047248 104.41506061691669
-EPSG:4156
- ll 17.236602152717396 19.415913324310395
- en 19.417080504304227 17.233675339138994
- ll2 17.236602169848805 19.415913317520204
-EPSG:4157
- ll -55.87979216521729 178.5495285792082
- en 178.5495285792082 -55.879792165217296
- ll2 -55.879792165217296 178.5495285792082
-EPSG:4158
- ll -67.50183788855513 136.80380535452088
- en 136.8101484830382 -67.5051202129268
- ll2 -67.50183794606504 136.8038054655286
-EPSG:4159
- ll 0.8196608295113066 -11.350600090776652
- en -11.349522716206005 0.8210509070523072
- ll2 0.8196608634567857 -11.350600064643427
-EPSG:4160
- ll -18.012779676487554 54.80315467584728
- en 54.80315467584729 -18.012779676487554
- ll2 -18.012779676487554 54.80315467584729
-EPSG:4161
- ll -7.385092454485829 -2.8676676115466364
- en -2.867806724226814 -7.387005044193471
- ll2 -7.385092530568696 -2.867667617044078
-EPSG:4162
- ll 1.7943161447534521 23.23181814793716
- en 23.23181814793716 1.7943161447534521
- ll2 1.7943161447534521 23.23181814793716
-EPSG:4163
- ll -19.049237387017072 -84.02389907313352
- en -84.02389907313352 -19.049237387017058
- ll2 -19.049237387017044 -84.0238990731335
-EPSG:4164
- ll 74.47614958261784 116.14341051033927
- en 116.13909339758486 74.4751959901439
- ll2 74.47614956012306 116.14341040853498
-EPSG:4165
- ll -79.08793218208473 -68.18000808568067
- en -68.1768601741848 -79.08565213725404
- ll2 -79.0879321536573 -68.1800080464327
-EPSG:4166
- ll 50.45367232899454 131.13177551361764
- en 131.13177551361764 50.45367232899463
- ll2 50.45367232899472 131.13177551361764
-EPSG:4167
- ll -21.810754155398968 179.95853441832475
- en 179.95853441831417 -21.810754156050436
- ll2 -21.810754155398865 179.95853441829976
-EPSG:4168
- ll -41.666637139685115 -150.67479268342555
- en -150.67328734911314 -41.67121018028989
- ll2 -41.66663713583048 -150.67479268468958
-EPSG:4169
- ll -34.88367622583891 -5.574137633146222
- en -5.575300096306759 -34.88818681383287
- ll2 -34.88367597377405 -5.574137568481302
-EPSG:4170
- ll -43.86521679579388 -34.36783561756448
- en -34.36783561756448 -43.86521679673647
- ll2 -43.86521679579395 -34.36783561756448
-EPSG:4171
- ll -13.16333301537773 -101.09157740807196
- en -101.09157740807196 -13.16333301579667
- ll2 -13.163333015377727 -101.09157740807196
-EPSG:4172
- ll 56.20814001733882 -93.03567871472312
- en -93.03567871472312 56.20814001821043
- ll2 56.20814001733922 -93.03567871472312
-EPSG:4173
- ll 77.26504382751486 132.01259507962715
- en 132.01259507962715 77.26504382792031
- ll2 77.26504382751574 132.01259507962715
-EPSG:4174
- ll -41.94846664028856 155.5768340938365
- en 155.5768340938365 -41.94846664028856
- ll2 -41.94846664028856 155.5768340938365
-EPSG:4175
- ll 83.75285396651569 -39.54719632836233
- en -39.54284038842938 83.7528081498091
- ll2 83.75285396752159 -39.54719642397241
-EPSG:4176
- ll -74.7117922014004 25.329786443614466
- en 25.329786443614466 -74.71179220187999
- ll2 -74.71179220140134 25.32978644361447
-EPSG:4178
- ll 89.22667750496447 85.01502872513402
- en 85.03915232707772 89.22562732000216
- ll2 89.22667749985911 85.0150288425769
-EPSG:4179
- ll 65.7399640369897 100.58888239563794
- en 100.58878489424244 65.7390987396707
- ll2 65.73996404055126 100.58888239438218
-EPSG:4180
- ll 21.058558293152757 46.68938663938613
- en 46.68938663938612 21.058558293786085
- ll2 21.058558293152686 46.68938663938612
-EPSG:4181
- ll 36.833749335257636 100.64732804147627
- en 100.64395583575931 36.83538525082746
- ll2 36.83374939162418 100.64732796591183
-EPSG:4182
- ll 7.039749156942406 54.154617845204285
- en 54.15239562622171 7.038794978981049
- ll2 7.039749175526452 54.15461788820013
-EPSG:4183
- ll 62.50401044489885 136.96521001663734
- en 136.9662015861426 62.50635265425051
- ll2 62.504010530415314 136.9652100527854
-EPSG:4184
- ll 60.56784756514443 158.83659223323826
- en 158.837653588017 60.570194603367035
- ll2 60.56784769232237 158.83659229065148
-EPSG:4185
- ll -87.69555319570435 -53.81351579757683
- en -53.81351579757683 -87.69555319570435
- ll2 -87.69555319570435 -53.81351579757683
-EPSG:4188
- ll -30.479324587493878 40.05155341513969
- en 40.05615546958233 -30.484263314491457
- ll2 -30.479324153464848 40.05155305524517
-EPSG:4189
- ll -81.3816480585104 -11.192177576935109
- en -11.192177576935109 -81.38164805878979
- ll2 -81.3816480585111 -11.192177576935109
-EPSG:4190
- ll 86.27835628527546 -129.71558854924012
- en -129.71558854924012 86.27835628539762
- ll2 86.2783562852758 -129.7155885492401
-EPSG:4191
- ll 13.65764910563766 -18.46228225575311
- en -18.46321981459761 13.656957414285003
- ll2 13.65764911624164 -18.462282249255118
-EPSG:4192
- ll -10.031506286198479 129.4409568069537
- en 129.43849257683246 -10.03100170722943
- ll2 -10.03150626553183 129.44095670667653
-EPSG:4193
- ll -65.6335421099941 120.79822156750339
- en 120.79521169761985 -65.63498147659158
- ll2 -65.63354206971691 120.79822165162619
-EPSG:4194
- ll 16.24752418237439 146.95241263155253
- en 146.95433128344547 16.249448911598517
- ll2 16.247524222218466 146.95241267102506
-EPSG:4195
- ll 70.39580804938825 155.48567657589138
- en 155.4945314504922 70.39697046108722
- ll2 70.3958080641836 155.48567669368938
-EPSG:4196
- ll 4.7946435783645995 131.89929918822105
- en 131.90128163656135 4.795069636620188
- ll2 4.794643617657354 131.89929939106813
-EPSG:4197
- ll -22.008055146273335 99.0211244916419
- en 99.02112449164191 -22.008055146273335
- ll2 -22.008055146273335 99.02112449164191
-EPSG:4198
- ll 80.18296001513718 63.861149067746965
- en 63.86114906774697 80.18296001513718
- ll2 80.18296001513718 63.86114906774697
-EPSG:4199
- ll 70.94133526294576 -106.11514102188215
- en -106.11514102188217 70.94133526294576
- ll2 70.94133526294576 -106.11514102188217
-EPSG:4200
- ll 77.90590803965128 -59.012703706327315
- en -59.01075613130922 77.90714420068106
- ll2 77.90590805038912 -59.01270368908906
-EPSG:4201
- ll -71.35856343329056 36.24372552766255
- en 36.24131480032943 -71.35983791789127
- ll2 -71.3585633454759 36.24372569364132
-EPSG:4202
- ll -65.92498683941506 -83.17683857624662
- en -83.17394914099734 -65.92570134005938
- ll2 -65.92498682813998 -83.17683861384995
-EPSG:4203
- ll -69.08306922564796 153.9440701624336
- en 153.94151152469138 -69.08438111626899
- ll2 -69.08306920897067 153.94407019493153
-EPSG:4204
- ll -65.331314922454 -76.28439505037089
- en -76.28021194204995 -65.33355629875851
- ll2 -65.33131501043474 -76.28439488638358
-EPSG:4205
- ll 59.37694444446194 128.0568060148526
- en 128.05444288557823 59.37593066964912
- ll2 59.376944429081 128.05680597905888
-EPSG:4206
- ll -51.80027552471359 -1.8401489460566722
- en -1.8401489460566722 -51.80027552471359
- ll2 -51.80027552471359 -1.8401489460566722
-EPSG:4207
- ll 15.909603877962027 116.32574134324375
- en 116.32294554826431 15.90933675823057
- ll2 15.909603863217296 116.3257411898643
-EPSG:4208
- ll -75.7173424027925 12.239520326435951
- en 12.22816928736602 -75.71664756351223
- ll2 -75.7173423716849 12.239519818227672
-EPSG:4209
- ll -39.66400371857714 -143.71615877898432
- en -143.71601803671766 -39.66602570089302
- ll2 -39.664003809933405 -143.71615877265083
-EPSG:4210
- ll -50.17972505615247 -124.64943397894392
- en -124.64763895678696 -50.18174131570134
- ll2 -50.179725119305914 -124.64943392287795
-EPSG:4211
- ll 61.29641712222795 -143.53354251538872
- en -143.51914564901594 61.295328768692606
- ll2 61.29641725535336 -143.5335442749387
-EPSG:4212
- ll -25.60799639519199 -138.31115795133695
- en -138.3091318986952 -25.612988538683524
- ll2 -25.607996130753612 -138.31115805806894
-EPSG:4213
- ll 47.11756979130985 -33.935449457648474
- en -33.933718571121645 47.11929556494354
- ll2 47.11756980100644 -33.935449447953914
-EPSG:4214
- ll -73.08498356899435 -138.48005744817942
- en -138.4839383007018 -73.08553146347543
- ll2 -73.08498358746574 -138.48005757892207
-EPSG:4215
- ll 16.71015122690521 -93.47504460657574
- en -93.47504460657574 16.71015122690521
- ll2 16.71015122690521 -93.47504460657574
-EPSG:4216
- ll -13.237678914219245 8.03939513459602
- en 8.037354967736826 -13.241151378438133
- ll2 -13.23767888562473 8.03939515128919
-EPSG:4217
- ll 24.200100457462582 169.95073389914154
- en 1290810.0882726298 8782071.471138546
- ll2 24.200100457462554 169.95073389914148
-EPSG:4218
- ll 44.26026608374261 -23.33003020359058
- en -23.33504855286219 44.26415182604166
- ll2 44.26026614494455 -23.330030282351718
-EPSG:4219
- ll 87.72297407255056 -130.6362467520666
- en -130.47329965561232 87.72066395667716
- ll2 87.72297433560571 -130.6362653999294
-EPSG:4220
- ll -52.14869671312482 89.93216200026853
- en 89.93142447271401 -52.148001949188036
- ll2 -52.14869672799084 89.93216201600964
-EPSG:4221
- ll 60.37299501359058 -113.1021548144685
- en -113.09872020185955 60.372778743135434
- ll2 60.37299500589881 -113.10215469248067
-EPSG:4222
- ll 68.19594467644055 68.5628984122771
- en 68.56079763750759 68.19783271155208
- ll2 68.19594452401104 68.56289858171034
-EPSG:4223
- ll -7.673727322411921 135.970788568447
- en 135.96917083539674 -7.678657252739726
- ll2 -7.673727509083607 135.97078850759513
-EPSG:4224
- ll 53.101369753039165 8.346508817355925
- en 8.342602135323325 53.10157063555294
- ll2 53.10136975624042 8.346508755275527
-EPSG:4225
- ll 30.549712634511437 168.12754271527018
- en 168.12882330055837 30.55154660922732
- ll2 30.549712758223098 168.1275428012222
-EPSG:4226
- ll -38.59780112874482 172.16127576657772
- en 172.16127576657772 -38.59780112874482
- ll2 -38.59780112874482 172.16127576657772
-EPSG:4227
- ll 14.784719235874292 47.72721767251886
- en 47.725855587869184 14.783906732354069
- ll2 14.784719231686458 47.72721766554227
-EPSG:4228
- ll -71.21765619428815 -91.96638465390798
- en -91.96638465390798 -71.21765619428815
- ll2 -71.21765619428815 -91.96638465390798
-EPSG:4229
- ll -21.44259851780957 143.6522762822064
- en 143.65238769571613 -21.44303269745417
- ll2 -21.442598533295158 143.65227628615708
-EPSG:4230
- ll 34.015161447478306 -83.46862956520886
- en -83.46757309766906 34.01726971912573
- ll2 34.01516152287126 -83.4686295276042
-EPSG:4231
- ll 4.442744882186574 -25.072361713570785
- en -25.07126145635748 4.443894491619673
- ll2 4.442744920313989 -25.072361677266194
-EPSG:4232
- ll 40.212281230708726 -5.383572082220525
- en -5.383230003910128 40.21187437457605
- ll2 40.21228123916175 -5.383572092766795
-EPSG:4233
- ll -58.53570527150156 -121.51656106664157
- en -121.5174954592181 -58.53929903542043
- ll2 -58.535705452279394 -121.51656111355338
-EPSG:4234
- ll -17.590084288683897 -161.88379290105377
- en -161.88379290105377 -17.590084288683897
- ll2 -17.590084288683897 -161.88379290105377
-EPSG:4235
- ll 72.0615579726871 112.95903587678902
- en 112.95903587678902 72.0615579726871
- ll2 72.0615579726871 112.95903587678902
-EPSG:4236
- ll -39.8153773303425 -148.73761315486587
- en -148.73923341536593 -39.819565703187216
- ll2 -39.815377975895224 -148.73761340359144
-EPSG:4237
- ll 36.2331888608788 149.3601039998146
- en 149.35971239258038 36.23286995783462
- ll2 36.2331888634779 149.36010400299233
-EPSG:4238
- ll -28.021159061368152 -10.715474514958885
- en -10.71527927172916 -28.021116797961675
- ll2 -28.021159061353295 -10.715474514894112
-EPSG:4239
- ll -58.73524417493206 47.544642954425456
- en 47.53781366764641 -58.74095509528099
- ll2 -58.735243646048175 47.54464358561123
-EPSG:4240
- ll -83.57023490456557 -111.16488885762654
- en -111.1570576892399 -83.56272834863157
- ll2 -83.57023614821206 -111.16489015646165
-EPSG:4241
- ll -53.12431843123758 -63.072274357399365
- en -63.07227435739937 -53.12431843123759
- ll2 -53.12431843123759 -63.07227435739938
-EPSG:4242
- ll -54.76656409251667 -38.938209434266355
- en -38.94139437553606 -54.77004376372313
- ll2 -54.76656384647148 -38.93820920958709
-EPSG:4243
- ll 77.67074314838567 -9.540974674576518
- en -9.540974674576518 77.67074314838567
- ll2 77.67074314838567 -9.540974674576518
-EPSG:4244
- ll 21.9391618336484 93.43138571060462
- en 93.43090434239087 21.93996430100049
- ll2 21.939161824937905 93.43138571579946
-EPSG:4245
- ll 57.457271218334114 -57.15888680506609
- en -57.16641985172231 57.45029211390264
- ll2 57.45727240654513 -57.15888552475653
-EPSG:4246
- ll 41.557745069927535 -151.05033309036423
- en -151.05072210130962 41.55944630598175
- ll2 41.557745223014486 -151.05033312523716
-EPSG:4247
- ll 23.290020859441427 -2.8794288695641512
- en -2.88037427122141 23.29259189241406
- ll2 23.29002079430318 -2.8794288457479573
-EPSG:4248
- ll -83.01986631758508 -34.79039563387593
- en -34.78887797619531 -83.01666544979871
- ll2 -83.01986607082972 -34.79039551683737
-EPSG:4249
- ll 41.031388653304276 -151.80193229295924
- en -151.80193229295924 41.031388653304276
- ll2 41.031388653304276 -151.80193229295924
-EPSG:4250
- ll 19.94156354508894 -19.25992364334263
- en -19.259775544979753 19.940084044199768
- ll2 19.941563528434983 -19.259923641685425
-EPSG:4251
- ll 28.7655088948474 47.46769396492823
- en 47.46673797188511 28.76733240517928
- ll2 28.765508908133146 47.46769395799856
-EPSG:4252
- ll -23.370565121653257 32.41602727822877
- en 32.41602727822877 -23.370565121653257
- ll2 -23.370565121653257 32.41602727822877
-EPSG:4253
- ll -60.419481439418824 159.70968956713705
- en 159.70754140045162 -60.4218572520101
- ll2 -60.419481432853125 159.70968957306394
-EPSG:4254
- ll -58.97856851091883 -164.76988489192587
- en -164.76666969375015 -58.97920946920917
- ll2 -58.97856851792592 -164.7698848568448
-EPSG:4255
- ll 61.0340002432485 1.5249768834423207
- en 1.5289183721606194 61.031540810910016
- ll2 61.034000198267265 1.5249769554237327
-EPSG:4256
- ll 62.653779259779895 14.514965961015207
- en 14.519320245214116 62.656772048646516
- ll2 62.653779124080145 14.51496576388597
-EPSG:4257
- ll -4.957469240635248 140.01388776182625
- en 140.0140727268097 -4.959292355187358
- ll2 -4.957469249118245 140.01388776268115
-EPSG:4258
- ll -80.84968402882117 -168.05419412355394
- en -168.05419412355394 -80.84968402882117
- ll2 -80.84968402882117 -168.05419412355394
-EPSG:4259
- ll 89.75768387777978 -89.25584405914114
- en -88.7177983574066 89.75770237066787
- ll2 89.75768387804695 -89.25583906994868
-EPSG:4260
- ll 28.986878961436958 -28.934503839098852
- en -28.93278858338277 28.989924217900985
- ll2 28.986878971108958 -28.934503833678605
-EPSG:4261
- ll -56.434596097225864 -41.67071610993321
- en -41.67281798553407 -56.43717216512722
- ll2 -56.43459601232523 -41.67071604080799
-EPSG:4262
- ll 36.500326349481526 -31.46187621060338
- en -31.469455322326663 36.50110764446039
- ll2 36.50032629877475 -31.46187572099994
-EPSG:4263
- ll -34.92442167202307 -47.63072515770901
- en -47.629295348122334 -34.92831207118893
- ll2 -34.92442163132152 -47.63072517259954
-EPSG:4264
- ll 74.70824365527699 -61.224413517244585
- en -61.21681855229948 74.70786780276498
- ll2 74.70824365281793 -61.22441346753928
-EPSG:4265
- ll -28.319206226467735 -38.902596327434026
- en -38.902123161375904 -28.320061144294833
- ll2 -28.319206233141372 -38.90259629637969
-EPSG:4266
- ll -6.38705007711485 -110.68222673222479
- en -110.68201596796837 -6.388272810550685
- ll2 -6.3870501253675025 -110.6822267239624
-EPSG:4268
- ll -12.201357729803732 -3.1896373568989134
- en -3.1896373568989134 -12.201357729803734
- ll2 -12.201357729803734 -3.1896373568989134
-EPSG:4269
- ll 2.868546390400354 66.32833739896739
- en 66.32833739896739 2.8685463904003545
- ll2 2.8685463904003545 66.32833739896739
-EPSG:4270
- ll -68.98927888426618 -55.64700305278039
- en -55.6396685936096 -68.9925074363488
- ll2 -68.9892786052992 -55.6470036858531
-EPSG:4271
- ll -88.63370442708157 -7.823751778809253
- en -7.962680284239266 -88.63322921674835
- ll2 -88.63370442757748 -7.823751632582927
-EPSG:4272
- ll 83.20243778338946 -16.228952465880127
- en -16.2290188439274 83.20296183357546
- ll2 83.20243780994959 -16.22895251570392
-EPSG:4273
- ll 25.85185498597795 -17.22804335019279
- en -17.226910416682564 25.849136383504266
- ll2 25.85185512999566 -17.228043300328082
-EPSG:4274
- ll -45.19030236455806 -47.46624552737069
- en -47.46510026493116 -45.189875178329665
- ll2 -45.19030236351795 -47.46624552459124
-EPSG:4275
- ll 46.22146536905103 43.67321748974919
- en 43.67227636297003 46.22155709821892
- ll2 46.22146536975111 43.67321748259093
-EPSG:4276
- ll -40.48324468234451 -107.23320827310211
- en -107.23320827310212 -40.48324468234451
- ll2 -40.48324468234451 -107.23320827310212
-EPSG:4277
- ll 7.194922417275691 114.63936798251893
- en 114.64234121676904 7.189477139777509
- ll2 7.194923210232807 114.63936751906132
-EPSG:4278
- ll 76.61299186097477 100.22538844061262
- en 100.22538844061262 76.61299186097477
- ll2 76.61299186097477 100.22538844061262
-EPSG:4279
- ll 48.73904616545258 -45.77281641903812
- en -45.77281641903812 48.739046165452585
- ll2 48.739046165452585 -45.77281641903812
-EPSG:4280
- ll 8.704438638517118 -65.72361797941998
- en -65.72361797941998 8.704438638517118
- ll2 8.704438638517118 -65.72361797941998
-EPSG:4281
- ll 10.91609215513391 -70.81468950492568
- en -70.80922661192132 10.911411011661485
- ll2 10.916092125131307 -70.81468949525764
-EPSG:4282
- ll 63.58929767045916 101.94711158719343
- en 101.9444077777013 63.59360875533944
- ll2 63.5892974053021 101.94711175324652
-EPSG:4283
- ll 62.7572467350229 117.81854151291799
- en 117.81854151291797 62.75724673579026
- ll2 62.75724673502358 117.81854151291799
-EPSG:4284
- ll 0.8449581661526793 54.13800319191617
- en 54.138694250765035 0.8457329267758643
- ll2 0.8449581664503548 54.138003192663824
-EPSG:4285
- ll -30.68771111780034 -67.84301205680276
- en -67.84066148242299 -30.689585128001454
- ll2 -30.68771123563445 -67.8430119097387
-EPSG:4286
- ll -33.962778883392154 -151.61509124748176
- en -151.61509124748176 -33.962778883392154
- ll2 -33.962778883392154 -151.61509124748176
-EPSG:4287
- ll -43.79782415061041 -129.32049060361706
- en -129.32098050230985 -43.79610549514519
- ll2 -43.79782410038332 -129.3204906178845
-EPSG:4288
- ll -11.549157493094214 -99.90379215199304
- en -99.90379215199303 -11.549157493094214
- ll2 -11.549157493094214 -99.90379215199303
-EPSG:4289
- ll -73.19791547797988 -48.495231600937984
- en -48.50838753539962 -73.201700887554
- ll2 -73.19791488588092 -48.49522938062061
-EPSG:4291
- ll 61.853680929169656 62.978778407189935
- en 62.97780533406043 61.85366259757143
- ll2 61.85368092924367 62.97877841108046
-EPSG:4292
- ll -36.39168807404126 -34.622876639260454
- en -34.620821155787674 -36.391370347046326
- ll2 -36.39168807746826 -34.622876661335624
-EPSG:4293
- ll -37.954921355051034 129.40603334947343
- en 129.41214927806513 -37.95080864593278
- ll2 -37.9549218226767 129.40603265691303
-EPSG:4294
- ll 22.393084997513327 8.439081939582167
- en 8.431937495789068 22.391294515796886
- ll2 22.393085277028376 8.439083048634945
-EPSG:4295
- ll -0.19764370301919598 2.770251749649219
- en 2.770251749649219 -0.19764370301919598
- ll2 -0.19764370301919598 2.770251749649219
-EPSG:4297
- ll -54.572709364488745 -73.30446631485994
- en -73.30059189705513 -54.57431105273554
- ll2 -54.57270945676208 -73.30446609217698
-EPSG:4298
- ll 63.32762680124537 -93.59951443366566
- en -93.58515423030634 63.32148408322143
- ll2 63.327627777935646 -93.59951671458981
-EPSG:4299
- ll -41.64832004200034 87.23966001889346
- en 87.24576099034256 -41.65048593494142
- ll2 -41.64831959032879 87.23965895112458
-EPSG:4300
- ll 50.410316202097505 57.41641785406722
- en 57.42305488389195 50.407634551458656
- ll2 50.41031628016334 57.41641767894782
-EPSG:4301
- ll -85.79683832573122 -34.27613820498854
- en -34.31724116690938 -85.79356510257222
- ll2 -85.7968390326561 -34.27612931839186
-EPSG:4302
- ll -32.74079263365769 -71.07237333676576
- en -71.07273516825416 -32.745346556895676
- ll2 -32.7407923277723 -71.07237331257826
-EPSG:4303
- ll 87.65331371951794 -114.7764058853433
- en -114.7764058853433 87.65331371951794
- ll2 87.65331371951794 -114.7764058853433
-EPSG:4304
- ll 38.320949155789094 -89.72332603951872
- en -89.72247758918496 38.323783848972425
- ll2 38.32094929499927 -89.72332599802562
-EPSG:4306
- ll 22.69221561293537 -61.44411014600162
- en -61.44411014600162 22.69221561293537
- ll2 22.69221561293537 -61.44411014600162
-EPSG:4307
- ll 49.39039728467591 -107.43639798870586
- en -107.43523862454522 49.39184834499285
- ll2 49.39039737486666 -107.43639787648623
-EPSG:4308
- ll -2.2085904883886656 74.2782258745423
- en 74.2782258745423 -2.2085904883886656
- ll2 -2.2085904883886656 74.2782258745423
-EPSG:4309
- ll 34.9312994456765 -64.52149282930144
- en -64.52076646935349 34.93065747741454
- ll2 34.93129943950837 -64.52149282235382
-EPSG:4310
- ll 54.00552532111706 166.00782920044202
- en 166.0105304386232 54.008590231851876
- ll2 54.00552532101122 166.00782920034868
-EPSG:4311
- ll -20.235754400003955 -88.49228264059572
- en -88.48977767085165 -20.232857907003787
- ll2 -20.23575428821537 -88.49228254448563
-EPSG:4312
- ll 53.5230556544399 -144.63472070270265
- en -144.6420029662198 53.516718683860624
- ll2 53.52305630695086 -144.63472033601968
-EPSG:4313
- ll -84.85802968196498 -85.13148676934466
- en -85.12328925430992 -84.8574654604925
- ll2 -84.85802966168818 -85.13148636010942
-EPSG:4314
- ll -61.14769041485238 20.760366938835432
- en 20.76360363507369 -61.153606583530326
- ll2 -61.14768973618364 20.760366639440793
-EPSG:4315
- ll -30.2795128861691 25.065968417455878
- en 25.063428726687192 -30.282588392486872
- ll2 -30.27951293693913 25.06596837574111
-EPSG:4316
- ll 66.12958441830065 77.40244834043261
- en 77.40516356567512 66.13068805173909
- ll2 66.1295843946666 77.40244828235255
-EPSG:4317
- ll -32.9523011365577 48.75496134496501
- en 48.75603964416063 -32.951340623712746
- ll2 -32.95230112297978 48.754961360136214
-EPSG:4318
- ll -10.037759381053846 -1.6687013738388146
- en -1.6686485512550933 -10.037779529280625
- ll2 -10.037759381042804 -1.6687013738675853
-EPSG:4319
- ll 42.92951424573329 -71.37084187578725
- en -71.37064464874699 42.92939204187463
- ll2 42.929514245945896 -71.37084187612908
-EPSG:4322
- ll -78.2298411050652 41.9286761453441
- en 41.92852225645521 -78.22984860580547
- ll2 -78.22984110497792 41.92867614530927
-EPSG:4324
- ll -71.6032812266588 -35.651972444136675
- en -35.652198555247786 -71.60328544932469
- ll2 -71.60328122638838 -35.651972444050756
-EPSG:4326
- ll -68.84284749203007 130.32510320615967
- en 130.32510320615967 -68.84284749203007
- ll2 -68.84284749203007 130.32510320615967
-EPSG:4390
- ll -23.782673922181644 103.74470679592577
- en 18733.271193608613 -2857069.405269514
- ll2 -23.78267390874569 103.74470678227769
-EPSG:4391
- ll -8.233980859457589 102.20313141949373
- en 28786.439981745607 -1211381.0427527006
- ll2 -8.233980859002344 102.2031314184343
-EPSG:4392
- ll -85.20284692391868 103.01941868544934
- en 5619.711684458817 -9876227.394502925
- ll2 -85.20284626912873 103.01941691048124
-EPSG:4393
- ll -53.228261994176925 101.04596016317986
- en -52471.72092980255 -6251029.250432908
- ll2 -53.22826184141563 101.04596008536717
-EPSG:4394
- ll 33.2209069039761 102.43861972768998
- en -42383.17139315807 3130431.5327642965
- ll2 33.22090687255846 102.43861970501865
-EPSG:4395
- ll -51.34475061190288 101.17809198223657
- en 58125.02770197725 -6290150.752946063
- ll2 -51.34475047652137 101.1780919131809
-EPSG:4396
- ll 60.08235988405531 101.4343360825725
- en 44490.940998323815 6003856.351487035
- ll2 60.082359667722834 101.43433596159483
-EPSG:4397
- ll -65.98865253949305 100.35250025118366
- en -20939.03933648718 -7725373.582096252
- ll2 -65.98865223541088 100.35250008341878
-EPSG:4398
- ll 88.47652142129806 102.90421529936982
- en 2327.110237353977 9179812.120734131
- ll2 88.47652070571786 102.9042094254149
-EPSG:4414
- ll -50.66583870235593 149.3499719095985
- en 425152.60824043426 -6918044.406374096
- ll2 -50.665838701455165 149.3499719093997
-EPSG:4415
- ll -44.3438929558382 62.85783619707331
- en 4120502.0717474683 -3877419.8800717983
- ll2 -44.34389295789016 62.85783618114142
-EPSG:4417
- ll 26.212007179091813 19.63730544788126
- en 7363929.133543601 2901149.2652654657
- ll2 26.212007184231283 19.637305459338283
-EPSG:4420
- ll -11.226801534800984 179.32789210007925
- en 2474327.587784072 -4075001.3171857297
- ll2 -11.226801534799847 179.32789210006246
-EPSG:4421
- ll -54.97801932511858 -179.6643084572574
- en 1081021.1077419051 -1.999862438865216E7
- ll2 -54.97801932508472 -179.6643084572605
-EPSG:4422
- ll 26.57890389350804 -170.75349442972762
- en 1720953.1900965665 9645059.421652708
- ll2 26.578903893508045 -170.75349442972762
-EPSG:4423
- ll 10.45947663054281 -168.21076667745274
- en 487029.6037389542 3799218.6649041525
- ll2 10.459476630534763 -168.2107666773555
-EPSG:4424
- ll -39.112656003530944 -161.34187307780522
- en 976124.8155317603 -1.421220741927928E7
- ll2 -39.11265600352026 -161.34187307781738
-EPSG:4425
- ll 29.831600885327546 -152.06684704427974
- en 1936197.0366878645 1.0828360333263546E7
- ll2 29.83160088532753 -152.06684704427965
-EPSG:4426
- ll 6.6205480242125105 -152.3844131810844
- en -315096.9814236032 2411538.109658263
- ll2 6.620548024050332 -152.38441317863118
-EPSG:4427
- ll -59.82986721378563 -147.38991349840438
- en 466289.68099955906 -2.1816701211694196E7
- ll2 -59.829867208277086 -147.38991348695453
-EPSG:4428
- ll 68.6031695379929 -129.5397714681133
- en 2368964.8656417266 2.4999871570681438E7
- ll2 68.60316953679413 -129.53977147157562
-EPSG:4429
- ll 46.87405414202004 -134.38848060769138
- en 293357.4188615634 1.7077655808968317E7
- ll2 46.87405413984725 -134.38848060707724
-EPSG:4430
- ll 50.28297711493596 -118.92485964373829
- en 2592812.2783543332 1.830062331452752E7
- ll2 50.282977114500525 -118.92485964375676
-EPSG:4431
- ll 44.075160599000185 -121.53911907323241
- en 447923.2825846468 1.6044083877664803E7
- ll2 44.07516059828389 -121.53911907337606
-EPSG:4432
- ll 15.566774008254328 -107.59430133301731
- en 2839040.4014863754 5655932.452761521
- ll2 15.566774008238353 -107.5943013330767
-EPSG:4433
- ll -7.906077884587333 -102.61936937920339
- en 2501558.0452448507 -2869630.127540194
- ll2 -7.906077884586352 -102.61936937922789
-EPSG:4434
- ll 60.49927706954088 30.117686671208595
- en 8836003.239828257 6725460.616230211
- ll2 60.49927706547966 30.11768667112137
-EPSG:4437
- ll 65.14743255492381 16.53782430627976
- en 6051966.793149676 7592476.628234221
- ll2 65.14743255492458 16.537824306279756
-EPSG:4438
- ll 27.030220429188034 -81.12612333390825
- en -355401.2417877173 9857588.904859647
- ll2 27.030220427829178 -81.12612333623194
-EPSG:4439
- ll 23.304483457919247 -64.80031841828573
- en 3050139.9113281323 8475915.644095838
- ll2 23.304483457819796 -64.8003184181126
-EPSG:4457
- ll 66.63023954484217 -44.5906764500688
- en 1.007481184689312E7 1.1432177593708815E7
- ll2 66.63023954484215 -44.59067645006881
-EPSG:4462
- ll -79.13026210083349 131.70266714628684
- en -12489.028284960328 -7042015.771225906
- ll2 -79.13026210083348 131.70266714628684
-EPSG:4463
- ll -73.13677805423302 -65.77662975685317
- en -65.77662975685315 -73.13677805475648
- ll2 -73.13677805423399 -65.77662975685315
-EPSG:4467
- ll 21.97398440747793 -53.44332815135097
- en 867360.6257294992 2434217.6701487317
- ll2 21.973984407445766 -53.44332815130979
-EPSG:4470
- ll -15.755999419640688 22.402377766250765
- en 22.40237776625077 -15.755999420134398
- ll2 -15.755999419640679 22.40237776625077
-EPSG:4471
- ll -80.79697279610487 45.997009529381565
- en 517800.66015265713 1029304.8750471603
- ll2 -80.7969727961056 45.99700952938157
-EPSG:4475
- ll 22.999982490648875 -18.392610405512954
- en -18.390903291336468 23.00149376838043
- ll2 22.99998244777793 -18.392610453663288
-EPSG:4483
- ll 83.32157867206362 -81.42740996855306
- en -81.42740996855306 83.32157867228145
- ll2 83.32157867206419 -81.42740996855306
-EPSG:4484
- ll 25.22171762911809 -120.27042868698996
- en 170461.93587154627 2793509.1668661344
- ll2 25.221717629092428 -120.27042868704125
-EPSG:4485
- ll 86.72316328452652 -111.25790369926298
- en 498354.1026955205 9632116.13904623
- ll2 86.72316328452682 -111.257903699263
-EPSG:4486
- ll -60.52508417957466 -111.85642101361049
- en 124105.74865104991 -6729505.84602685
- ll2 -60.5250841714949 -111.85642099134053
-EPSG:4487
- ll -34.62472524886135 -102.60518262761308
- en 169448.36202192173 -3837341.4492826276
- ll2 -34.624725248757 -102.6051826277531
-EPSG:4488
- ll 46.03309217374695 -92.98761636782223
- en 500958.3214872228 5097724.344746348
- ll2 46.03309217374705 -92.98761636782221
-EPSG:4489
- ll -42.0247677968381 -80.08041219366298
- en 1072985.9205878489 -4675748.749189082
- ll2 -42.024767788877064 -80.08041219868457
-EPSG:4490
- ll -3.677098187550257 33.34083626548144
- en 33.34083626548144 -3.677098187550257
- ll2 -3.677098187550257 33.34083626548144
-EPSG:4491
- ll 48.066278283574405 75.70787731215223
- en 1.3552757755125163E7 5326039.59476589
- ll2 48.06627828357439 75.70787731215225
-EPSG:4492
- ll -38.19550593644975 81.8738649793563
- en 1.4576550203110425E7 -4229559.835970924
- ll2 -38.19550593644973 81.87386497935637
-EPSG:4493
- ll -13.923425639711596 88.61586805534029
- en 1.5674646934117733E7 -1540466.2442364867
- ll2 -13.923425639711452 88.61586805533835
-EPSG:4494
- ll -77.74863900223014 87.45730584591071
- en 1.6368835826062229E7 -8639976.416411977
- ll2 -77.74863900191447 87.45730585042185
-EPSG:4495
- ll -61.91014431541945 103.293818420521
- en 1.7725533263631616E7 -6874377.462945686
- ll2 -61.910144314946514 103.29381842019733
-EPSG:4496
- ll 1.6675990069171007 101.10568725087866
- en 1.806633374648538E7 184823.46461050797
- ll2 1.6675990069119695 101.10568725131796
-EPSG:4497
- ll 59.73648852066887 113.5003858239425
- en 1.9640607632214922E7 6627365.560598294
- ll2 59.7364885206484 113.50038582394228
-EPSG:4498
- ll -62.256271071809266 120.03311387652248
- en 2.065755158716247E7 -6909183.772811197
- ll2 -62.256271071751236 120.0331138765107
-EPSG:4499
- ll 42.568213271003344 126.81931816157962
- en 2.1813622718028538E7 4721829.940785813
- ll2 42.56821327076346 126.81931816169673
-EPSG:4500
- ll 81.37029110396529 134.45479151737752
- en 2.259128058542562E7 9042451.884828743
- ll2 81.37029110386362 134.45479151334374
-EPSG:4501
- ll 75.39131160405302 132.19398428346358
- en 2.3420996187609453E7 8372488.35742851
- ll2 75.39131160404398 132.19398428347307
-EPSG:4502
- ll -0.023067976636809817 75.67248337236718
- en 574862.2309717248 -2550.9016986981474
- ll2 -0.023067976636809817 75.67248337236714
-EPSG:4503
- ll 35.20663535698455 83.13075725028963
- en 694037.7968468092 3899598.217877535
- ll2 35.2066353569799 83.13075725029745
-EPSG:4504
- ll -26.753234080110353 85.50749810382769
- en 351529.85023231246 -2961158.84668583
- ll2 -26.75323408011009 85.50749810382698
-EPSG:4505
- ll -86.35862877012775 94.29531049912592
- en 509187.78821363853 -9595355.667612847
- ll2 -86.35862877012775 94.2953104991259
-EPSG:4506
- ll -1.767662287130264 97.53085703294111
- en 336515.0561692001 -195523.26490946484
- ll2 -1.7676622871302519 97.53085703294362
-EPSG:4507
- ll -42.94382841689065 106.53642891101563
- en 625397.0685880556 -4757625.246050319
- ll2 -42.94382841688961 106.53642891101678
-EPSG:4508
- ll 57.47979702762464 115.31958316551133
- en 759019.3030080172 6381585.154838034
- ll2 57.479797027042984 115.31958316524927
-EPSG:4509
- ll -50.127371459014 119.11999729083031
- en 651586.7325755176 -5557167.371927636
- ll2 -50.12737145900531 119.11999729083362
-EPSG:4510
- ll -5.589685262554184 117.18484754349909
- en -145377.33884860412 -621293.4260948802
- ll2 -5.58968526231876 117.1848475476615
-EPSG:4511
- ll -58.910065523020464 124.14135912269165
- en 220177.0695439708 -6542820.420208998
- ll2 -58.91006552189655 124.1413591235757
-EPSG:4512
- ll -9.087117412341883 128.47201872342316
- en -219120.5590927091 -1011376.743148509
- ll2 -9.087117411565098 128.47201873023712
-EPSG:4513
- ll 69.4458268422413 68.70729769103177
- en 2.525370830179961E7 7719837.820082438
- ll2 69.44582683972149 68.70729770369695
-EPSG:4514
- ll 2.870310977698523 74.62443809026544
- en 2.6124484776031043E7 317939.6287365035
- ll2 2.870310977695038 74.62443809045966
-EPSG:4515
- ll -64.77418882330421 77.53943052447251
- en 2.7335432696545087E7 -7190660.941597578
- ll2 -64.77418882319478 77.53943052452213
-EPSG:4516
- ll -27.829843702442275 77.73205857165028
- en 2.788180797233948E7 -3095412.2504059584
- ll2 -27.829843700780803 77.7320585689709
-EPSG:4517
- ll 8.33595960030344 92.14886376086488
- en 3.0067890849125437E7 925514.5638687763
- ll2 8.335959600158061 92.14886375920047
-EPSG:4518
- ll -83.35495178279552 92.25287307661097
- en 3.0529109814307995E7 -9260355.92867385
- ll2 -83.35495178279525 92.25287307660969
-EPSG:4519
- ll -47.071616697793644 90.66748852196469
- en 3.132283917463388E7 -5217849.867502088
- ll2 -47.071616697779035 90.66748852195744
-EPSG:4520
- ll 70.3418469154181 89.99935481619303
- en 3.22749324558693E7 7818229.91662007
- ll2 70.34184691369319 89.99935482456415
-EPSG:4521
- ll -31.39513063809025 98.79435803134676
- en 3.3480441743328795E7 -3474801.8747384395
- ll2 -31.395130638090258 98.79435803134676
-EPSG:4522
- ll 53.53669131693019 98.32392935407063
- en 3.425631915248077E7 5940640.058395473
- ll2 53.53669131669398 98.3239293540891
-EPSG:4523
- ll 1.022910627936156 105.12612717036495
- en 3.551403820123471E7 113107.99841560407
- ll2 1.022910627936156 105.12612717036498
-EPSG:4524
- ll 70.99309509619886 114.71680195659121
- en 3.674380695197845E7 7893309.003657653
- ll2 70.99309509314466 114.71680193314492
-EPSG:4525
- ll -31.410212841606075 113.38858171631394
- en 3.772716766397126E7 -3478924.5190987326
- ll2 -31.410212841599332 113.38858171632766
-EPSG:4526
- ll -7.897229631180707 115.74624832065038
- en 3.869258893940946E7 -873689.1016446177
- ll2 -7.897229631180561 115.74624832064545
-EPSG:4527
- ll -53.14587918027668 119.77183431337474
- en 3.968544516975135E7 -5894445.434536731
- ll2 -53.14587918023305 119.77183431338052
-EPSG:4528
- ll 23.753960814685755 124.42578482086374
- en 4.095148883587583E7 2635071.710403459
- ll2 23.753960814543234 124.42578482112404
-EPSG:4529
- ll -7.809372067756968 125.69480931992689
- en 4.17973273014408E7 -864519.765208425
- ll2 -7.8093720677548575 125.6948093198797
-EPSG:4530
- ll -1.9602906731208805 130.684424937245
- en 4.3021748811343275E7 -217489.39998184028
- ll2 -1.9602906731006522 130.68442493597888
-EPSG:4531
- ll -12.57728208377874 128.88518656557372
- en 4.348752374170778E7 -1390948.7919051244
- ll2 -12.57728208377874 128.88518656557372
-EPSG:4532
- ll -59.75160038863199 127.64552674358522
- en 4.425531733830785E7 -6634436.430641838
- ll2 -59.75160038806514 127.64552674391614
-EPSG:4533
- ll 20.13884492251809 134.65901764479938
- en 4.546434841914157E7 2227773.6282620127
- ll2 20.138844922518086 134.65901764479938
-EPSG:4534
- ll -48.02827490462544 70.88653557923729
- en 193226.70586031943 -5329765.467550711
- ll2 -48.02827490417979 70.88653557920927
-EPSG:4535
- ll -64.3676919469174 83.71978310916025
- en 775907.9468319138 -7153275.182688783
- ll2 -64.36769194466842 83.71978310436091
-EPSG:4536
- ll -16.379944476798926 85.7562196173225
- en 1008600.5602325664 -1817651.118948194
- ll2 -16.37994447665808 85.75621961707239
-EPSG:4537
- ll -39.36932421445621 77.66969475556901
- en -45727.13101746177 -4378672.027652129
- ll2 -39.36932421034038 77.66969475558345
-EPSG:4538
- ll -9.847032186894594 93.16779378545597
- en 1177788.6347890275 -1095192.5327895056
- ll2 -9.84703218633616 93.16779378105383
-EPSG:4539
- ll 33.279643174252925 88.73660399026015
- en 382301.6221222776 3684474.5377369095
- ll2 33.279643174252755 88.73660399025967
-EPSG:4540
- ll 43.41266882859773 97.06562751338849
- en 829303.6093849521 4816602.463819633
- ll2 43.412668828236356 97.06562751352176
-EPSG:4541
- ll 75.20759001871474 99.96791846858862
- en 613051.4185006615 8353895.220010067
- ll2 75.20759001864074 99.96791846837348
-EPSG:4542
- ll -5.909361536895773 102.98002176712576
- en 941064.9144885372 -655025.6978904892
- ll2 -5.90936153687589 102.98002176668875
-EPSG:4543
- ll -7.079045830125082 106.32847886077595
- en 978639.9363888358 -785031.5629152828
- ll2 -7.079045830084824 106.32847886011616
-EPSG:4544
- ll -51.93709464368685 108.73884769260711
- en 757092.6977655819 -5762952.829383553
- ll2 -51.93709464342444 108.73884769259944
-EPSG:4545
- ll 48.26670017504668 103.76239044409503
- en 185432.74573343334 5356771.217255302
- ll2 48.26670017451189 103.76239044408608
-EPSG:4546
- ll -84.40302821262473 113.49662454851645
- en 527187.7839146368 -9377427.355290828
- ll2 -84.40302821262448 113.4966245485129
-EPSG:4547
- ll -42.75279079883323 120.33935821377351
- en 1019068.0770287707 -4754792.184090156
- ll2 -42.75279079390508 120.33935821192495
-EPSG:4548
- ll 9.763417423397314 121.77092038912244
- en 1024029.4751808897 1083393.3686317187
- ll2 9.763417423298371 121.7709203881868
-EPSG:4549
- ll 55.08404324916455 117.1041132610643
- en 315094.9295606373 6110419.389910303
- ll2 55.08404324910884 117.10411326106188
-EPSG:4550
- ll -57.72214090409227 122.142754289
- en 448917.3623205224 -6400659.160035993
- ll2 -57.72214090409222 122.14275428899998
-EPSG:4551
- ll -10.898943284054695 123.18307024205889
- en 191924.20553138788 -1206720.4806736982
- ll2 -10.898943284051052 123.18307024210554
-EPSG:4552
- ll 38.9539789593703 128.68197004055637
- en 472432.3405277671 4313443.058413072
- ll2 38.9539789593703 128.68197004055637
-EPSG:4553
- ll -70.2665490423552 135.07540020189455
- en 615894.7427016828 -7801646.50368948
- ll2 -70.26654904232245 135.0754002018745
-EPSG:4554
- ll 86.96592335599365 139.00035447454192
- en 523630.5665229246 9663904.950817004
- ll2 86.96592335599304 139.00035447428934
-EPSG:4555
- ll -89.22299681774652 99.41791202718616
- en 99.41791202718616 -89.22299681774652
- ll2 -89.22299681774652 99.41791202718616
-EPSG:4558
- ll -5.866724713061728 -22.76818727304328
- en -22.76818727304329 -5.8667247132538645
- ll2 -5.866724713061741 -22.76818727304329
-EPSG:4559
- ll 54.783890096540716 -66.65209914950772
- en 265179.8497964299 6076860.996303867
- ll2 54.78389009631653 -66.65209914948085
-EPSG:4568
- ll 75.1058569585739 72.01776537415655
- en 1.3414433763261804E7 8341050.165417869
- ll2 75.10585695856021 72.01776537417301
-EPSG:4569
- ll -60.3229400451098 81.72014571900793
- en 1.453979197643533E7 -6690387.343904872
- ll2 -60.32294004510978 81.72014571900792
-EPSG:4570
- ll -40.29450509396793 83.01301905817438
- en 1.5160952617889041E7 -4469944.718905516
- ll2 -40.294505093690695 83.01301905799536
-EPSG:4571
- ll -14.841964536281338 89.66433629891996
- en 1.6140802041876927E7 -1644213.1544124205
- ll2 -14.841964536267891 89.66433629898319
-EPSG:4572
- ll -85.4001349496804 92.45358806384546
- en 1.7441486856523994E7 -9491698.616613138
- ll2 -85.40013494967124 92.45358808537094
-EPSG:4573
- ll -85.86387690674731 106.14594094920669
- en 1.8509231163368903E7 -9540250.028837156
- ll2 -85.86387690674732 106.14594094920682
-EPSG:4574
- ll 35.250628260887055 117.56420554970566
- en 2.009785013027086E7 3922284.3342060097
- ll2 35.250628256992314 117.56420555144496
-EPSG:4575
- ll -58.965071321436696 116.29862508432664
- en 2.045964725039144E7 -6539104.178023662
- ll2 -58.9650713214367 116.29862508432663
-EPSG:4576
- ll -24.87900832691136 117.48448330245083
- en 2.0942094348405235E7 -2764021.3217479815
- ll2 -24.87900832630588 117.48448330133311
-EPSG:4577
- ll -12.752393885027459 123.17835661910159
- en 2.1866818986064088E7 -1417462.1975042499
- ll2 -12.752393884578215 123.17835662119067
-EPSG:4578
- ll 55.75777766389254 129.5797686359694
- en 2.3159885486278355E7 6195017.68387763
- ll2 55.757777661555956 129.57976863803142
-EPSG:4579
- ll 25.179502627323615 77.04909083499997
- en 706586.1317216671 2787560.1738083265
- ll2 25.179502627322133 77.04909083500314
-EPSG:4580
- ll -17.59786951283907 76.40660245763462
- en 12007.229011098447 -1952432.724545664
- ll2 -17.597869512719317 76.40660245774116
-EPSG:4581
- ll -54.37559505649157 84.17214900156787
- en 316255.6666866485 -6031515.694054953
- ll2 -54.37559505644283 84.17214900156398
-EPSG:4582
- ll -7.70220898267867 86.49921966376468
- en -218687.97745040967 -857214.8044915311
- ll2 -7.702208982014709 86.49921967118307
-EPSG:4583
- ll 74.5818129308274 100.81943952728935
- en 554008.8512140479 8281231.224935144
- ll2 74.58181293082663 100.81943952728916
-EPSG:4584
- ll -62.49138199560312 108.360331460281
- en 673179.0550430366 -6936322.226757721
- ll2 -62.49138199549733 108.36033146024788
-EPSG:4585
- ll -71.95338464905535 106.41622705276453
- en 341578.77710646996 -7993095.34621723
- ll2 -71.95338464876744 106.41622705352052
-EPSG:4586
- ll -27.23805291750078 118.69372970532018
- en 667772.6375395533 -3015196.655235864
- ll2 -27.238052917500205 118.69372970532169
-EPSG:4587
- ll 74.78875483663288 122.34219096944321
- en 480726.6961667623 8303609.495075747
- ll2 74.78875483663289 122.34219096944321
-EPSG:4588
- ll -36.39792018640909 135.00803966581876
- en 1039275.5028788979 -4046581.6904198206
- ll2 -36.39792018390298 135.00803966710782
-EPSG:4589
- ll -4.310656147819657 139.9800737414219
- en 1053525.0079218037 -478476.83405296964
- ll2 -4.310656147754478 139.98007373971046
-EPSG:4600
- ll -27.33554529735659 6.435287602050124
- en 6.435287602050124 -27.335545297356592
- ll2 -27.335545297356592 6.435287602050124
-EPSG:4601
- ll 42.28090403841756 -48.876267252587155
- en -48.87381896614603 42.28261495664125
- ll2 42.280904007848484 -48.87626729616828
-EPSG:4602
- ll 43.688935939303434 105.2875639028266
- en 105.29847931519745 43.69150862844653
- ll2 43.68893620421219 105.28756502256144
-EPSG:4603
- ll -26.23682988994114 -138.93041895278435
- en -138.9292799475101 -26.23930269387996
- ll2 -26.23682982304796 -138.93041898342912
-EPSG:4604
- ll -14.705502133911622 -53.59542063539894
- en -53.59869923649688 -14.709813670158724
- ll2 -14.70550200973415 -53.59542054156529
-EPSG:4605
- ll -77.87654322760518 25.56883368675514
- en 25.56196057383396 -77.87903907033969
- ll2 -77.87654305812262 25.568834153233748
-EPSG:4606
- ll -59.194526738799624 8.223120848916722
- en 8.220531394204302 -59.19765578430941
- ll2 -59.1945265104017 8.223121037576446
-EPSG:4607
- ll -38.18345402736053 -157.1148742753823
- en -157.1122464099667 -38.186731785268435
- ll2 -38.18345380353944 -157.1148744540718
-EPSG:4608
- ll -85.20567205720383 -67.34797722460036
- en -67.34797722460036 -85.20567205720383
- ll2 -85.20567205720383 -67.34797722460036
-EPSG:4609
- ll -66.03704416564575 -55.751522515082414
- en -55.751522515082414 -66.03704416564575
- ll2 -66.03704416564575 -55.751522515082414
-EPSG:4610
- ll 11.574149384077316 -142.61144397344628
- en -142.61144397344628 11.574149384077316
- ll2 11.574149384077316 -142.61144397344628
-EPSG:4611
- ll -8.412679713935248 121.92623566409543
- en 121.92405360961618 -8.410958295935544
- ll2 -8.412679691384646 121.92623561843016
-EPSG:4612
- ll -76.60355532261208 117.8666647679243
- en 117.86666476792429 -76.60355532303709
- ll2 -76.603555322613 117.8666647679243
-EPSG:4613
- ll 19.49163379078577 -98.81567798791089
- en -98.81088640652588 19.489056722103413
- ll2 19.491634318184776 -98.81567896271176
-EPSG:4614
- ll 62.6323301321647 -99.66732001434717
- en -99.66651961834334 62.63590117911389
- ll2 62.63233030557091 -99.66731994973469
-EPSG:4615
- ll 31.332378898989276 -151.25236918338334
- en -151.25214130392598 31.333304419149638
- ll2 31.332379025082282 -151.25236915248877
-EPSG:4616
- ll 18.95324066988617 -97.41725255896134
- en -97.4146834581874 18.953704073153506
- ll2 18.953240700022132 -97.4172523928958
-EPSG:4617
- ll -3.9787905998594226 -63.96788977441658
- en -63.967889774416584 -3.978790599990221
- ll2 -3.978790599859424 -63.9678897744166
-EPSG:4618
- ll -80.10928162644366 5.185561790509269
- en 5.185019908599138 -80.10864010852461
- ll2 -80.10928162153127 5.185561786359724
-EPSG:4619
- ll -24.255225188322314 -47.66450664653706
- en -47.66450664653707 -24.255225189029527
- ll2 -24.25522518832208 -47.66450664653707
-EPSG:4620
- ll 61.14310084247208 53.55288546090355
- en 53.552725239837045 61.14373190422174
- ll2 61.14310083340953 53.552885463200994
-EPSG:4621
- ll 68.70001366577722 171.33724672283927
- en 171.3438006569828 68.70115030203891
- ll2 68.70001361872312 171.33724645180155
-EPSG:4622
- ll 31.610134047835544 -19.9904877484463
- en -19.988646973141766 31.61112402828848
- ll2 31.610134001023095 -19.990487835060428
-EPSG:4623
- ll 21.066939597261737 173.67291052310338
- en 173.67491302944887 21.06724722257826
- ll2 21.06693962029171 173.67291067213833
-EPSG:4624
- ll -32.62506132674517 15.053323394267466
- en 15.053323394267464 -32.62506132760236
- ll2 -32.62506132674517 15.05332339426746
-EPSG:4625
- ll -35.20812008529037 -80.98843178312073
- en -80.99127814429451 -35.207684665023855
- ll2 -35.20812010114897 -80.98843167990833
-EPSG:4626
- ll -71.28412202350901 -31.714789466115207
- en -31.693653742985443 -71.28589999696905
- ll2 -71.28412245473088 -31.71478434739383
-EPSG:4627
- ll 70.42976470943245 42.97958510184628
- en 42.97958510184628 70.42976471002753
- ll2 70.42976470943337 42.97958510184628
-EPSG:4628
- ll -55.28061774057693 22.027583930527555
- en 22.026833248826623 -55.283607625756815
- ll2 -55.280617821794735 22.027583910182017
-EPSG:4629
- ll 37.59492328982094 -112.56239284304682
- en -112.56210590506063 37.59356077239602
- ll2 37.59492329190364 -112.56239284223932
-EPSG:4630
- ll -28.82224259778709 134.43944402085475
- en 134.44202404741415 -28.824046713780923
- ll2 -28.82224268822542 134.43944414952045
-EPSG:4631
- ll -80.50437390356909 157.03209992050313
- en 157.02582729023592 -80.50296945944045
- ll2 -80.50437389775895 157.03209989454996
-EPSG:4632
- ll 79.19467642120534 73.9747817401292
- en 73.95802579315506 79.19399164203642
- ll2 79.19467643456844 73.9747820672504
-EPSG:4633
- ll -7.421661604033147 -69.39353333201704
- en -69.39708733601738 -7.4196963716055375
- ll2 -7.421661545176102 -69.39353343775709
-EPSG:4634
- ll -25.716099846524557 23.320508863062457
- en 23.32364182921172 -25.71853161348509
- ll2 -25.71609983589389 23.320508849441907
-EPSG:4635
- ll 37.48349326697864 -157.02892206541725
- en -157.02903555720775 37.48622493964546
- ll2 37.48349332894091 -157.0289221159572
-EPSG:4636
- ll -81.26454107627532 158.48872885427392
- en 158.50725504484024 -81.26263691621047
- ll2 -81.26454108910262 158.488728729443
-EPSG:4637
- ll -66.68465817126382 -9.304310819983442
- en -9.308940148511068 -66.68830154219863
- ll2 -66.68465824716 -9.304310916299613
-EPSG:4638
- ll 53.63650645903502 -132.47232596419582
- en -132.46827130013733 53.63414789766262
- ll2 53.63650645475558 -132.47232595685517
-EPSG:4639
- ll -76.34577292658541 -14.998692938680534
- en -14.996339574487843 -76.34830566974846
- ll2 -76.34577306671855 -14.998692808546176
-EPSG:4640
- ll -8.827494808631243 83.3542860215075
- en 83.35428602150749 -8.827494808631243
- ll2 -8.827494808631247 83.35428602150749
-EPSG:4641
- ll 9.790381620770631 95.4933254342049
- en 95.49608988896954 9.792093818359767
- ll2 9.790381721430755 95.4933255956687
-EPSG:4642
- ll 72.69763982776485 86.50088239916005
- en 86.50113119156227 72.69434929203327
- ll2 72.6976396512689 86.50088241249924
-EPSG:4643
- ll 64.33422210982951 80.39122757744263
- en 80.39705078938698 64.32968685164325
- ll2 64.33422289637227 80.39122799245447
-EPSG:4644
- ll 43.55159825065658 -113.89300258673859
- en -113.8946439675283 43.55253132959179
- ll2 43.551598344993664 -113.89300275209702
-EPSG:4645
- ll 36.658736311097314 42.074417257339974
- en 42.074417257339974 36.659524250673115
- ll2 36.65873633817407 42.074417257339974
-EPSG:4646
- ll 61.71320735955982 -8.723055937729214
- en -8.729823402542051 61.7072875368746
- ll2 61.71320793785001 -8.723055277489852
-EPSG:4647
- ll 59.88267371214022 5.934700997289097
- en 3.232846033047261E7 6642315.552206981
- ll2 59.88267371207178 5.934700997298632
-EPSG:4652
- ll -5.815021603611967 78.1096483191611
- en 2.584456767446174E7 -643973.4989402565
- ll2 -5.815021603607945 78.1096483190484
-EPSG:4653
- ll -45.45266088500455 72.09418409653303
- en 2.6038031431635916E7 -5052338.127918371
- ll2 -45.45266088141199 72.09418409797884
-EPSG:4654
- ll 61.1560719568715 82.50960833924967
- en 2.7581276355553433E7 6783941.109034766
- ll2 61.156071956870534 82.50960833924981
-EPSG:4655
- ll -57.95834167410335 77.31050823237761
- en 2.810435979749496E7 -6446368.020633205
- ll2 -57.958341666415706 77.31050824860812
-EPSG:4656
- ll -85.73062946496971 87.19526732081016
- en 2.9501623666310977E7 -9525278.337718418
- ll2 -85.73062946496972 87.19526732081023
-EPSG:4657
- ll 68.40002822115966 -17.601952174074114
- en -17.606361313630128 68.39850034984396
- ll2 68.40002846851098 -17.60195146084509
-EPSG:4658
- ll 53.32647359294219 -170.17803330907654
- en -170.17715134571682 53.32816688207588
- ll2 53.32647363646293 -170.17803328646391
-EPSG:4659
- ll 23.059030845013666 -67.64605401691541
- en -67.64605401691541 23.059030845694235
- ll2 23.059030845013513 -67.64605401691541
-EPSG:4660
- ll 75.02799734478108 -156.34350951665948
- en -156.32733780208682 75.0286886102005
- ll2 75.0279979056346 -156.3435067735627
-EPSG:4661
- ll 56.1700982171952 115.47318859782018
- en 115.4731885978202 56.170098218067274
- ll2 56.17009821719559 115.4731885978202
-EPSG:4662
- ll -48.49218310902434 -26.089223084709886
- en -26.084917862465673 -48.49570096934785
- ll2 -48.49218315089533 -26.08922303362353
-EPSG:4663
- ll -61.11279948829123 174.00947165648665
- en 174.00393311333485 -61.11857664594509
- ll2 -61.11279961160895 174.00947153847244
-EPSG:4664
- ll 4.646407671888653 68.98970337576068
- en 68.98752886326677 4.646084982589304
- ll2 4.646407655990287 68.9897032693374
-EPSG:4665
- ll 77.56370048305499 -97.38296501285174
- en -97.37769642234146 77.56279508193626
- ll2 77.5637004697112 -97.38296493521241
-EPSG:4666
- ll 59.55603825311388 -163.87990849147943
- en -163.88564822264922 59.54957787122103
- ll2 59.55603868193693 -163.87990811106948
-EPSG:4667
- ll 30.19393741657578 -110.55620855952918
- en -110.55620855952918 30.19393741657509
- ll2 30.193937416574396 -110.55620855952918
-EPSG:4668
- ll -5.0971791635522266 105.36059699225694
- en 105.35961499353857 -5.096195418175537
- ll2 -5.097179134143423 105.36059696309525
-EPSG:4669
- ll 13.286790794268796 -0.24013649075311605
- en -0.24013649075311613 13.28679079469138
- ll2 13.286790794268793 -0.2401364907531162
-EPSG:4670
- ll 71.70059778702725 -171.42077197621683
- en -171.42077197621683 71.70059778702772
- ll2 71.70059778702819 -171.42077197621688
-EPSG:4671
- ll 53.18552838094905 -81.75413478498471
- en -81.75413478498471 53.18552838094905
- ll2 53.18552838094905 -81.75413478498471
-EPSG:4672
- ll -33.83674021550062 -130.30135728631234
- en -130.30306470311527 -33.83792466272896
- ll2 -33.836740232248786 -130.30135731034304
-EPSG:4673
- ll 81.64900862643486 164.22915703304164
- en 164.23040691187407 81.64755273710988
- ll2 81.64900856970928 164.22915708764677
-EPSG:4674
- ll -14.184748334995248 81.29822305035344
- en 81.29822305035344 -14.184748335444095
- ll2 -14.184748334995248 81.29822305035344
-EPSG:4675
- ll -78.0649700260185 163.570596080381
- en 163.55907152866612 -78.06654023563179
- ll2 -78.06496992624405 163.57059681226696
-EPSG:4676
- ll -47.701550221433166 32.70129574489033
- en 32.70129574489033 -47.701550221433166
- ll2 -47.701550221433166 32.70129574489033
-EPSG:4677
- ll 18.67753589788019 21.56816054221474
- en 21.568160542214745 18.67753589788019
- ll2 18.67753589788019 21.568160542214745
-EPSG:4678
- ll 29.176750619168047 15.964480675856151
- en 15.965903627840811 29.177071187615795
- ll2 29.176750623976552 15.964480697095306
-EPSG:4679
- ll 52.52501951297987 33.15788472488538
- en 33.15411604205798 52.52697325944835
- ll2 52.525019564127305 33.15788462647784
-EPSG:4680
- ll 58.52806666115069 168.7256963292221
- en 168.725045236389 58.53115203412034
- ll2 58.5280664427365 168.72569637522457
-EPSG:4681
- ll -11.191673021033978 -110.14306668950034
- en -110.14306668950033 -11.191673021033978
- ll2 -11.191673021033978 -110.14306668950033
-EPSG:4682
- ll -13.773310605179532 -163.34396386860217
- en -163.3381966698953 -13.773797953542184
- ll2 -13.77331049894616 -163.34396511763188
-EPSG:4683
- ll -1.5681416049891936 -82.69283664643082
- en -82.69202090208559 -1.5685227446366974
- ll2 -1.5681415887296783 -82.69283664153029
-EPSG:4684
- ll -57.44277071968289 173.29999829414157
- en 173.29443056971593 -57.44447373287808
- ll2 -57.44277077171091 173.2999981243972
-EPSG:4685
- ll -41.267123740611126 -137.0579360555175
- en -137.0579360555175 -41.267123740611126
- ll2 -41.267123740611126 -137.0579360555175
-EPSG:4686
- ll -17.835328390737132 1.377562516215363
- en 1.3775625162153633 -17.83532839128789
- ll2 -17.83532839073711 1.3775625162153633
-EPSG:4687
- ll 52.22949357043183 150.21382574712624
- en 150.21382748368984 52.22949513392598
- ll2 52.229493570432204 150.21382574712652
-EPSG:4688
- ll 75.333348556913 -22.83939898349408
- en -22.93860376573574 75.34129230623334
- ll2 75.33334906068319 -22.839427211502258
-EPSG:4689
- ll 71.97861781573647 123.98128046141096
- en 123.99227541827645 71.97635773890102
- ll2 71.97861773872971 123.98128097924815
-EPSG:4690
- ll -38.79911192126518 -131.67466432974118
- en -131.67573674069965 -38.79992057983867
- ll2 -38.799111924986796 -131.67466432677026
-EPSG:4691
- ll -86.30902079232466 111.07370850508954
- en 111.11121178224026 -86.30877420074572
- ll2 -86.30902078761818 111.07370874440275
-EPSG:4692
- ll 62.75149730546218 -124.27856650867132
- en -124.28111731798978 62.75051938477683
- ll2 62.75149728842509 -124.27856655305249
-EPSG:4693
- ll -73.19890469254565 150.70935520757598
- en 150.70935115434492 -73.19890582427489
- ll2 -73.19890469254649 150.70935520757638
-EPSG:4694
- ll 3.296252944245424 40.78749162142867
- en 40.78749162142867 3.296252944245425
- ll2 3.296252944245425 40.78749162142867
-EPSG:4695
- ll 89.36583421394053 -148.63815039419708
- en -148.60106609779393 89.36674452971039
- ll2 89.36583415370306 -148.63815284426158
-EPSG:4696
- ll -25.363681930143727 -77.11826442816039
- en -77.11826442816039 -25.363681930143727
- ll2 -25.363681930143727 -77.11826442816039
-EPSG:4697
- ll -75.0339725111136 -36.16864292323811
- en -36.16864292323811 -75.0339725111136
- ll2 -75.0339725111136 -36.16864292323811
-EPSG:4698
- ll 68.2182077288929 64.58577826484026
- en 64.59087662016756 68.21754278044486
- ll2 68.2182077051422 64.58577844680852
-EPSG:4699
- ll 33.711335853747954 -115.30812486157117
- en -115.29988365460264 33.71890852369403
- ll2 33.71133571416378 -115.30812501275432
-EPSG:4700
- ll 52.328749761986586 168.0783536363502
- en 168.0783536363502 52.328749761986586
- ll2 52.328749761986586 168.0783536363502
-EPSG:4701
- ll -16.000618015440793 179.94964278770402
- en 179.948165947303 -16.001018457949836
- ll2 -16.000618028634253 179.94964273935548
-EPSG:4702
- ll -39.25967977692115 141.96505255235667
- en 141.96505255235667 -39.25967977784583
- ll2 -39.259679776921175 141.96505255235667
-EPSG:4703
- ll 46.85591475087733 -94.33787499546432
- en -94.33787499546432 46.85591475087733
- ll2 46.85591475087733 -94.33787499546432
-EPSG:4704
- ll -28.794437798764285 5.488998431975972
- en 5.488998431975972 -28.794437798764285
- ll2 -28.79443779876428 5.488998431975972
-EPSG:4705
- ll -49.51639716805883 -119.5692449849631
- en -119.56924498496309 -49.51639716805883
- ll2 -49.51639716805883 -119.56924498496309
-EPSG:4706
- ll -4.1861861887983025 135.8367811761517
- en 135.83659140022053 -4.186340012201501
- ll2 -4.186186194760518 135.83678116884494
-EPSG:4707
- ll -50.927249825461175 174.09491940648508
- en 174.0934451257555 -50.92529277078764
- ll2 -50.927249710167416 174.0949193198601
-EPSG:4708
- ll -40.54010514660798 34.292565499198076
- en 34.289514873875675 -40.54064038041004
- ll2 -40.540105098001995 34.29256577513645
-EPSG:4709
- ll -23.021891537840247 37.61858426395446
- en 37.61886817149976 -23.020790778755018
- ll2 -23.021891452619975 37.618584285809845
-EPSG:4710
- ll 7.539155477339534 28.28282552884312
- en 28.27706309762985 7.5437727820099045
- ll2 7.539155596515826 28.28282538109171
-EPSG:4711
- ll 17.041670545596432 31.07511178887998
- en 31.077595507806087 17.042309298957885
- ll2 17.041670567950057 31.07511187526503
-EPSG:4712
- ll -0.5290917747943666 -161.1071064923284
- en -161.1056006847576 -0.5295996100508366
- ll2 -0.5290918076411331 -161.1071063955848
-EPSG:4713
- ll 70.14214795541403 169.79986304133217
- en 169.79618179700387 70.14417016455144
- ll2 70.14214794108157 169.79986306740153
-EPSG:4714
- ll -29.234211517359356 -32.77431422452079
- en -32.76695583437838 -29.239992555097267
- ll2 -29.234211762005856 -32.774313914739444
-EPSG:4715
- ll -8.022444035678262 -16.80582820003721
- en -16.804435219473593 -8.024732971147026
- ll2 -8.022444091381935 -16.805828166360392
-EPSG:4716
- ll 43.09065704135719 -51.9878827663467
- en -51.98846714845201 43.09654392126169
- ll2 43.09065728286881 -51.987882790233044
-EPSG:4717
- ll 42.63823818882213 106.32845381968423
- en 106.3289480369403 42.64006050942165
- ll2 42.63823824323589 106.32845383438729
-EPSG:4718
- ll -30.851807062783536 -74.82846958252867
- en -74.83024593829808 -30.847874840276248
- ll2 -30.851806549538782 -74.82846981324722
-EPSG:4719
- ll -65.2967260652507 -158.59383343742837
- en -158.5925506581616 -65.29572798579845
- ll2 -65.29672606989617 -158.5938334433912
-EPSG:4720
- ll 77.17635132755137 121.55990199655781
- en 121.55974810766891 77.17634159956008
- ll2 77.17635132745669 121.55990199652298
-EPSG:4721
- ll 66.39417449502054 114.31451275775055
- en 114.32346179728333 66.39745939435002
- ll2 66.39417454297464 114.31451288822117
-EPSG:4722
- ll -11.513635717431356 163.93221568805478
- en 163.9312493558009 -11.512754106428611
- ll2 -11.513635566290363 163.9322155234535
-EPSG:4723
- ll 87.74535179263441 -109.09827979320507
- en -109.10255327824645 87.74385441638294
- ll2 87.74535173235374 -109.09827873408808
-EPSG:4724
- ll 0.6960783166846625 -115.8151683799968
- en -115.81855248573574 0.698202406254941
- ll2 0.696078500791948 -115.81516867135362
-EPSG:4725
- ll 89.80186024803129 -71.71511929648308
- en -72.11799291860127 89.80306969810015
- ll2 89.80186024007709 -71.71511667456902
-EPSG:4726
- ll 59.17881378217902 -170.76745126027254
- en -170.76885539276006 59.180477971074374
- ll2 59.17881374683062 -170.7674512507088
-EPSG:4727
- ll 9.530461268533116 -81.59363981293279
- en -81.59716314120604 9.528468360551285
- ll2 9.530461132853146 -81.59364005124746
-EPSG:4728
- ll 39.7361419140681 114.41411067103144
- en 114.41040591551442 39.73631907056477
- ll2 39.73614192320688 114.41411048074114
-EPSG:4729
- ll 26.43100834441725 -165.77911195038456
- en -165.77796415507999 26.430441655728437
- ll2 26.43100833952874 -165.77911194053723
-EPSG:4730
- ll 56.61628966575978 89.10909284056436
- en 89.11185080246281 56.61696427313131
- ll2 56.616289695584314 89.10909296223683
-EPSG:4731
- ll -9.239130927861353 13.309386662235283
- en 13.306030732342581 -9.24001076942455
- ll2 -9.239130962121449 13.309386532413928
-EPSG:4732
- ll -48.26183896501594 -91.71199407122259
- en -91.71334631052153 -48.26205532803827
- ll2 -48.26183896753417 -91.71199408691278
-EPSG:4733
- ll -32.16414863322363 -150.62012599506394
- en -150.62208801851324 -32.16500726475569
- ll2 -32.16414862861875 -150.62012598459236
-EPSG:4734
- ll -46.65574537153794 -39.99329851536868
- en -39.992375997264126 -46.64779673704157
- ll2 -46.65574522174857 -39.99329849803659
-EPSG:4735
- ll 68.04696245700666 -50.970425780394805
- en -51.0092634560498 68.04320474602969
- ll2 68.04696318188465 -50.97041828518276
-EPSG:4736
- ll -4.706011667862029 -53.60495968522274
- en -53.60691026905613 -4.705309133272163
- ll2 -4.706011638370891 -53.6049597665607
-EPSG:4737
- ll 78.03301398043288 -30.6933582788854
- en -30.693358278885402 78.0330139808154
- ll2 78.03301398043376 -30.693358278885412
-EPSG:4738
- ll -78.17769105719105 54.47901794258928
- en 54.47901794258928 -78.17769105719105
- ll2 -78.17769105719105 54.47901794258928
-EPSG:4739
- ll -85.12502182918234 161.0239253699774
- en 160.9915779391692 -85.12554617314854
- ll2 -85.12502185820202 161.02392358266013
-EPSG:4740
- ll 26.826653658195838 -76.78557407300273
- en -76.78559518411386 26.82664123274501
- ll2 26.82665365819276 -76.78557407300275
-EPSG:4741
- ll 52.22864277613667 -136.55890648866148
- en -136.55890648866148 52.22864277613667
- ll2 52.22864277613667 -136.55890648866148
-EPSG:4742
- ll -88.39133403680954 54.39933905222472
- en 54.39933905222471 -88.39133403680954
- ll2 -88.39133403680954 54.39933905222471
-EPSG:4743
- ll 54.98806386687721 -132.1542122231098
- en -132.15855648123807 54.99114446828953
- ll2 54.988063967727435 -132.1542123649988
-EPSG:4744
- ll -29.514610242345043 7.6717842784900085
- en 7.672931899410173 -29.519063380058796
- ll2 -29.514609975441825 7.671784210058908
-EPSG:4745
- ll 47.372924310852454 90.72831319768864
- en 90.72831319768864 47.372924310852454
- ll2 47.372924310852454 90.72831319768864
-EPSG:4746
- ll -10.202217891107239 -76.41217503485952
- en -76.41217503485952 -10.202217891107239
- ll2 -10.202217891107239 -76.41217503485952
-EPSG:4747
- ll 28.25880976973322 -148.34151777256417
- en -148.34151777256417 28.25880977052025
- ll2 28.258809769732405 -148.3415177725642
-EPSG:4748
- ll -87.41708362995611 -166.18542130804764
- en -166.11244385283177 -87.41607195896309
- ll2 -87.41708365363557 -166.18542302034788
-EPSG:4749
- ll -2.879858455265534 156.6373639643395
- en 156.63736396433947 -2.8798584553603526
- ll2 -2.879858455265535 156.63736396433944
-EPSG:4750
- ll 78.5392950441574 -156.23837200707064
- en -156.23668478926845 78.53973065339959
- ll2 78.53929504324161 -156.23837201061988
-EPSG:4751
- ll -15.868688725718854 -135.3892654675952
- en -135.3892654675952 -15.868688725718854
- ll2 -15.868688725718854 -135.3892654675952
-EPSG:4752
- ll -83.09691818706092 130.513357913064
- en 130.5377888720928 -83.09971308387335
- ll2 -83.0969181322565 130.51335743434424
-EPSG:4753
- ll 28.772328347829543 -17.00503585331478
- en -17.00503585331478 28.772328347829543
- ll2 28.772328347829543 -17.00503585331478
-EPSG:4754
- ll -71.53359969556254 67.71388740034712
- en 67.7096134764165 -71.53254961412372
- ll2 -71.53359967683512 67.71388732416465
-EPSG:4755
- ll -17.288985734880086 157.48028098647256
- en 157.4802809864726 -17.288985734880082
- ll2 -17.28898573488008 157.48028098647256
-EPSG:4756
- ll 62.20696446604603 -50.9048365257637
- en -50.90148864135407 62.20671084146365
- ll2 62.20696447154253 -50.90483659841566
-EPSG:4757
- ll 64.78475408197923 -67.95955923804485
- en -67.95955923804485 64.78475408197923
- ll2 64.78475408197923 -67.95955923804485
-EPSG:4758
- ll 31.861754373225423 173.62807477590962
- en 173.6280747759096 31.86175437322438
- ll2 31.861754373223338 173.62807477590968
-EPSG:4759
- ll -31.419694065099968 156.99165357981929
- en 156.99165357981926 -31.419694065938888
- ll2 -31.419694065098078 156.99165357981926
-EPSG:4760
- ll -11.734371556747504 177.81530984222076
- en 177.81530984222076 -11.734371556747504
- ll2 -11.734371556747504 177.81530984222076
-EPSG:4761
- ll -23.588754371612055 16.108045427324157
- en 16.108045427324157 -23.588754372304578
- ll2 -23.58875437161187 16.108045427324154
-EPSG:4762
- ll 84.38907066844132 174.433800442181
- en 174.4338004421809 84.38907066844158
- ll2 84.38907066844183 174.43380044218097
-EPSG:4763
- ll 7.418133733830359 8.214613833629272
- en 8.214613833629274 7.418133733830395
- ll2 7.4181337338304285 8.214613833629274
-EPSG:4764
- ll -18.252416429173934 2.073796003891232
- en 2.073796003891232 -18.2524164297358
- ll2 -18.252416429173913 2.0737960038912324
-EPSG:4765
- ll 82.06755070313349 94.3430244244554
- en 94.3430244244554 82.06755070339126
- ll2 82.06755070313416 94.3430244244554
-EPSG:4766
- ll -69.99505699484452 86.34873639218617
- en 3.0360607858914316E7 -7772739.423343819
- ll2 -69.99505699475023 86.34873639228036
-EPSG:4767
- ll 59.82940821495666 92.55081019699601
- en 3.1474805989726182E7 6635268.37985018
- ll2 59.829408214956665 92.55081019699603
-EPSG:4768
- ll -80.80298814355439 98.30543373135949
- en 3.2541143237490278E7 -8975775.677988065
- ll2 -80.80298814355366 98.30543373135784
-EPSG:4769
- ll 27.679848922101 101.6389060398894
- en 3.3760387908870235E7 3065804.8985836413
- ll2 27.679848922092308 101.63890603990856
-EPSG:4770
- ll 41.903059833444956 103.89950197134473
- en 3.4657619622823276E7 4642696.818076931
- ll2 41.90305983344141 103.89950197134833
-EPSG:4771
- ll 56.532897437271515 108.46130637435638
- en 3.571293226008247E7 6273377.138030662
- ll2 56.532897437113455 108.46130637433544
-EPSG:4772
- ll -17.725230883493737 102.06127882540812
- en 3.58691556545643E7 -1970584.9723940073
- ll2 -17.725230882857083 102.06127882580492
-EPSG:4773
- ll 72.9538450158598 106.90628561582342
- en 3.736609382671816E7 8103286.738379322
- ll2 72.95384501573196 106.90628561610029
-EPSG:4774
- ll -76.01564100010724 111.85906465520188
- en 3.844223494988483E7 -8441500.184969295
- ll2 -76.01564100010566 111.85906465520262
-EPSG:4775
- ll -9.57738187342214 116.660765398275
- en 3.9462758643459275E7 -1059147.8557348577
- ll2 -9.577381873422139 116.660765398275
-EPSG:4776
- ll -69.95204304397161 122.92711378624402
- en 4.061199772348858E7 -7766453.612967904
- ll2 -69.95204304394638 122.92711378623139
-EPSG:4777
- ll 30.012155914702433 125.18845438985907
- en 4.1711159476385824E7 3323537.6529079583
- ll2 30.012155914698933 125.18845438986695
-EPSG:4778
- ll -1.6917698832763222 128.6226887859204
- en 4.279193738854466E7 -187267.4886356356
- ll2 -1.691769883275902 128.62268878586963
-EPSG:4779
- ll -14.816665380739622 133.41504555852006
- en 4.397566253743955E7 -1643426.6565993256
- ll2 -14.816665380659183 133.41504555824542
-EPSG:4780
- ll 6.487431373211024 126.3989328547523
- en 4.3879477318149835E7 720821.7074023301
- ll2 6.4874313730030515 126.39893285789772
-EPSG:4781
- ll -36.57889035388273 133.28594078284493
- en 4.534658221132858E7 -4051218.4159126137
- ll2 -36.578890353881334 133.28594078284252
-EPSG:4782
- ll -84.88535611268075 81.34711378541058
- en 563072.9038538176 -9434351.738438828
- ll2 -84.88535611265551 81.34711376917885
-EPSG:4783
- ll -24.389661401220664 84.79751502562412
- en 1190646.8230991182 -2715467.3223787067
- ll2 -24.38966139909143 84.79751502874507
-EPSG:4784
- ll 21.08604895542898 79.76608684719298
- en 371773.66671563964 2333142.401105812
- ll2 21.08604895542893 79.76608684719301
-EPSG:4785
- ll -22.713849668324528 87.97597928425444
- en 908720.3255680413 -2518375.3581171064
- ll2 -22.713849668256874 87.97597928436166
-EPSG:4786
- ll -4.865311499336116 87.9586238872328
- en 606338.29903586 -538076.3427189334
- ll2 -4.865311499336114 87.95862388723253
-EPSG:4787
- ll -69.8075212666893 93.58844986518397
- en 638226.8789769721 -7751706.390626424
- ll2 -69.80752126660254 93.58844986510375
-EPSG:4788
- ll -54.93379903432599 97.23355105552572
- en 771288.8615449034 -6098177.057720384
- ll2 -54.93379903378375 97.23355105536237
-EPSG:4789
- ll 47.94378519092339 95.11887848710774
- en 434173.75915307744 5312646.431513536
- ll2 47.943785190923336 95.1188784871077
-EPSG:4790
- ll -86.74039915948207 93.30943432605281
- en 463918.4257521877 -9639848.063798584
- ll2 -86.74039915948136 93.30943433213973
-EPSG:4791
- ll -11.991254492626936 95.72704225648826
- en -184433.9262212905 -1333948.089129937
- ll2 -11.991254491911581 95.7270422602584
-EPSG:4792
- ll 71.63731035385658 108.9698508180738
- en 639553.4812880264 7956387.533070699
- ll2 71.63731035372909 108.96985081786784
-EPSG:4793
- ll 7.721053937630259 113.5318432324612
- en 1111188.3299225443 857790.2050854971
- ll2 7.721053937408964 113.53184322977154
-EPSG:4794
- ll -7.923861949568831 116.9120783529617
- en 1153021.4833279462 -880903.8478116961
- ll2 -7.923861949214189 116.91207834896628
-EPSG:4795
- ll -73.42868933443461 114.62070971177259
- en 519767.9563105066 -8151806.846832142
- ll2 -73.4286893344346 114.62070971177259
-EPSG:4796
- ll 79.06104340519471 117.26033405739777
- en 505517.28583208367 8780463.049533965
- ll2 79.06104340519471 117.26033405739777
-EPSG:4797
- ll 8.645302285968384 117.68494220738198
- en 245126.84571246954 956811.9842608685
- ll2 8.645302285967494 117.68494220740217
-EPSG:4798
- ll 16.276095872710755 126.18148763315949
- en 840211.1472794068 1802877.4103450365
- ll2 16.2760958726999 126.18148763312446
-EPSG:4799
- ll -86.25223779476045 124.11639155499847
- en 486250.61161767127 -9583759.709340438
- ll2 -86.25223779476043 124.11639155499876
-EPSG:4800
- ll -60.21792406956149 125.4454780482409
- en 303024.3410810273 -6683774.864080015
- ll2 -60.2179240693963 125.44547804828895
-EPSG:4801
- ll 60.15550005006568 -102.7054784777318
- en -110.15684711988719 60.15190351105598
- ll2 60.1555002863959 -102.70547770440895
-EPSG:4802
- ll -43.030325932806605 98.04502654214082
- en 172.13019522509632 -43.03063876497867
- ll2 -43.030325962995114 98.04502695088513
-EPSG:4803
- ll -87.57770297430206 -68.76177117897231
- en -59.565196406458114 -87.57732982627627
- ll2 -87.57770297116825 -68.76177063349456
-EPSG:4804
- ll -32.98426377804183 -4.0360904028434845
- en -110.84891345598581 -32.98176170264422
- ll2 -32.98426429870944 -4.036089345751296
-EPSG:4805
- ll -56.6098996432863 -52.250021540702534
- en -34.59011372998754 -56.61605649250202
- ll2 -56.609898894087415 -52.25002072008156
-EPSG:4806
- ll -77.6049965237534 -146.79111508462796
- en -159.24396784002266 -77.60549732013935
- ll2 -77.60499655836648 -146.79111504802685
-EPSG:4807
- ll -35.55477143621693 -103.6175238711667
- en -105.95310797892608 -35.560608110512106
- ll2 -35.554771333197934 -103.61752390007133
-EPSG:4808
- ll 7.701352807624033 -15.32181228982801
- en -122.12953173427246 7.7013528076240325
- ll2 7.7013528076240325 -15.321812289828017
-EPSG:4809
- ll -17.318823404884938 57.63088041143598
- en 53.26290541143598 -17.318823404884938
- ll2 -17.318823404884938 57.63088041143598
-EPSG:4810
- ll 72.33092114494434 153.00463037258893
- en 150.6585069658727 72.33214331354327
- ll2 72.33092116389774 153.00463023478147
-EPSG:4811
- ll 41.29298746053439 -109.21220430352967
- en -111.54958086542538 41.296100020715606
- ll2 41.29298760891953 -109.21220431052946
-EPSG:4812
- ll -39.71622647373719 132.25474278692727
- en 521843.6283615011 -4398129.935522146
- ll2 -39.71622647373719 132.25474278692727
-EPSG:4813
- ll -58.77120486981656 54.253259829576905
- en -52.56662581311847 -58.77299371939844
- ll2 -58.77120473629567 54.25326073569401
-EPSG:4814
- ll 28.538230070545737 -111.27997517365807
- en -129.33825295143586 28.538230070545737
- ll2 28.538230070545737 -111.27997517365809
-EPSG:4815
- ll 13.269104906890789 -72.13250521868899
- en -95.84884271868899 13.269104906890787
- ll2 13.269104906890789 -72.13250521868899
-EPSG:4816
- ll -53.388104008154365 -115.77950815809342
- en -118.1131385282731 -53.394208836131526
- ll2 -53.38810363117765 -115.77950837975615
-EPSG:4817
- ll 20.50511115608795 -54.66132346615542
- en -65.38462963956606 20.50278025250229
- ll2 20.505111416266736 -54.66132332122377
-EPSG:4818
- ll 63.546765020826996 128.93702025305896
- en 146.61386041411254 63.541871127922334
- ll2 63.54676532383499 128.93701962385018
-EPSG:4819
- ll -57.38685462030805 -114.25517476625137
- en -116.58862239563487 -57.39331610867352
- ll2 -57.386854249892615 -114.25517493480454
-EPSG:4820
- ll 89.03146731078394 61.49875943082415
- en -45.670784122590725 89.03508128162969
- ll2 89.03146695562761 61.49879466786905
-EPSG:4821
- ll 65.37311968432874 122.70815719228196
- en 120.37092802561529 65.37311968432874
- ll2 65.37311968432874 122.70815719228196
-EPSG:4822
- ll -88.75568523007718 132.10759349813793
- en 492987.30858196993 -9863329.96687496
- ll2 -88.75568523007718 132.10759349815157
-EPSG:4823
- ll 71.55464877487893 76.0741722032007
- en 76.0741722032007 71.55464877487893
- ll2 71.55464877487893 76.0741722032007
-EPSG:4824
- ll 69.00608026317613 -17.771567756415863
- en -17.771567756415863 69.00608026317613
- ll2 69.00608026317613 -17.771567756415863
-EPSG:4826
- ll -9.103157605912081 -77.3253968653213
- en -6203838.022060914 -1904420.5289540507
- ll2 -9.103157605912036 -77.3253968653213
-EPSG:4839
- ll 84.27015083610668 81.95593652962606
- en 928148.2618380962 4523103.810133766
- ll2 84.2701508361072 81.95593652962609
-EPSG:4901
- ll -85.57902991819796 68.71485740425331
- en 66.37764907091997 -85.57902991819796
- ll2 -85.57902991819796 68.71485740425331
-EPSG:4902
- ll -26.463293506023227 171.8854354663375
- en 169.54820629967082 -26.463293506023227
- ll2 -26.463293506023227 171.8854354663375
-EPSG:4903
- ll -54.689910844605045 140.660902669773
- en 144.3488415586619 -54.68991084460505
- ll2 -54.68991084460505 140.660902669773
-EPSG:4904
- ll 12.176598605833092 71.47078499285712
- en 80.60767550681312 12.171319475613664
- ll2 12.17659913640246 71.47078449510029
-EPSG:5013
- ll 48.87725162159245 -55.19137251554727
- en -55.19137251554728 48.87725162252692
- ll2 48.877251621592606 -55.19137251554728
-EPSG:5014
- ll -3.6227566834879354 -30.370401289265814
- en 792130.1255369445 -400852.6283420936
- ll2 -3.6227566834870384 -30.37040128931544
-EPSG:5015
- ll -78.06780875550885 -21.38207673317718
- en 629475.0932612452 -8672152.948676566
- ll2 -78.06780875519362 -21.382076738289474
-EPSG:5016
- ll -13.148400174629487 -16.55010457634216
- en 331986.4855063978 -1454063.9178104643
- ll2 -13.148400174629383 -16.550104576340427
-EPSG:5018
- ll -13.4720660934301 -12.985164903422628
- en -525948.352891964 -5887821.293759522
- ll2 -13.472066087533431 -12.98516491256341
-EPSG:5041
- ll 38.063121129277604 -178.221785664993
- en 1808214.8338450727 8177518.684684606
- ll2 38.06312112927737 -178.221785664993
-EPSG:5042
- ll -54.0210160486045 11.827378834542998
- en 2845654.8905834137 6038280.615145465
- ll2 -54.02101604859918 11.827378834542994
-EPSG:5048
- ll 37.78849285029223 21.68696586430658
- en 32025.11832390516 4195665.119824751
- ll2 37.788492848966044 21.68696586354561
-EPSG:5070
- ll -13.046626597511803 27.91167871395953
- en 1.2986607253807755E7 6377834.092667181
- ll2 -13.046626597511798 27.91167871395953
-EPSG:5071
- ll 64.83866945664164 -124.68613803881816
- en -1607098.1885604346 4767537.186387858
- ll2 64.83866945664239 -124.68613803881816
-EPSG:5072
- ll -79.45511712988925 45.90453724260428
- en 1.6782340696060643E7 8624240.060413564
- ll2 -79.45511712989017 45.90453724260428
-EPSG:5105
- ll 45.40327241425808 -0.5853637037245316
- en -376421.2582208741 -383470.97409490007
- ll2 45.40327240997654 -0.585363701643762
-EPSG:5106
- ll -11.011103623840953 -0.19584313376001283
- en -633304.1029808476 -6657188.768846536
- ll2 -11.011103622783551 -0.19584312719439012
-EPSG:5107
- ll -52.51159759511233 11.67540503848878
- en 383413.0954504824 -1.125975323176869E7
- ll2 -52.5115975946045 11.675405038400086
-EPSG:5108
- ll -66.71104758827093 1.5372025506538003
- en -206796.51189353468 -1.2850563002663385E7
- ll2 -66.71104758235049 1.5372025806717895
-EPSG:5109
- ll -47.10667842486881 3.949969376247008
- en -321223.7865008545 -1.0665358359100325E7
- ll2 -47.106678422264764 3.949969377202573
-EPSG:5110
- ll 9.65448222252094 12.731883346729639
- en 345015.2338497289 -4362843.778331864
- ll2 9.654482222520164 12.731883346714113
-EPSG:5111
- ll 7.964068361001978 7.547452079688751
- en -336114.91955207963 -4548518.15943234
- ll2 7.9640683609775245 7.547452080060987
-EPSG:5112
- ll -12.714647568580304 8.442422659225883
- en -341018.0241057172 -6840866.401207835
- ll2 -12.714647568538663 8.44242265948643
-EPSG:5113
- ll 23.150818334162935 17.222448226477272
- en 481396.15830728615 -2865167.0824881075
- ll2 23.15081833411608 17.222448226555645
-EPSG:5114
- ll 82.59600207612837 20.68167706947317
- en 188803.6971426595 3748502.807555291
- ll2 82.59600207601298 20.68167705685856
-EPSG:5115
- ll 43.14894725005729 19.507011276789456
- en 425962.7210067852 -644213.8154574265
- ll2 43.14894724972962 19.507011276921222
-EPSG:5116
- ll -40.60654335735327 18.61846777301242
- en 279299.6915536208 -9930320.524900185
- ll2 -40.606543357346936 18.618467773019198
-EPSG:5117
- ll 50.01026641956503 19.128905689143437
- en 216758.02894244433 111978.04862397001
- ll2 50.01026641956342 19.128905689144354
-EPSG:5118
- ll -8.908219791481187 12.859201725128937
- en -521369.0118903597 -6421129.923152099
- ll2 -8.908219791198439 12.859201727886104
-EPSG:5119
- ll -47.779318516753605 13.238243044592483
- en -369184.2249510717 -1.0744195963724943E7
- ll2 -47.77931851135648 13.238243048778251
-EPSG:5120
- ll 22.38194554574619 20.73021982286747
- en 123708.85363107175 -2955170.1333555426
- ll2 22.38194554574608 20.73021982286747
-EPSG:5121
- ll 18.10171871894225 26.912645159929035
- en 673589.7924889101 -3420606.593333899
- ll2 18.101718718588234 26.912645159790436
-EPSG:5122
- ll 54.418712062260084 27.69411852566337
- en 437031.7966058229 613678.4815338829
- ll2 54.4187120604121 27.69411852442038
-EPSG:5123
- ll 76.31720766682724 25.59664432273061
- en 155373.6078575162 3043672.339436506
- ll2 76.31720766682685 25.59664432272991
-EPSG:5124
- ll -39.70877615988732 25.687575336767008
- en 201842.492560188 -9829150.949373502
- ll2 -39.70877615988717 25.68757533676736
-EPSG:5125
- ll 61.75282023394553 20.754060592940007
- en -150532.86529007988 1427249.695254893
- ll2 61.75282023307962 20.754060593749205
-EPSG:5126
- ll -3.688548044080818 22.260018227921993
- en -371451.2088825185 -5840270.640711774
- ll2 -3.688548044061411 22.260018228604785
-EPSG:5127
- ll -20.41514191712534 24.072655427175544
- en -257874.59130684217 -7693344.790936613
- ll2 -20.415141917102645 24.072655427164143
-EPSG:5128
- ll 39.48496454142213 28.921762653451673
- en 136285.12623716617 -1058852.9464395535
- ll2 39.484964541422144 28.921762653451687
-EPSG:5129
- ll -64.03383341663884 35.05840108552528
- en 371390.3105279563 -1.254675654491209E7
- ll2 -64.0338334146979 35.05840108185437
-EPSG:5130
- ll 62.42075104426934 33.07704879522761
- en 233141.32524782605 1495195.1520560558
- ll2 62.42075104424834 33.077048795225615
-EPSG:5132
- ll 38.86250393320154 84.65793631900846
- en 84.65793631900846 38.86250393320154
- ll2 38.86250393320154 84.65793631900846
-EPSG:5167
- ll 87.89220846956752 129.82169854243205
- en 195160.43885187714 6058430.913681597
- ll2 87.89220846956754 129.82169854243205
-EPSG:5168
- ll -25.14520773580461 120.49536434612068
- en -456699.46866189595 -6454830.227779761
- ll2 -25.14520773410521 120.4953643433831
-EPSG:5169
- ll 54.27876852939184 121.22691837145125
- en -45680.08936318854 2315816.781273135
- ll2 54.27876852911826 121.22691837148798
-EPSG:5170
- ll 4.611861318418931 131.85921759088254
- en 739766.6961945045 -3195318.6322681177
- ll2 4.611861318360283 131.85921758942632
-EPSG:5171
- ll -51.80217215372235 133.5100609059434
- en 510991.9511551635 -9457447.420298824
- ll2 -51.80217215291959 133.51006090574256
-EPSG:5172
- ll 39.41860619582158 126.84521049334178
- en -157802.40797132812 665708.0455975774
- ll2 39.418606195484806 126.8452104931091
-EPSG:5173
- ll 1.7791585621767183 122.71285400274627
- en -54842.225616258715 -3510208.58024334
- ll2 1.779158562176529 122.71285400277091
-EPSG:5174
- ll -33.70523431805685 121.84665418867374
- en -278189.4362030328 -7449633.7174313245
- ll2 -33.70523431723037 121.8466541877253
-EPSG:5175
- ll 65.23915544727083 124.14166501276212
- en 66280.87450639653 3583192.0625231946
- ll2 65.23915544723707 124.14166501277057
-EPSG:5176
- ll -56.955441745927935 125.70897128876304
- en -348.445957734104 -1.0026202428696126E7
- ll2 -56.95544174581193 125.70897128877525
-EPSG:5177
- ll 10.679696150727665 136.97686360676417
- en 854612.4727911954 -2519813.8308684644
- ll2 10.67969615025412 136.97686360349266
-EPSG:5178
- ll -80.2830091524696 132.7222216897793
- en 1098259.1491503809 -1.1122012928654777E7
- ll2 -80.28300915235553 132.72222168708194
-EPSG:5179
- ll -55.63337349218925 121.38359331474031
- en 615195.7771100664 -8388071.695252415
- ll2 -55.633373487398536 121.38359332111533
-EPSG:5180
- ll 81.6134113470859 121.11721211669364
- en 136797.42789071845 5359923.065148834
- ll2 81.61341134707328 121.11721211688149
-EPSG:5181
- ll 70.13535989486732 130.5444484556254
- en 334406.0265348924 4080495.3476031306
- ll2 70.13535989479054 130.54444845555318
-EPSG:5182
- ll 82.58459465209964 123.57245208836476
- en 150621.52959849604 5517723.225376592
- ll2 82.58459465209584 123.57245208842619
-EPSG:5183
- ll -83.97379567616095 124.8174625681035
- en 150999.96502923017 -1.3038177442104297E7
- ll2 -83.9737956761539 124.81746256847637
-EPSG:5184
- ll -28.404130415289046 134.15272789048362
- en 509029.54080448684 -6854773.643599425
- ll2 -28.404130415260962 134.15272789054046
-EPSG:5185
- ll -62.23041951108952 127.68599489240982
- en 339648.40456656547 -1.0513005694467181E7
- ll2 -62.23041951106214 127.68599489240665
-EPSG:5186
- ll 30.837763724130355 121.3296911842089
- en -342876.36389974365 -180712.12196984165
- ll2 30.837763722967026 121.32969118255055
-EPSG:5187
- ll -61.678585797904304 131.84235981601327
- en 350467.32861647673 -1.0451896055072581E7
- ll2 -61.67858579786443 131.84235981600781
-EPSG:5188
- ll -79.97911197625224 133.54070356828217
- en 249359.74760754523 -1.249138342405908E7
- ll2 -79.97911197625126 133.5407035682781
-EPSG:5223
- ll -23.708489519656226 12.024527093928603
- en 502500.2643268556 -2121953.0983084007
- ll2 -23.70848951965623 12.024527093928603
-EPSG:5228
- ll -53.67890132873864 100.47864862968288
- en 100.48571600850967 -53.68207601814054
- ll2 -53.67890102606635 100.47864712863142
-EPSG:5229
- ll 72.61971268669714 -134.53596467247837
- en -116.88522248921757 72.61486571672025
- ll2 72.61971296665548 -134.5359641558821
-EPSG:5233
- ll 59.35856421813489 86.45613404567638
- en 86.4551243032001 59.36260119314001
- ll2 59.358564051404805 86.45613408084637
-EPSG:5234
- ll -55.83283917447479 85.83168963582145
- en 516650.1749183573 -6774947.963359073
- ll2 -55.832838902040116 85.83168977670034
-EPSG:5235
- ll 14.166403454318 77.7602479268512
- en 174577.03096462856 1294634.0557120931
- ll2 14.166403442652262 77.76024795044076
-EPSG:5243
- ll 44.102618200565395 63.3957721028784
- en 3903964.641394525 700019.3363752413
- ll2 44.10261820056551 63.3957721028784
-EPSG:5246
- ll -81.31998171622257 48.46734879684675
- en 48.46734879684675 -81.31998171650392
- ll2 -81.31998171622328 48.46734879684675
-EPSG:5247
- ll 6.712931886765291 115.05552795674593
- en 595744.6422500927 742937.2404609815
- ll2 6.712931886764775 115.05552795674593
-EPSG:5252
- ll 86.31115720821884 89.979404587734
- en 89.979404587734 86.31115720833994
- ll2 86.3111572082192 89.97940458773398
-EPSG:5253
- ll 88.49573574212076 25.789759292921758
- en 496451.70374786435 9833986.321420958
- ll2 88.4957357421209 25.789759292921765
-EPSG:5254
- ll 55.93307370794895 33.09298123716955
- en 693278.0829786097 6205434.614323527
- ll2 55.93307370786779 33.092981237167535
-EPSG:5255
- ll -7.347652146573353 35.08597831827296
- en 730365.405383973 -813042.3757914824
- ll2 -7.347652146573012 35.085978318260224
-EPSG:5256
- ll 7.5938915500451 35.83873356451075
- en 482204.2858691136 839741.5717645247
- ll2 7.59389155004518 35.838733564510754
-EPSG:5257
- ll 42.95261466557713 40.60688838324238
- en 631129.1351445464 4758708.85026027
- ll2 42.952614665575815 40.60688838324382
-EPSG:5258
- ll 3.143712444141954 43.06483079315726
- en 618366.0489563679 347677.5523962831
- ll2 3.14371244414195 43.06483079315679
-EPSG:5259
- ll -11.807115477110713 47.91952941464369
- en 818295.8315478455 -1307407.6869586282
- ll2 -11.807115477105864 47.919529414592695
-EPSG:5264
- ll -39.12354633595127 -176.73009171479487
- en -176.73009171479484 -39.123546336875066
- ll2 -39.12354633595131 -176.73009171479467
-EPSG:5266
- ll -20.680886006937385 83.44265545710707
- en -434337.2680735802 -2301618.3558830586
- ll2 -20.680886005553877 83.44265545611223
-EPSG:5269
- ll -72.89989242848817 30.420990466871924
- en 9612266.760706628 -8095754.122956514
- ll2 -72.89989242844504 30.420990466817013
-EPSG:5270
- ll -38.126056208620966 34.88178308149877
- en 1.0928168021210866E7 -4232767.011818337
- ll2 -38.12605620780254 34.88178308203605
-EPSG:5271
- ll -80.44142768879868 28.336701521403906
- en 1.1413606031859618E7 -8937899.31583954
- ll2 -80.4414276887425 28.336701522375726
-EPSG:5272
- ll 79.37670041602632 38.0236413376668
- en 1.2541655757046042E7 8816266.708228989
- ll2 79.37670041602664 38.02364133766626
-EPSG:5273
- ll 5.996904335134005 45.521237903351114
- en 1.422353450112741E7 667443.5031134489
- ll2 5.996904334584349 45.52123789492925
-EPSG:5274
- ll 3.4860281804691198 35.930493629122786
- en 1.3824323484991444E7 387652.12928688637
- ll2 3.486028180265804 35.93049363503019
-EPSG:5275
- ll -85.91588866912322 40.27372995795438
- en 1.5462445643212972E7 -9547348.746392466
- ll2 -85.91588866911965 40.27372995908814
-EPSG:5292
- ll -87.03139616227647 92.7436748309094
- en 261626.3214702635 -1.2170597264774054E7
- ll2 -87.03139616227674 92.7436748309089
-EPSG:5293
- ll -56.293912919493756 83.35819785455067
- en -133099.2727610923 -8758536.236404713
- ll2 -56.29391291440681 83.35819786194388
-EPSG:5294
- ll -69.26618837399008 94.16207210003456
- en 420318.2475562115 -1.0193116179317191E7
- ll2 -69.26618837371534 94.1620720996179
-EPSG:5295
- ll -35.01272245898836 88.49129464803995
- en 109246.04785347937 -6377091.251567125
- ll2 -35.01272245898771 88.49129464803856
-EPSG:5296
- ll -87.50700835896467 88.8551557391674
- en 243709.73632613046 -1.2223586361094045E7
- ll2 -87.50700835896491 88.8551557391674
-EPSG:5297
- ll -66.54283034266393 84.8090356330144
- en -30646.129108478664 -9897598.782953508
- ll2 -66.54283033922599 84.80903564554302
-EPSG:5298
- ll -60.03674153485523 92.58488051569913
- en 325329.19696679205 -9158936.063781027
- ll2 -60.036741534855274 92.58488051569923
-EPSG:5299
- ll -56.01420269164898 86.24991947745467
- en 56683.68646442235 -8714482.55559004
- ll2 -56.014202691566815 86.24991947745706
-EPSG:5300
- ll -64.0402710154975 94.41299175581521
- en 399617.808575858 -9607940.325265516
- ll2 -64.04027101544287 94.41299175580018
-EPSG:5301
- ll -38.18265755127709 88.86281128689582
- en 163507.27127267758 -6728233.317490449
- ll2 -38.182657551277046 88.86281128689568
-EPSG:5302
- ll 6.206234644554655 92.32664995048663
- en 334110.8387787719 -1813662.9007540303
- ll2 6.206234644554675 92.32664995048653
-EPSG:5303
- ll -66.20136557900776 95.27308801799069
- en 529208.0337197551 -9859147.60622299
- ll2 -66.20136557583905 95.27308800749955
-EPSG:5304
- ll 31.2435608869375 84.57583503066522
- en -292526.994373395 971981.6143531553
- ll2 31.243560885708465 84.57583502898991
-EPSG:5305
- ll -4.270666957225231 89.15317774333086
- en 205947.43429382017 -2972246.0385402497
- ll2 -4.270666957225235 89.15317774333086
-EPSG:5306
- ll -36.57455143194986 96.26403959994381
- en 654151.8227125233 -6558795.270311384
- ll2 -36.574551431487045 96.26403960037212
-EPSG:5307
- ll 88.65318215111813 93.44374928288919
- en 257724.76249583 7351732.99477176
- ll2 88.65318215111824 93.44374928287321
-EPSG:5308
- ll 14.66651008557237 88.13597049716056
- en 31222.623073588184 -876928.1745585015
- ll2 14.666510085571753 88.13597049716599
-EPSG:5309
- ll 79.86485228028846 94.17611581566243
- en 329716.9745025352 6372830.519350432
- ll2 79.86485228025927 94.17611581538563
-EPSG:5310
- ll -73.65748807859146 86.42902886529852
- en 88757.85399367395 -1.0684040176977586E7
- ll2 -73.65748807815031 86.42902886746444
-EPSG:5311
- ll -64.57561834581864 95.55486792571023
- en 474512.63141414407 -9672327.154239684
- ll2 -64.57561834513851 95.55486792491482
-EPSG:5316
- ll 39.54229857783557 -2.3841173012987227
- en 596867.8587447014 -1611113.00131765
- ll2 39.54229857719752 -2.3841173009329104
-EPSG:5318
- ll -49.948634545110345 -5.527609948326985
- en 305674.23932355666 -1.1536156596097901E7
- ll2 -49.94863454510954 -5.52760994832643
-EPSG:5320
- ll 65.93162444115167 -162.76470687630044
- en -2098933.3721484174 9766352.157056047
- ll2 65.93162444115164 -162.7647068763004
-EPSG:5321
- ll 9.85480566360539 -2.7192651033940933
- en 9944719.276915932 6778836.072789901
- ll2 9.854805663605415 -2.7192651033940938
-EPSG:5324
- ll -76.02911882365649 106.3589617200617
- en 106.3589617200617 -76.02911882409829
- ll2 -76.02911882365743 106.3589617200617
-EPSG:5325
- ll 22.946773205300047 -37.76785735890333
- en -645642.5101306317 -4385447.175980952
- ll2 22.946773205299912 -37.76785735890333
-EPSG:5329
- ll -18.489138398944647 -46.3427082858214
- en -1.3449955729641747E7 -1174635.0532302062
- ll2 -18.489138917788875 -46.34270788920093
-EPSG:5330
- ll 65.82510099485208 116.51264742952088
- en 4622644.798901213 1.0661380787642092E7
- ll2 65.82510060171931 116.51264747649651
-EPSG:5331
- ll -55.28876823141863 33.18439551325787
- en -4625753.480047323 -6459801.423062557
- ll2 -55.28876842832327 33.18439725171661
-EPSG:5337
- ll 73.56396999142845 -32.44000638579203
- en 517527.4733393147 1.816352247345354E7
- ll2 73.56397000507339 -32.440006342605145
-EPSG:5340
- ll 80.16597525646424 -87.26916860677535
- en -87.26916860677535 80.16597525678159
- ll2 80.16597525646503 -87.26916860677535
-EPSG:5343
- ll 42.429228478589636 -78.17375239780166
- en 991863.2921845705 1.4719788205003725E7
- ll2 42.4292284744325 -78.17375239671848
-EPSG:5344
- ll -86.69715493190492 -64.24279761628979
- en 2530577.765935954 367635.73829577677
- ll2 -86.69715493190348 -64.24279761749557
-EPSG:5345
- ll -85.12121777584744 -70.80656236368173
- en 3454394.68611645 543010.18095898
- ll2 -85.1212177758398 -70.80656236236598
-EPSG:5346
- ll -35.901610143935436 -56.84558444938112
- en 5055928.874182839 6009792.550698892
- ll2 -35.90161014114394 -56.84558444791096
-EPSG:5347
- ll 20.55105468724247 -55.88438957546028
- en 5929448.286097457 1.2280758928764265E7
- ll2 20.551054687170968 -55.88438957540411
-EPSG:5348
- ll 42.32601426579643 -58.85686170839915
- en 6346942.806589741 1.469148543942497E7
- ll2 42.32601426579333 -58.856861708402306
-EPSG:5349
- ll 7.775322136539785 -52.23497923493884
- en 7694716.603589122 1.0862174999873415E7
- ll2 7.775322136539716 -52.2349792349441
-EPSG:5354
- ll 0.15384185779527115 -147.93826277459166
- en -147.93826277459166 0.15384185780034487
- ll2 0.15384185779527115 -147.93826277459166
-EPSG:5355
- ll -69.70478248022084 -69.77257618903477
- en 238292.89465600674 2252520.074566805
- ll2 -69.70478247648066 -69.77257616430587
-EPSG:5356
- ll -26.191275517431507 -68.30983219206357
- en 568959.171373307 7102950.006337525
- ll2 -26.191275517431066 -68.30983219206354
-EPSG:5357
- ll -78.6028616203202 -52.75359238020446
- en 593596.4237111883 1270947.627341438
- ll2 -78.60286162026654 -52.753592380615274
-EPSG:5360
- ll -71.49281897457212 87.54366632716659
- en 87.54366632716659 -71.49281897513967
- ll2 -71.49281897457307 87.54366632716659
-EPSG:5361
- ll -53.93133646242386 -71.42128509549904
- en 341039.2866091683 4021402.193863306
- ll2 -53.93133646240485 -71.42128509550233
-EPSG:5362
- ll -12.626275812588617 -78.79014544475872
- en 88111.57662446715 8601211.303528572
- ll2 -12.626275812561897 -78.79014544457627
-EPSG:5365
- ll -52.28260487788408 -9.114360765199905
- en -9.114360765199905 -52.28260487788422
- ll2 -52.282604877884346 -9.114360765199905
-EPSG:5367
- ll -80.39733285030637 -85.04095067083693
- en 480609.5728559691 -8928787.288482396
- ll2 -80.39733285030715 -85.04095067083695
-EPSG:5371
- ll 32.538471346584416 108.65409788282841
- en 108.6540978828284 32.538471347440414
- ll2 32.538471346584416 108.65409788282841
-EPSG:5373
- ll -63.36564116469859 -103.93025665854239
- en -103.93025665854239 -63.365641165454136
- ll2 -63.36564116469929 -103.93025665854239
-EPSG:5381
- ll -46.443859266138624 -143.1730955103805
- en -143.17309551038053 -46.44385926613868
- ll2 -46.44385926613873 -143.17309551038053
-EPSG:5382
- ll -46.91592278005872 -63.053490173520736
- en 39116.0326945454 4786364.957311877
- ll2 -46.91592277572505 -63.05349017095309
-EPSG:5383
- ll 6.821579747063851 -55.8429927630424
- en -35738.59325550997 1.0756719409846645E7
- ll2 6.821579746982011 -55.84299276175606
-EPSG:5387
- ll -74.12603122005525 -71.6805947455297
- en 601296.1240484433 1771078.0429166174
- ll2 -74.12603122002564 -71.68059474557228
-EPSG:5389
- ll -46.37430537591825 -65.47254061697394
- en 771283.6351042737 4858314.596539607
- ll2 -46.374305375747475 -65.472540616924
-EPSG:5393
- ll -50.336335069772595 54.65123340541092
- en 54.65123340541092 -50.33633507069932
- ll2 -50.336335069772794 54.65123340541091
-EPSG:5396
- ll 23.122155672842823 -26.25497963933936
- en 576283.4438259662 1.2557237232714692E7
- ll2 23.12215567284266 -26.25497963933936
-EPSG:5451
- ll 8.39347181717848 -112.09267807100734
- en -112.0940748841358 8.394748590667877
- ll2 8.39347179416127 -112.09267804599118
-EPSG:5456
- ll -0.3318546493408405 -48.960668386739485
- en 4498532.437171512 -704698.5336260825
- ll2 -0.3318546314401144 -48.96066842724844
-EPSG:5457
- ll 63.689928325218204 -143.7813283803253
- en -4877082.049032945 8134249.822053165
- ll2 63.689928310610476 -143.78132833781612
-EPSG:5459
- ll -19.282791431082146 -52.07333811985207
- en 5281944.8179766135 -3277286.8549161507
- ll2 -19.282791443737647 -52.07333816044456
-EPSG:5460
- ll 17.00198400742942 -53.77022683528075
- en 4243598.916960799 927040.4937780498
- ll2 17.001984028653922 -53.77022685563721
-EPSG:5461
- ll -44.113899335850924 -80.48072557925343
- en 1205354.82474184 -7409330.642256498
- ll2 -44.113899332119274 -80.48072557025722
-EPSG:5462
- ll 42.6803744294546 -77.90932606393578
- en 1229653.5277742324 3913746.725814908
- ll2 42.68037437367676 -77.9093260034349
-EPSG:5463
- ll -87.37463012966177 -85.00335801551127
- en 479608.1755273974 -9705578.634704234
- ll2 -87.37463012865776 -85.00335789303598
-EPSG:5464
- ll 3.1661247527313208 61.44929954080308
- en 61.44929954080308 3.1661247527313208
- ll2 3.1661247527313208 61.44929954080308
-EPSG:5467
- ll 54.46312310105776 18.169677978578164
- en 18.169677978578164 54.463123101057754
- ll2 54.463123101057754 18.169677978578164
-EPSG:5469
- ll 53.7929161265157 -151.85406358760184
- en -6330541.928127919 6607824.710609632
- ll2 53.79291612651574 -151.85406358760184
-EPSG:5479
- ll -35.80799071553279 173.47887226658457
- en 8134968.047503044 9916361.143227274
- ll2 -35.80799071553281 173.4788722665848
-EPSG:5480
- ll -32.442130988419024 101.96999505496322
- en -921442.2604758488 4543467.604134406
- ll2 -32.442130988419045 101.96999505496322
-EPSG:5481
- ll -88.65794955779307 88.91118278250536
- en 2831224.592198794 -1088992.9721385206
- ll2 -88.65794955779322 88.91118278250536
-EPSG:5482
- ll -18.87157851892995 29.17275206778913
- en 586147.8125248598 -6906485.483304426
- ll2 -18.871578518928995 29.172752067789144
-EPSG:5489
- ll -25.25261666781553 148.8930686474407
- en 148.8930686474407 -25.252616668544025
- ll2 -25.252616667815207 148.89306864744074
-EPSG:5490
- ll -0.866301581201725 -64.38927732075183
- en 345410.5253634228 -95780.76771100405
- ll2 -0.8663015812017205 -64.38927732074991
-EPSG:5518
- ll 32.88105341681471 -177.1114394163365
- en 292732.1471224326 9163584.01186133
- ll2 32.8810533958005 -177.1114394273198
-EPSG:5519
- ll -34.237368596244345 -171.5585245882657
- en 805402.8460663061 1722714.024434451
- ll2 -34.23736859785848 -171.5585245893519
-EPSG:5520
- ll -74.22189030832045 8.842957934624025
- en 1677097.0339522515 -8248558.49708608
- ll2 -74.22188949907296 8.842957844445404
-EPSG:5523
- ll -64.842589284307 7.751403506374333
- en 1322270.1836005833 -1696176.7355563333
- ll2 -64.84258928413128 7.751403506478477
-EPSG:5524
- ll 18.878986645869844 85.43714816453672
- en 85.43714816453672 18.878986645869844
- ll2 18.878986645869844 85.43714816453672
-EPSG:5527
- ll -29.600153771062217 -127.91688647889217
- en -127.91631337150164 -29.600029357776343
- ll2 -29.600153769590705 -127.91688647215335
-EPSG:5531
- ll -60.40176666290982 -60.14716655467992
- en 326689.16333939217 3299731.5687518
- ll2 -60.401766660167695 -60.147166548646915
-EPSG:5533
- ll 57.6231358103785 -39.86096203489857
- en 806816.5835718466 1.6398386074821938E7
- ll2 57.62313581009329 -39.8609620403677
-EPSG:5534
- ll 73.99489951855259 -34.668155878742354
- en 633249.5539648687 1.8216299475006524E7
- ll2 73.99489952028212 -34.66815588458954
-EPSG:5535
- ll 4.091603019187687 -31.886483953456107
- en 623633.1840051138 1.0452374063006962E7
- ll2 4.091603017305093 -31.88648395522597
-EPSG:5536
- ll -72.58995956355733 -63.12675322369536
- en 295698.7045749072 1934605.1599568212
- ll2 -72.58995956210131 -63.12675321323303
-EPSG:5537
- ll -33.35666358025452 -50.18050721954997
- en 576248.4711016294 6308815.635537427
- ll2 -33.356663580254505 -50.18050721954992
-EPSG:5538
- ll -23.96924309296503 -43.1090482229001
- en 692408.0035446816 7347853.3412195295
- ll2 -23.969243092964206 -43.10904822289862
-EPSG:5539
- ll -5.052459766914524 -43.54793974594829
- en -4663.985167084844 9439763.998341696
- ll2 -5.0524597668728815 -43.54793974496691
-EPSG:5546
- ll -28.991959444183536 -157.2491784382718
- en -157.2491784382718 -28.991959444983504
- ll2 -28.991959444182527 -157.24917843827177
-EPSG:5550
- ll -14.754923746033043 134.92331146519965
- en -155104.11477167706 8359908.347186065
- ll2 -14.75492374537716 134.92331146700832
-EPSG:5551
- ll -59.71358649679835 149.70277073760795
- en 652027.7499701461 3377388.1173826344
- ll2 -59.7135864967662 149.7027707376063
-EPSG:5552
- ll -65.10693873776815 157.75164419580028
- en 723010.2181783214 2771232.4990737345
- ll2 -65.10693873705854 157.7516441948883
-EPSG:5554
- ll -48.252041575927116 1.7732969031545682
- en 408940.84879098187 -5345041.540172355
- ll2 -48.25204157592694 1.773296903154312
-EPSG:5555
- ll -76.41063778959592 11.212938099435606
- en 558029.0447630927 -8482095.85829745
- ll2 -76.41063778959509 11.212938099434474
-EPSG:5556
- ll 84.72772160151095 16.952993554152254
- en 520032.00499727944 9409675.502961094
- ll2 84.72772160151135 16.952993554151863
-EPSG:5559
- ll 7.924689287857547 -167.54102322328964
- en -7897273.860504808 962777.1924319807
- ll2 7.9246892564750695 -167.5410232350738
-EPSG:5561
- ll -26.62008492466891 134.48870070327297
- en 134.48764864682363 -26.61902279676799
- ll2 -26.620084917772854 134.48870069838134
-EPSG:5562
- ll 36.04319254726984 18.330991722827687
- en 4259579.581975146 3993759.6169154826
- ll2 36.04319255006025 18.330991733851505
-EPSG:5563
- ll -76.88993785949211 27.55078544293051
- en 5514078.793083551 -8538049.945017744
- ll2 -76.88993784408378 27.550785593582706
-EPSG:5564
- ll -69.49141717740702 26.477439448694277
- en 6245394.420008691 -7725886.1514070025
- ll2 -69.49141715800071 26.477439560099782
-EPSG:5565
- ll 63.37939480546578 43.50310908645561
- en 7725201.512441512 7038687.93974233
- ll2 63.37939480452375 43.503109087056046
-EPSG:5566
- ll 72.23702810221505 17.054277181304133
- en 365812.5418334744 8023131.599669953
- ll2 72.23702810221947 17.05427720021404
-EPSG:5567
- ll -59.216572384044234 29.498245724903956
- en 642787.7892903518 -6569493.7131203795
- ll2 -59.2165723656683 29.498245781946217
-EPSG:5568
- ll -79.3936164210696 36.36704558792587
- en 569300.1580584389 -8819503.605291534
- ll2 -79.39361640157529 36.36704576117854
-EPSG:5569
- ll -35.202318378508345 35.42931401499609
- en 174869.6082665897 -3902839.4234294556
- ll2 -35.20231836309587 35.429314038137434
-EPSG:5589
- ll 21.7405926049762 -95.27363750913096
- en -2040740.2203893152 2193477.7857572143
- ll2 21.740592603363453 -95.27363751082552
-EPSG:5593
- ll 53.3195571773081 -36.81418790006916
- en -36.81418790006916 53.319557178211554
- ll2 53.3195571773084 -36.81418790006916
-EPSG:5596
- ll -51.465856480913345 17.80785879427551
- en 1449714.9930055721 -5723827.407026535
- ll2 -51.46585647403232 17.80785878590895
-EPSG:5598
- ll 87.75672215747196 9.011542211771939
- en 989851.9724294731 9751611.87801152
- ll2 87.75672215747215 9.011542211773826
-EPSG:5627
- ll -33.51024504325913 4.0964176316387695
- en 323275.6079548169 -3709463.8137466544
- ll2 -33.51024502262477 4.096417664318872
-EPSG:5628
- ll -66.6688956044355 50.68224577396816
- en 50.68224577396817 -66.66889560512116
- ll2 -66.66889560443634 50.68224577396817
-EPSG:5629
- ll 73.04308932299753 45.15222291101814
- en 504955.3777446862 1.8105292844022527E7
- ll2 73.04308932299848 45.15222291101814
-EPSG:5631
- ll 76.4890141652358 8.635513137330758
- en 2490623.399482879 8493352.355972435
- ll2 76.48901416597762 8.635513168065025
-EPSG:5632
- ll 72.64681885564521 29.428373182777875
- en 4678402.168058805 5180923.539037055
- ll2 72.64681885564617 29.428373182777882
-EPSG:5633
- ll -68.67852365686275 68.27331165963773
- en 8824701.249316532 -7309232.229084317
- ll2 -68.67852365099168 68.27331165963777
-EPSG:5634
- ll 54.999190285247835 -48.44392383940853
- en 744540.7943011736 4481710.914161714
- ll2 54.99919028524829 -48.44392383940854
-EPSG:5635
- ll -64.33586364197389 31.999068690364055
- en 6317596.0518483 -7486416.264601281
- ll2 -64.33586363809319 31.999068690364066
-EPSG:5636
- ll 32.83498354069077 -82.09096258240069
- en -2069849.078900097 5927689.272989676
- ll2 32.83498353196211 -82.09096258240069
-EPSG:5637
- ll 21.75867394512063 -14.794546116030126
- en 1277928.5264374893 -104234.58865451626
- ll2 21.758673945120552 -14.794546116030132
-EPSG:5638
- ll 43.53517281523807 18.24113596397396
- en 4987318.092663772 2306246.114157507
- ll2 43.53517281611432 18.24113596397396
-EPSG:5639
- ll 70.34783926542808 44.69435525794145
- en 5302721.7427961575 5133765.615594998
- ll2 70.347839265429 44.694355257941446
-EPSG:5641
- ll 35.5103460656961 -73.57675272432039
- en 1598271.084456168 1.4206086963873945E7
- ll2 35.510346065695806 -73.57675272432039
-EPSG:5643
- ll -5.061861476015683 -74.98316728118134
- en -1.0641059621109761E7 786856.1852153193
- ll2 -5.061861429392582 -74.98316722969756
-EPSG:5644
- ll -56.64803215990667 51.649490480705126
- en 539826.551841433 3721603.8258588556
- ll2 -56.64803215990706 51.649490480705126
-EPSG:5646
- ll -58.43856581878713 -79.38769825571785
- en 322034.23327171087 -3.677002603061875E7
- ll2 -58.43856580980176 -79.38769823411795
-EPSG:5649
- ll 42.036892982861986 9.523277482335937
- en 3.20400508816109E7 4674505.492487999
- ll2 42.036892977218535 9.523277480079294
-EPSG:5650
- ll -69.6618999490627 13.587456570133735
- en 3.3445213117160507E7 -7728803.105019942
- ll2 -69.66189994906328 13.587456570133732
-EPSG:5651
- ll 80.48534873633935 4.4527578400587835
- en 3.1526806345328525E7 8936094.116899887
- ll2 80.48534873634004 4.452757840058759
-EPSG:5652
- ll -73.52045343546172 11.447803162203208
- en 3.2577485774967156E7 -8160126.829377929
- ll2 -73.52045343545726 11.447803162200481
-EPSG:5653
- ll 1.9279216080133068 17.821401873976633
- en 3.3813902315435216E7 213354.24269404815
- ll2 1.9279216080125503 17.82140187390191
-EPSG:5654
- ll 26.90973439826078 -72.51373768015344
- en 1635939.7392049269 -5674153.660453944
- ll2 26.909734398260234 -72.51373768015344
-EPSG:5655
- ll 78.99710981094654 -70.73234789736804
- en 1764008.4415319287 1.33412135122524E7
- ll2 78.9971098109471 -70.73234789736819
-EPSG:5659
- ll -66.52672625098009 14.409679478184
- en 740275.6599467343 -1.1389096828786794E7
- ll2 -66.52672623562039 14.409679478038868
-EPSG:5663
- ll 42.03245501901313 16.689389697333283
- en 3640022.800276471 4656756.4323638985
- ll2 42.03245502167205 16.689389710418926
-EPSG:5664
- ll -16.849465977909347 4.492529355889581
- en 2019334.4640446021 -1869096.5681740833
- ll2 -16.849465962898105 4.4925293824854
-EPSG:5665
- ll 16.71390013232181 17.143906781996314
- en 3728810.559345802 1849980.523292389
- ll2 16.71390013985624 17.143906795658253
-EPSG:5666
- ll -21.003253738738337 11.157832512082864
- en 3724359.2186484304 -2324726.11790622
- ll2 -21.003253738736955 11.157832512083099
-EPSG:5667
- ll -76.42282027783713 14.846936494434827
- en 4574598.167885946 -8486642.44049673
- ll2 -76.42282027782906 14.846936494423844
-EPSG:5668
- ll -21.04637836603655 8.33630137561634
- en 4119052.277697846 -2332363.6423325525
- ll2 -21.046378366000837 8.336301375583668
-EPSG:5669
- ll 2.420032621181207 19.378591843680244
- en 5987410.447399335 268356.86829464394
- ll2 2.4200326211653573 19.378591842836865
-EPSG:5670
- ll 40.9183261698262 7.3277709189456095
- en 3359251.769533932 4532991.801380655
- ll2 40.9183261753982 7.3277709372285225
-EPSG:5671
- ll -28.874274493575435 15.545855569576442
- en 4846181.091366354 -3200496.2817171165
- ll2 -28.87427447917118 15.545855602178031
-EPSG:5672
- ll -61.24655992496815 20.199524783411157
- en 5779098.903008695 -6804147.820999358
- ll2 -61.24655991057826 20.19952485229322
-EPSG:5673
- ll 83.01034403371713 5.130568548911888
- en 3447571.175946959 9223238.776082497
- ll2 83.01034403487854 5.130568598632944
-EPSG:5674
- ll -74.71710990184614 5.504166901468423
- en 4309272.823381599 -8305933.092629097
- ll2 -74.71710989824467 5.504167043361362
-EPSG:5675
- ll -20.5570049693994 8.96865166981104
- en 4870315.151329523 -2285664.2360903905
- ll2 -20.5570049539441 8.968651695564022
-EPSG:5676
- ll 80.74268542409914 5.785244674161567
- en 2496149.429996453 8967604.075507512
- ll2 80.74268533518048 5.785244695518166
-EPSG:5677
- ll -62.80700533893251 3.9606026467043485
- en 3243229.675741216 -6976864.467103624
- ll2 -62.80700463419807 3.960602724949131
-EPSG:5678
- ll 40.64157693999121 9.961864789403577
- en 4327703.635867463 4502323.036562146
- ll2 40.641576936893905 9.961864797746486
-EPSG:5679
- ll 62.725876867962484 8.705096586540426
- en 5178534.698078743 6973104.010139748
- ll2 62.72587686117171 8.705096603019808
-EPSG:5680
- ll -48.46437888652143 6.744101869512384
- en 1776841.1989341537 -5376954.803573513
- ll2 -48.46437834598885 6.7441018771444226
-EPSG:5681
- ll 8.595488759636282 -77.73879637788177
- en -77.73879637788177 8.595488759636282
- ll2 8.595488759636282 -77.73879637788177
-EPSG:5682
- ll 26.831911962834596 -0.27096320646569283
- en 1875984.220453633 2984169.3751039826
- ll2 26.83191196129796 -0.270963209038082
-EPSG:5683
- ll -40.7919497126047 13.236495479613083
- en 3857561.929828512 -4525659.94136284
- ll2 -40.79194971219664 13.23649547983448
-EPSG:5684
- ll 35.41065456705674 6.762816431332614
- en 4024145.640146464 3932385.1738731144
- ll2 35.41065456602542 6.762816430411347
-EPSG:5685
- ll 78.86325473606945 15.765224214484402
- en 5516504.215109927 8757369.970741872
- ll2 78.86325473606945 15.765224214484416
-EPSG:5698
- ll 73.21672571178574 -27.02725147817963
- en -393209.62460484775 9920732.90438832
- ll2 73.21672571178672 -27.027251478179622
-EPSG:5699
- ll 0.11683264243730207 -71.58955589103033
- en -8810186.282009218 5777141.235437519
- ll2 0.11683264243732602 -71.58955589103034
-EPSG:5700
- ll -74.23509264914034 -171.34332365423347
- en 671309.9106347397 1753587.8266990595
- ll2 -74.23509264843383 -171.3433236594366
-EPSG:5707
- ll 67.48682421320473 11.867737791260325
- en 1031010.0746386297 3268412.569020427
- ll2 67.48682421096821 11.867737794973621
-EPSG:5708
- ll -10.70184319094302 -62.717419886732166
- en -9498366.54780149 1288327.9042623267
- ll2 -10.701843201842259 -62.7174198823044
-EPSG:5825
- ll 64.69952307343561 155.97326782968875
- en 531623.7824749767 1.1706923928725347E7
- ll2 64.6995230716006 155.973267744557
-EPSG:5832
- ll 84.9136722863309 9.509410257521939
- en 2534724.939196153 9433889.82948496
- ll2 84.91367228632927 9.509410257445007
-EPSG:5833
- ll -83.5361076222747 10.907513037181847
- en 3523977.046427616 -9279396.332758386
- ll2 -83.53610762227463 10.907513037181523
-EPSG:5834
- ll 7.335563749229237 18.284036557660528
- en 5195126.06028855 815973.0186420518
- ll2 7.335563748726084 18.28403655155966
-EPSG:5835
- ll 60.69795390312575 18.14014112887729
- en 5671450.096431169 6735230.275948454
- ll2 60.69795390304895 18.140141128863142
-EPSG:5836
- ll 22.867505757263814 43.44905291179189
- en 956712.0601502475 2535752.9638797715
- ll2 22.8675057571263 43.449052912018125
-EPSG:5837
- ll 38.32350659652806 55.28135391133654
- en 349767.48145453853 4243107.180629223
- ll2 38.32350659652649 55.28135391133413
-EPSG:5839
- ll 5.632294768964357 -84.5184406179966
- en 110121.21566109243 1.062373388887614E7
- ll2 5.632294768955772 -84.51844061777376
-EPSG:5842
- ll 67.82762015150942 12.968807717713027
- en 540800.5424868658 1.752396512934732E7
- ll2 67.82762015150936 12.968807717713029
-EPSG:5844
- ll 10.219812853106987 31.057959446518304
- en 615909.8176563431 1.1130244870191664E7
- ll2 10.219812853106992 31.05795944651798
-EPSG:5845
- ll 46.71992056461929 18.19850215345573
- en 744428.265136741 5179010.058131455
- ll2 46.719920564523456 18.198502153488366
-EPSG:5846
- ll 58.30362402930675 12.080398804072402
- en 154713.9010982713 6465103.227684124
- ll2 58.303624029307215 12.080398804072404
-EPSG:5847
- ll 61.220627591079705 12.500229314976425
- en 96281.99027835348 6790489.08368526
- ll2 61.22062759108023 12.500229314976409
-EPSG:5848
- ll -43.222311832178285 21.528184962235606
- en 680462.5629137337 -4808159.762108394
- ll2 -43.22231182620498 21.528184959110295
-EPSG:5849
- ll 64.06713872654055 12.645978753254234
- en -38043.71486255896 7113029.146321978
- ll2 64.06713872632264 12.645978753384759
-EPSG:5850
- ll 3.7393737731868413 20.885592991227654
- en 470678.7792324706 414011.4238114894
- ll2 3.739373773185178 20.885592991146453
-EPSG:5851
- ll -40.03058018563607 18.05579141289371
- en 474887.83750698937 -4439870.247721078
- ll2 -40.030580185429194 18.055791413040335
-EPSG:5852
- ll -9.93109960031262 18.832999957764926
- en 488243.698347772 -1099804.514930502
- ll2 -9.93109960030664 18.832999957682663
-EPSG:5853
- ll -16.050302515538363 23.969845951374012
- en 870483.7901276993 -1786929.9349590265
- ll2 -16.050302514186132 23.969845948952656
-EPSG:5854
- ll 28.84152073902891 23.261357603337856
- en 590495.5565141566 3200080.9779993617
- ll2 28.84152073878058 23.261357603804303
-EPSG:5855
- ll -46.43062485468126 14.7973603856219
- en -269059.29319337686 -5158421.152516873
- ll2 -46.43062485237725 14.797360386260868
-EPSG:5856
- ll 14.357750416150452 28.480535530668625
- en 877465.8839798846 1598558.6370712721
- ll2 14.357750414866654 28.48053552675554
-EPSG:5857
- ll 61.87631692423116 21.83219362204136
- en 75412.67367376269 6863961.061215837
- ll2 61.876316924231155 21.832193622041288
-EPSG:5858
- ll 25.18807794981136 -53.00986332375896
- en 297519.39933258574 1.2787311193968015E7
- ll2 25.188077949039872 -53.00986332638954
-EPSG:5875
- ll 45.79804742361037 -68.00817991863332
- en 1043382.915111297 1.5095463282588042E7
- ll2 45.79804741358539 -68.00817993213612
-EPSG:5876
- ll 25.30266042643551 -71.38308444309942
- en 260134.02156449365 1.280062780210318E7
- ll2 25.30266042587245 -71.38308444468548
-EPSG:5877
- ll 64.66168640680044 -58.859346131479406
- en 697673.7594133113 1.717721992391718E7
- ll2 64.66168640718135 -58.85934613690124
-EPSG:5879
- ll -17.907409405654903 40.69598757103879
- en 43547.34067358356 8015045.20431151
- ll2 -17.90740940134577 40.695987568009336
-EPSG:5886
- ll 1.5561616904789304 138.86979260705783
- en 138.86979260705786 1.5561616904789302
- ll2 1.5561616904789302 138.86979260705786
-EPSG:5887
- ll -26.111673956328467 -174.08316884213124
- en 1791710.8368020484 2108678.996178284
- ll2 -26.111673956314732 -174.08316884210214
-EPSG:5890
- ll 7.487140280580363 108.03163353854691
- en 3350972.468833391 -1.0293891130219257E7
- ll2 7.48714028057975 108.03163353854691
-EPSG:5921
- ll 42.08536926427706 -123.56841281875023
- en -1200371.3706480192 -4473756.9605199145
- ll2 42.08536926427711 -123.56841281875023
-EPSG:5922
- ll 75.79811296288602 -79.8366440059412
- en -1030042.6503452902 -236845.54424259375
- ll2 75.79811296288604 -79.8366440059412
-EPSG:5923
- ll 68.96564811865275 11.423567004557675
- en -857888.2317413242 -1222271.8376791563
- ll2 68.96564811865275 11.423567004557672
-EPSG:5924
- ll 45.741748634152884 27.238550243537656
- en -4979105.436556923 -186605.7267305316
- ll2 45.741748634152906 27.23855024353766
-EPSG:5925
- ll 77.86271242821127 109.45236278431656
- en -1249561.4254772568 438546.91102016234
- ll2 77.86271242821128 109.45236278431656
-EPSG:5926
- ll 74.78049268098135 -62.61551688949068
- en 1266342.025978945 722475.4056122549
- ll2 74.78049268098135 -62.615516889490685
-EPSG:5927
- ll 35.94347702682066 -2.254588398430073
- en 3627822.0844762768 -3216444.635326593
- ll2 35.94347702682079 -2.254588398430073
-EPSG:5928
- ll 19.6730506071954 104.76945215155982
- en 7978663.786265704 -1180060.0544128248
- ll2 19.673050607195403 104.76945215155982
-EPSG:5929
- ll 52.83159197841395 62.534671128839854
- en -2756395.9419037346 -1278762.4741282526
- ll2 52.83159197841394 62.53467112883985
-EPSG:5930
- ll 30.0492899282236 178.12567015629523
- en 133117.5775955009 -5146228.541524583
- ll2 30.049289928223587 178.12567015629523
-EPSG:5931
- ll 84.64928622724179 -85.56887745882716
- en 283877.77090951713 2294813.0307071675
- ll2 84.64928622724177 -85.56887745882716
-EPSG:5932
- ll 19.994278439917817 -69.38207046360951
- en -3890404.7188366363 -4493506.015347182
- ll2 19.99427843991782 -69.38207046360952
-EPSG:5933
- ll 11.117982128554534 49.88696467799997
- en 2568311.69749439 -6415584.857150127
- ll2 11.117982128554566 49.88696467799997
-EPSG:5934
- ll 20.24668035750947 161.75422638622965
- en 6551255.622508338 -2253598.361005936
- ll2 20.246680357509476 161.75422638622965
-EPSG:5935
- ll 34.21005000265134 145.86006986594936
- en -3091654.14308474 -2793506.9785397956
- ll2 34.21005000265152 145.86006986594936
-EPSG:5936
- ll 22.88117368252557 -140.43969245385892
- en 3395978.6931777615 -6288437.059707375
- ll2 22.881173682524754 -140.43969245385892
-EPSG:5937
- ll -3.456634347921913 -96.34927338387854
- en 2854395.900983919 -1.139103641316125E7
- ll2 -3.456634347921588 -96.34927338387854
-EPSG:5938
- ll -1.5590005299894898 54.86892889005284
- en 1.4974595829219826E7 1517197.5326766586
- ll2 -1.559000529968595 54.86892889005284
-EPSG:5939
- ll 35.8154377325955 -159.4003006212228
- en 1705624.2193077873 8483408.741142113
- ll2 35.81543773259519 -159.4003006212228
-EPSG:5940
- ll 85.06399009049136 -27.19261593066095
- en 1593739.6402880345 2368279.005761891
- ll2 85.06399009049136 -27.192615930660963
-EPSG:5942
- ll 65.17331740448239 150.15061054715602
- en 150.150610547156 65.17331740520086
- ll2 65.17331740448314 150.150610547156
-EPSG:5945
- ll -34.03062297000411 -0.521825310501042
- en -456510.2860543118 -9214743.525879132
- ll2 -34.03062296786322 -0.5218253123198978
-EPSG:5946
- ll 37.8559100484657 1.0389560320669573
- en -380774.6881999882 -1225693.1370636765
- ll2 37.85591004689756 1.0389560312525026
-EPSG:5947
- ll 76.45787062968165 10.251714432016362
- en 171931.22568613008 3060069.867479969
- ll2 76.45787062967601 10.25171443200828
-EPSG:5948
- ll 18.159306372200533 2.785927342516926
- en -505417.35482841835 -3413237.559046733
- ll2 18.159306371695802 2.7859273426943063
-EPSG:5949
- ll -78.3726308968111 9.237542408560506
- en 94092.52529555702 -1.4134733241145037E7
- ll2 -78.37263089681196 9.237542408560502
-EPSG:5950
- ll 78.93985278315844 16.91615102833486
- en 237197.66308978025 3343032.8267258513
- ll2 78.93985278263295 16.916151011185903
-EPSG:5951
- ll 88.15226549244838 16.673349623325844
- en 118605.98579537957 4365143.081116227
- ll2 88.15226549244935 16.67334962074493
-EPSG:5952
- ll 56.529392498615266 10.67924361764918
- en -12036.889712287972 837711.569793574
- ll2 56.52939249861228 10.679243617648524
-EPSG:5953
- ll 31.480493804427752 19.24897847708077
- en 646699.2246235427 -1932681.5211073249
- ll2 31.480493803096316 19.248978478829283
-EPSG:5954
- ll 56.312479367146494 15.043353778031253
- en 133627.11011151643 812205.925216628
- ll2 56.31247936714687 15.043353778031257
-EPSG:5955
- ll 44.64401719231515 19.683746955397346
- en 431915.376440023 -477374.8934618528
- ll2 44.64401719186588 19.683746955510795
-EPSG:5956
- ll 22.879256157413224 13.467317773656049
- en -211296.2411103184 -2896911.5543279597
- ll2 22.879256157400086 13.467317773636463
-EPSG:5957
- ll 42.978250385856086 17.348082005007697
- en 87608.09026213567 -670967.8078088542
- ll2 42.97825038585615 17.348082005007694
-EPSG:5958
- ll -14.88218112758419 14.535939181042654
- en -326866.9056955977 -7081032.7679678695
- ll2 -14.882181127543829 14.535939181195133
-EPSG:5959
- ll 68.22995000391302 24.300982761370243
- en 298621.495118933 2147981.7971367496
- ll2 68.22995000333357 24.30098276029396
-EPSG:5960
- ll 62.1328280579707 14.16487881525697
- en -230123.2939934801 1476609.3693199127
- ll2 62.13282805326863 14.164878826656478
-EPSG:5961
- ll 42.613204724146584 15.394132587745858
- en -401069.1840692353 -693419.194176465
- ll2 42.6132047202196 15.39413258871208
-EPSG:5962
- ll -44.26154824309617 28.329682821332156
- en 565538.6216757896 -1.0350725658215407E7
- ll2 -44.2615482399018 28.32968282047428
-EPSG:5963
- ll 16.515760019596712 16.810274243115515
- en -615537.9156138386 -3592650.7415274493
- ll2 16.51576001826244 16.8102742450809
-EPSG:5964
- ll 36.19766291111566 26.959021685297344
- en 321180.5772675117 -1421003.1149697206
- ll2 36.197662911103826 26.959021685314223
-EPSG:5965
- ll 42.762934422855466 24.557760545756025
- en 22873.890799366913 -694467.8992850604
- ll2 42.76293442285545 24.557760545755922
-EPSG:5966
- ll -74.13398958168715 19.755268025787057
- en -105499.80482316602 -1.3673211494092522E7
- ll2 -74.13398957972146 19.755268051285025
-EPSG:5967
- ll -46.386006852908274 31.03498738274153
- en 371913.1737284978 -1.0576352046318185E7
- ll2 -46.38600685273523 31.034987382791748
-EPSG:5968
- ll 86.44712626505589 27.26607639999161
- en 91459.9997157658 4173945.3745330055
- ll2 86.44712626505623 27.266076399991622
-EPSG:5969
- ll -24.00403123556589 23.80771601217039
- en -479824.3446518 -8098760.820448225
- ll2 -24.004031234875278 23.807716010973955
-EPSG:5970
- ll -60.32176179053946 35.52868718026768
- en 377689.48424645414 -1.2131802184552876E7
- ll2 -60.321761789232866 35.52868717896756
-EPSG:5971
- ll -86.12761223789109 1.7090870923338324
- en 490267.25386653736 -9565731.598127155
- ll2 -86.12761223789148 1.7090870923338377
-EPSG:5972
- ll 24.438037872863248 10.54421314309819
- en 656539.9216946993 2703597.679453076
- ll2 24.438037872862747 10.544213143098718
-EPSG:5973
- ll 14.09953689257948 17.776422670971606
- en 799802.661144418 1560505.1834481698
- ll2 14.099536892575404 17.776422670942978
-EPSG:5974
- ll 79.5054396915732 15.212221814592535
- en 382499.4610295419 8832226.893812232
- ll2 79.50543969131775 15.212221821377952
-EPSG:5975
- ll -34.359539287876856 20.380716160711177
- en -109183.37671866198 -3821935.082469229
- ll2 -34.35953928404301 20.38071615856812
-EPSG:5976
- ll 82.49661928770809 32.166470047309076
- en 487848.50421905215 9160353.602749458
- ll2 82.49661928770873 32.16647004730909
-EPSG:6050
- ll 31.266104188420478 -3.479988374955184
- en 2.8673069353131495E7 -4371549.9433766985
- ll2 31.26610418841867 -3.4799883749551905
-EPSG:6051
- ll 68.24848839831198 -73.84872901453413
- en 1.7598449775516227E7 1119800.1534336866
- ll2 68.24848839831284 -73.84872901453414
-EPSG:6052
- ll 64.94101391598302 27.787129128972126
- en 2.2292373381876174E7 1210673.5087544282
- ll2 64.94101391598376 27.7871291289721
-EPSG:6053
- ll 86.3548027586244 -145.9990962792172
- en 2.909312350533767E7 4672043.97563956
- ll2 86.35480275862476 -145.99909627921718
-EPSG:6054
- ll 47.488395904375764 -26.85164099844532
- en 3.2508575110040594E7 -3382.2307028127834
- ll2 47.48839590437589 -26.851640998445333
-EPSG:6055
- ll 49.99092766319254 -55.07833373271371
- en 3.0307103755502287E7 1494521.3493526543
- ll2 49.990927663192714 -55.078333732713716
-EPSG:6056
- ll 44.941535890653846 -32.952188488315755
- en 2.3095470644337084E7 1681970.277145645
- ll2 44.94153589065395 -32.95218848831576
-EPSG:6057
- ll 51.390593649385664 -116.61107130997564
- en 1.8243860466204762E7 5037102.994957197
- ll2 51.39059364938587 -116.61107130997564
-EPSG:6058
- ll 74.25026437085225 -19.759447168949848
- en 2.4325746496734217E7 4384169.341839938
- ll2 74.25026437085322 -19.759447168949873
-EPSG:6059
- ll 40.830693079968604 21.37656420711616
- en 4.7088747476432465E7 6519430.676408302
- ll2 40.83069307996868 21.376564207116157
-EPSG:6060
- ll 66.27794502322695 -25.117511944111172
- en 4.4251445569890134E7 4964178.247099124
- ll2 66.27794502322773 -25.117511944111136
-EPSG:6061
- ll 29.640568900241266 -27.516966907937487
- en 4.484715307084655E7 466696.31359886564
- ll2 29.640568900240076 -27.516966907937483
-EPSG:6062
- ll 68.34816367525741 23.743471243515728
- en 2.8937776221589215E7 8308853.8767344905
- ll2 68.34816367525828 23.743471243515714
-EPSG:6063
- ll 44.2191413037325 -113.0483735278059
- en 2.353281625757102E7 7178379.595688759
- ll2 44.2191413037326 -113.0483735278059
-EPSG:6064
- ll 16.536242147297518 -65.18152371689354
- en 2.448903144139152E7 2340120.73252795
- ll2 16.53624214729752 -65.18152371689355
-EPSG:6065
- ll 63.64008390733317 -37.57297893455143
- en 1.216043405766022E7 7379907.807363362
- ll2 63.64008390733385 -37.572978934551436
-EPSG:6066
- ll 57.12621797950665 37.57432586141954
- en 1.69932106481831E7 8808602.457603645
- ll2 57.12621797950711 37.57432586141953
-EPSG:6067
- ll 75.64496665777159 -110.84064163785183
- en 1.90350418703338E7 1.0750400731075095E7
- ll2 75.6449666577725 -110.84064163785186
-EPSG:6068
- ll 2.084813087100108 -72.65490756977096
- en 1.6669181427793093E7 2376280.8886274807
- ll2 2.0848130871001254 -72.65490756977096
-EPSG:6069
- ll 71.90241728813581 -47.45124555489026
- en 2.0693390390148036E7 2465544.424085114
- ll2 71.90241728813677 -47.45124555489025
-EPSG:6070
- ll 66.79093760563087 -50.023039285524945
- en 9048725.03630044 3867922.5745236003
- ll2 66.79093760563168 -50.02303928552495
-EPSG:6071
- ll 72.54000502624191 -57.58276603710222
- en 2.4694983728285726E7 5343361.554341604
- ll2 72.54000502624288 -57.5827660371022
-EPSG:6072
- ll 18.340028479808197 58.72388907490924
- en 3.2084900644809738E7 -1911390.7116452921
- ll2 18.340028479808197 58.72388907490922
-EPSG:6073
- ll 34.48306717141479 93.20178411550711
- en 1.7783047081527714E7 5930619.862234565
- ll2 34.48306717141496 93.2017841155071
-EPSG:6074
- ll 59.5497376791823 99.60825445370293
- en 1.6579620336814687E7 5965146.009301622
- ll2 59.54973767918277 99.60825445370295
-EPSG:6075
- ll 46.085810162233116 17.381321491055957
- en 2.1562306161617428E7 -760261.892921377
- ll2 46.08581016223313 17.381321491055935
-EPSG:6076
- ll 68.44372910923806 166.98598494351324
- en 2.8820109704929803E7 2695206.5513714217
- ll2 68.44372910923803 166.98598494351324
-EPSG:6077
- ll 36.520197778589235 -7.118001934759118
- en 8166862.279135791 1441256.008989876
- ll2 36.52019777858936 -7.118001934759128
-EPSG:6078
- ll 30.836577356041232 70.89369815124681
- en 1.4046062708145697E7 -2139017.669558514
- ll2 30.836577356041232 70.89369815124681
-EPSG:6079
- ll 80.5269139008654 179.95512467161296
- en 1.8470889261449188E7 4317817.0158853745
- ll2 80.52691390086538 179.95512467161296
-EPSG:6080
- ll 81.36025034861103 157.34515894140407
- en 1.9705737641461827E7 3818028.2116018455
- ll2 81.36025034861103 157.34515894140404
-EPSG:6081
- ll 81.05565718896415 125.03335953783113
- en 3.143588848383217E7 5730915.368128397
- ll2 81.05565718896416 125.03335953783117
-EPSG:6082
- ll 68.57614746399156 20.691193740525257
- en 3.0411074290944047E7 4930795.882210671
- ll2 68.57614746399157 20.69119374052527
-EPSG:6083
- ll 61.42152102080342 42.13591312737368
- en 3.164674862492059E7 4639726.135172126
- ll2 61.421521020803375 42.13591312737367
-EPSG:6084
- ll 53.04828114520939 104.74866070954191
- en 3.4759471421874866E7 2338862.856116886
- ll2 53.04828114520937 104.7486607095419
-EPSG:6085
- ll 19.66326277020391 178.99236575082318
- en 4.203741742358057E7 -1707792.4306473574
- ll2 19.663262770203918 178.99236575082318
-EPSG:6086
- ll 68.7638663873566 164.21754500697426
- en 3.990514870172479E7 3836930.428660606
- ll2 68.76386638735659 164.2175450069742
-EPSG:6087
- ll 86.09843033060308 -16.78317386851227
- en 1.5055504767370552E7 7389043.763985349
- ll2 86.09843033060302 -16.783173868512264
-EPSG:6088
- ll 81.12834418832179 2.017495123767805
- en 1.6519673543917883E7 7187950.808724627
- ll2 81.12834418832179 2.017495123767816
-EPSG:6089
- ll 16.277891812072816 117.73621674588304
- en 2.2845321954125706E7 -863196.1692193821
- ll2 16.277891812072834 117.73621674588304
-EPSG:6090
- ll 43.22821677836251 176.81737789843012
- en 2.6064943807766292E7 4705468.320687265
- ll2 43.228216778362516 176.81737789843015
-EPSG:6091
- ll 48.336320356037604 148.45501456520833
- en 2.4402735486880388E7 2885080.2680141665
- ll2 48.336320356037625 148.4550145652083
-EPSG:6092
- ll 75.76067932075735 150.53334259824072
- en 2.5295047081721455E7 5929781.1037654085
- ll2 75.76067932075735 150.53334259824075
-EPSG:6093
- ll 18.411449878066772 154.50153516892422
- en 2.403931210121661E7 -459852.875653822
- ll2 18.41144987806678 154.50153516892422
-EPSG:6094
- ll 25.90076183791942 -106.98156881096222
- en 3.5635628212184854E7 2998740.5423218017
- ll2 25.900761837919024 -106.98156881096222
-EPSG:6095
- ll 32.459843946898424 -65.26878713851407
- en 3.810607613802133E7 6139438.652227382
- ll2 32.45984394689868 -65.26878713851407
-EPSG:6096
- ll 56.568996605058295 -150.96387010806978
- en 1.537189158640399E7 5240756.416867641
- ll2 56.568996605058736 -150.9638701080698
-EPSG:6097
- ll 48.998604749532674 -69.216172127051
- en 2.1004761900258757E7 7571113.200132577
- ll2 48.99860474953285 -69.216172127051
-EPSG:6098
- ll 64.58132042713908 -92.4549425417113
- en 2.337736016139767E7 -859142.8744520554
- ll2 64.58132042713981 -92.4549425417113
-EPSG:6099
- ll 76.40352511988534 -56.60346210458022
- en 1.5790397528402923E7 2580854.1030767793
- ll2 76.40352511988628 -56.60346210458022
-EPSG:6100
- ll 29.066688720346534 -39.95527107884638
- en 2.0704343943026338E7 -2677576.072186591
- ll2 29.066688720345518 -39.95527107884638
-EPSG:6101
- ll 45.12533760284812 -97.4942028141724
- en 2.8159570176747236E7 332655.1739263404
- ll2 45.125337602848205 -97.4942028141724
-EPSG:6102
- ll 85.65789513309474 -89.76331718317901
- en 2.7578553050842974E7 4284462.433789271
- ll2 85.65789513309514 -89.76331718317893
-EPSG:6103
- ll 80.42622646697893 -47.63725746519806
- en 2.9888048718533956E7 3763616.88056259
- ll2 80.42622646697973 -47.637257465198054
-EPSG:6104
- ll 25.742213326030296 -58.39982641208452
- en 2.168325507413032E7 3312944.464141449
- ll2 25.74221332602993 -58.399826412084536
-EPSG:6105
- ll 17.221904319013774 -90.98131463169932
- en 1.846641153658686E7 -2629768.909496893
- ll2 17.221904319013777 -90.98131463169929
-EPSG:6106
- ll 50.386180417372564 -2.1299147667271825
- en 2.2856915260233723E7 4951695.00217612
- ll2 50.38618041737277 -2.1299147667271825
-EPSG:6107
- ll 45.47058316826599 -101.01409401341446
- en 3.5944396949562974E7 3076884.560965526
- ll2 45.4705831682661 -101.01409401341446
-EPSG:6108
- ll 29.96223928940219 -84.73098163211382
- en 3.849673655380046E7 1144350.4203514643
- ll2 29.96223928940091 -84.73098163211382
-EPSG:6109
- ll 54.908756568510185 -46.33081134984897
- en 4.0205996289027564E7 4620500.883151732
- ll2 54.90875656851065 -46.33081134984898
-EPSG:6110
- ll 33.85801357376015 -95.51256094381344
- en 3.6897119399631E7 1535582.6826017168
- ll2 33.85801357376036 -95.51256094381341
-EPSG:6111
- ll 58.434546847909424 -130.07556099376882
- en 1.861395855316282E7 5353811.354309645
- ll2 58.43454684790988 -130.0755609937688
-EPSG:6112
- ll 70.03670196452373 -96.98414171348585
- en 2.1103553037831586E7 6729495.466737095
- ll2 70.03670196452464 -96.98414171348585
-EPSG:6113
- ll 56.71946628324383 -41.47882194688205
- en 2.5392441875202674E7 6473912.995567212
- ll2 56.71946628324426 -41.47882194688205
-EPSG:6114
- ll 26.182998524227077 4.3548948243510495
- en 3.1786430853215855E7 6895273.655157396
- ll2 26.182998524226658 4.3548948243510495
-EPSG:6115
- ll 32.24671031757457 -40.410909870406776
- en 2.092710823352023E7 -357477.6816914468
- ll2 32.246710317574845 -40.41090987040678
-EPSG:6116
- ll 40.379874882567435 18.469519902579442
- en 2.3945491358469862E7 130806.60842762678
- ll2 40.37987488256748 18.469519902579435
-EPSG:6117
- ll 70.15408209109232 158.99273595870596
- en 3.184752382023942E7 -192582.38210183498
- ll2 70.1540820910923 158.992735958706
-EPSG:6118
- ll 25.64699945884723 -128.05627847488415
- en 2.446624322800701E7 -5377886.994619097
- ll2 25.646999458847223 -128.05627847488415
-EPSG:6119
- ll 54.97348661407863 104.39613583923041
- en 2.6604991416666705E7 -122756.68581370078
- ll2 54.97348661407876 104.39613583923041
-EPSG:6120
- ll 79.6125413130031 158.29532600813602
- en 1.0345248450686177E7 2237238.84177033
- ll2 79.6125413130031 158.295326008136
-EPSG:6121
- ll 33.02913056600682 -88.0418022255357
- en 1.869632606799687E7 545678.8348362176
- ll2 33.02913056600706 -88.0418022255357
-EPSG:6122
- ll 81.22842700615534 149.74650363675832
- en 2.1067486808290996E7 3880322.1669611526
- ll2 81.22842700615531 149.74650363675835
-EPSG:6123
- ll 54.0681602954435 -174.1186015662714
- en 2.2053955991791464E7 952328.091323765
- ll2 54.068160295443505 -174.11860156627137
-EPSG:6124
- ll 79.04988431213079 -129.93517883055688
- en 1.3016952180993184E7 5022639.125927935
- ll2 79.04988431213077 -129.93517883055685
-EPSG:6125
- ll 25.870298590266003 26.301108613557133
- en 5.130293278858889E7 927257.2467650371
- ll2 25.870298590265605 26.30110861355712
-EPSG:6128
- ll -36.33233767873311 -82.58013213932875
- en 1175810.1194674254 -1.3196207984722007E7
- ll2 -36.3323376432291 -82.58013228076406
-EPSG:6129
- ll -53.90758680890286 -83.29044789981721
- en 1146445.9663540095 -1.96058181576409E7
- ll2 -53.907586612532434 -83.29044785908926
-EPSG:6135
- ll -52.94319678858818 -107.0793332492092
- en -107.0793332492092 -52.943196789495104
- ll2 -52.94319678858845 -107.0793332492092
-EPSG:6144
- ll 23.334017308131962 114.4154537546703
- en 114.41545375467032 23.334017308818765
- ll2 23.334017308131788 114.41545375467032
-EPSG:6145
- ll -35.500185842232334 7.058548764573292
- en 241411.58304036164 -9362485.821144009
- ll2 -35.50018584223164 7.058548764574774
-EPSG:6146
- ll -12.964251769446221 0.7340227256874736
- en -526568.1342680115 -6872129.221808535
- ll2 -12.964251769020485 0.7340227275860638
-EPSG:6147
- ll 11.26963709213868 0.6816747782551069
- en -646111.5819101065 -4176284.1748747258
- ll2 11.269637090923114 0.6816747854223495
-EPSG:6148
- ll 72.17003415163862 9.590446800861981
- en 137279.6105741031 2580158.045706761
- ll2 72.1700341516395 9.590446800861981
-EPSG:6149
- ll 80.70033060437112 15.081232274344913
- en 200578.85570885282 3536896.066319331
- ll2 80.70033060422661 15.081232269408906
-EPSG:6150
- ll -50.19553893632773 16.870454815352137
- en 554709.5625630855 -1.1013336142513588E7
- ll2 -50.19553893012654 16.87045480891571
-EPSG:6151
- ll 54.324069068292886 14.52452500314198
- en 296762.73788590514 594925.1992783069
- ll2 54.324069068220254 14.524525003145078
-EPSG:6152
- ll 6.334553018275656 18.973968142435307
- en 817809.7498825255 -4726326.613196651
- ll2 6.3345530177274245 18.973968134546745
-EPSG:6153
- ll 41.184237629555895 19.309157382067514
- en 587502.5864480425 -853945.2169013505
- ll2 41.18423762682082 19.30915738213616
-EPSG:6154
- ll 67.79711348276129 14.791199934463577
- en 112284.94647763604 2092000.0713091486
- ll2 67.79711348276216 14.791199934463576
-EPSG:6155
- ll -32.55182349400788 13.448405180004235
- en -92709.05988459577 -9036184.619400691
- ll2 -32.5518234940049 13.448405179998083
-EPSG:6156
- ll 11.914925537662725 22.0264615562784
- en 702895.7855752103 -4107592.461670761
- ll2 11.914925537359498 22.026461554548668
-EPSG:6157
- ll 28.604101169241048 13.823259845039335
- en -259748.77253660635 -2260360.779899362
- ll2 28.604101169169883 13.823259844898397
-EPSG:6158
- ll 83.68594451427705 16.4402682204758
- en 74704.81713159718 3865921.823321915
- ll2 83.68594451427748 16.44026822047643
-EPSG:6159
- ll 64.4562037499521 16.563289718419426
- en -41312.026357118186 1722697.9147703054
- ll2 64.45620374991097 16.563289718429722
-EPSG:6160
- ll 76.88805229564892 19.356858484232436
- en 71041.5157895568 3106694.4948884817
- ll2 76.88805229564981 19.35685848423244
-EPSG:6161
- ll 69.71187158597252 27.19776629830917
- en 320302.67781582614 2315839.3117817733
- ll2 69.71187158460401 27.19776629312115
-EPSG:6162
- ll -12.768085941166305 22.53227337007668
- en 103504.39126791793 -6843337.15881837
- ll2 -12.768085941166307 22.53227337007668
-EPSG:6163
- ll 67.59766169616336 25.335288799626102
- en 178075.93992207 2070882.2129816029
- ll2 67.59766169616225 25.335288799625996
-EPSG:6164
- ll -40.68173281093514 23.66370147530528
- en 29300.11878953014 -9936848.480122158
- ll2 -40.68173281093515 23.663701475305224
-EPSG:6165
- ll 46.64566502622958 24.28444931021683
- en 6941.055582992005 -262708.33178637223
- ll2 46.645665026229395 24.284449310216544
-EPSG:6166
- ll 3.0421925011014395 22.44383521710597
- en -351275.62306902366 -5094042.443683278
- ll2 3.042192501089374 22.443835217645415
-EPSG:6167
- ll -20.440497481580294 31.119867138902617
- en 477935.0752946703 -7696588.388874119
- ll2 -20.4404974815484 31.11986713892144
-EPSG:6168
- ll 77.63592518204408 34.12453140667186
- en 234300.66582164416 3196349.6639650995
- ll2 77.63592518169266 34.12453140152795
-EPSG:6169
- ll 23.899281131398297 23.227227462404382
- en -539625.4811450009 -2772926.0031148596
- ll2 23.89928113014452 23.227227460418256
-EPSG:6170
- ll -20.84702120137659 35.05212290059187
- en 574141.6351549387 -7744135.1116977
- ll2 -20.847021201239343 35.0521229007271
-EPSG:6171
- ll 67.21741248965338 -3.1722516536842464
- en 233641.65911530552 7468861.178210822
- ll2 67.21741248684215 -3.172251643488134
-EPSG:6172
- ll -64.1298404154615 9.072261273157114
- en 503518.04500558827 -7111484.7639264595
- ll2 -64.12984041546223 9.072261273157112
-EPSG:6173
- ll -81.76774277894016 19.88680022055533
- en 578027.2809371353 -9082198.134612089
- ll2 -81.76774277889314 19.886800219057093
-EPSG:6174
- ll -26.179520174042622 16.57523252237284
- en 57584.41931847436 -2903111.5568064065
- ll2 -26.179520173867953 16.57523252202023
-EPSG:6175
- ll 74.64411750871469 22.15320166681782
- en 356879.04987845884 8289741.646873444
- ll2 74.64411750844846 22.15320166811468
-EPSG:6176
- ll -2.531269183390677 31.263225985495406
- en 306898.18765326694 -279912.4130213854
- ll2 -2.5312691833906285 31.263225985501254
-EPSG:6190
- ll 81.4068177258072 2.606834546235504
- en 112526.46043358976 3823025.862388399
- ll2 81.40681772305854 2.606834535080052
-EPSG:6204
- ll -33.59720311577117 27.469080728949976
- en 1101273.3253094945 -3737714.3872165587
- ll2 -33.59720261942472 27.46908026445848
-EPSG:6207
- ll -37.029041422565214 -108.14421443767722
- en -108.14480385087009 -37.024976300362034
- ll2 -37.029042423796284 -108.14421429311925
-EPSG:6210
- ll -28.162306992919973 -47.95840608527762
- en 209486.9672639998 -3118724.052435979
- ll2 -28.16230699290104 -47.958406085316255
-EPSG:6211
- ll -88.89005675536755 -32.76141703911534
- en 513465.8741911717 -9874774.407026485
- ll2 -88.89005675537382 -32.761417053161956
-EPSG:6307
- ll 15.342567585191475 -46.06809683662895
- en 2384995.1791769653 45852.5085417931
- ll2 15.342567585191487 -46.06809683662895
-EPSG:6311
- ll -77.3151401467428 146.19379283269717
- en 146.19378335536135 -77.3150863869918
- ll2 -77.3151401467259 146.19379283278988
-EPSG:6312
- ll -45.657553565636476 34.3505133488139
- en 305262.84213953954 -8558657.17493137
- ll2 -45.657553565638445 34.35051334894817
-EPSG:6316
- ll 44.71556939314479 24.435504674868362
- en 7772625.323059794 4958073.250194176
- ll2 44.71556939248838 24.43550468624861
-EPSG:6318
- ll 73.30520917779191 -151.83048232327442
- en -151.83048232327442 73.30520917779191
- ll2 73.30520917779191 -151.83048232327442
-EPSG:6322
- ll 50.79816208170547 -59.018690977202766
- en -59.01869097720277 50.79816208170547
- ll2 50.79816208170547 -59.01869097720277
-EPSG:6325
- ll 9.623972524177958 87.223904682051
- en 87.223904682051 9.623972524177958
- ll2 9.623972524177958 87.223904682051
-EPSG:6328
- ll -26.255776206787203 175.59625741676604
- en 959283.8640160598 -2912170.9281027005
- ll2 -26.255776206566008 175.59625741721038
-EPSG:6329
- ll 59.36923546044525 175.38583943787881
- en 408263.37698686187 6582279.801250959
- ll2 59.369235460443726 175.3858394378786
-EPSG:6330
- ll -75.85800740294196 -178.30365255340763
- en 464447.77280652494 -8419733.684413858
- ll2 -75.85800740294188 -178.30365255340763
-EPSG:6331
- ll -61.742743794128565 -177.22070212106522
- en 171789.3437173908 -6861238.418421191
- ll2 -61.74274378981598 -177.22070211151714
-EPSG:6332
- ll -56.904461576137145 -158.11241841910424
- en 919068.2292742939 -6327893.630769534
- ll2 -56.90446156675896 -158.11241843942062
-EPSG:6333
- ll -57.12589578038636 -157.47360791315748
- en 592407.2539432235 -6332434.072817144
- ll2 -57.12589578038519 -157.47360791315722
-EPSG:6334
- ll 75.77212080686826 -157.32015935186155
- en 381573.1055997604 8414088.203477252
- ll2 75.77212080675753 -157.32015935139557
-EPSG:6335
- ll -65.96394812111323 -152.8561954087438
- en 234142.2118306441 -7328314.564908279
- ll2 -65.9639481188161 -152.8561954025715
-EPSG:6336
- ll 63.07147452287461 -137.26994557872496
- en 688396.1630642196 6999022.994857117
- ll2 63.071474522683374 -137.26994557881721
-EPSG:6337
- ll 28.727615966088038 -130.14824874176685
- en 974100.6212181047 3187471.3340636576
- ll2 28.727615965707752 -130.14824874106435
-EPSG:6338
- ll 84.8055178528032 -131.44938266234598
- en 475248.86853134714 9418547.635052662
- ll2 84.80551785280302 -131.44938266234297
-EPSG:6339
- ll 54.47411182642497 -124.83317950303964
- en 381212.03824910754 6037820.457558544
- ll2 54.474111826421336 -124.83317950304058
-EPSG:6340
- ll -38.252059651903025 -110.97161361888709
- en 1027687.8946670865 -4251005.014455076
- ll2 -38.25205964901632 -110.97161361812216
-EPSG:6341
- ll -76.26764464778415 -114.66043784685321
- en 403060.4812280043 -8468059.561253214
- ll2 -76.26764464774655 -114.66043784674793
-EPSG:6342
- ll -45.97358361243593 -108.56246934907303
- en 224024.38059994899 -5097285.318894776
- ll2 -45.97358361225668 -108.56246934912836
-EPSG:6343
- ll 51.82002780117574 -105.20646339111836
- en 72414.40317341441 5759257.524210435
- ll2 51.82002779580562 -105.20646338540479
-EPSG:6344
- ll 57.941437240659184 -96.44413487272064
- en 296141.2512435721 6427385.444081037
- ll2 57.94143724051107 -96.44413487269455
-EPSG:6345
- ll -84.20310222087586 -82.46499436154313
- en 551086.530866671 -9352780.133308103
- ll2 -84.20310222086533 -82.46499436231795
-EPSG:6346
- ll -1.0302866084367395 -85.24869452247322
- en 26866.14243293379 -114193.61783649851
- ll2 -1.0302866084311282 -85.24869452174718
-EPSG:6347
- ll 63.6660450219311 -79.09326396020644
- en 297508.09435797634 7066287.834887982
- ll2 63.66604502160956 -79.09326395998274
-EPSG:6348
- ll 77.44627717611763 -65.72187043044715
- en 579500.1416740131 8598795.62852246
- ll2 77.44627717610237 -65.72187043048662
-EPSG:6350
- ll 4.427464011851484 -75.38282798380177
- en 2552743.312196558 -1652543.248383212
- ll2 4.427464011851518 -75.38282798380177
-EPSG:6351
- ll 64.03167353782534 -144.29132187764384
- en 3.0407245315105315E7 4748226.341052959
- ll2 64.03167353782531 -144.29132187764384
-EPSG:6352
- ll 73.5214172475343 -88.69095864519579
- en 3.307155562170426E7 6493128.880788545
- ll2 73.52141724753432 -88.69095864519582
-EPSG:6353
- ll 24.654187975883012 -111.94519851069771
- en 2.0419527333030112E7 3925637.9003070714
- ll2 24.654187975883037 -111.94519851069771
-EPSG:6354
- ll 65.27246359206828 -81.63045632012913
- en 1.901246119914245E7 7596069.670741568
- ll2 65.27246359206828 -81.63045632012916
-EPSG:6355
- ll -42.33189467618205 -85.38855179607813
- en 236656.9477950689 -8063817.569222175
- ll2 -42.33189467618205 -85.38855179607813
-EPSG:6356
- ll 31.48296985851897 -90.24055502596161
- en 339565.6173088994 167652.9327377958
- ll2 31.482969858503466 -90.24055502599116
-EPSG:6362
- ll -25.158129415147087 -142.46506046738665
- en -3243454.968093452 -3969815.4933346063
- ll2 -25.158129415146753 -142.46506046738668
-EPSG:6365
- ll 61.01470628994761 -10.62537073047227
- en -10.625370730472271 61.01470629074685
- ll2 61.0147062899482 -10.625370730472273
-EPSG:6366
- ll 38.072774263416875 -113.79913156329675
- en 780785.0497403007 4218728.924042773
- ll2 38.07277426335165 -113.79913156322975
-EPSG:6367
- ll 21.096890467728812 -108.21690680139463
- en 789141.3178814424 2335399.898362589
- ll2 21.09689046772212 -108.2169068013906
-EPSG:6368
- ll -40.82127766230335 -101.0965415597014
- en 829209.4095949982 -4526254.384015154
- ll2 -40.82127766205218 -101.09654155954668
-EPSG:6369
- ll 79.2804518646922 -95.2754233274459
- en 577288.4852564723 8803744.23955512
- ll2 79.2804518646719 -95.27542332757264
-EPSG:6370
- ll 28.591230250838194 -98.49320924877459
- en -37578.82268893067 3175055.6029296163
- ll2 28.59123025004083 -98.49320925016292
-EPSG:6371
- ll 75.05886713359146 -81.27937277239673
- en 664400.7507422023 8338112.047812886
- ll2 75.05886713293722 -81.27937277821691
-EPSG:6372
- ll 22.622288296727575 -172.13006215137057
- en -4389012.055484768 2896364.408107911
- ll2 22.622288296727447 -172.13006215137048
-EPSG:6381
- ll -48.85455223786194 25.257790225997333
- en 612547.9048235628 -5422211.446415787
- ll2 -48.85455222015486 25.25779026870838
-EPSG:6382
- ll 8.002438991530354 25.49457839252256
- en 464903.00588064373 885318.4476840589
- ll2 8.00243899736582 25.494578404063866
-EPSG:6383
- ll -75.74324146031084 25.08535171899172
- en 247479.05489796068 -8410827.339157516
- ll2 -75.74324144595305 25.085351859687997
-EPSG:6384
- ll -58.418112601284264 36.95875532562139
- en 706358.4892597052 -6498926.193823248
- ll2 -58.41811257148659 36.95875535108274
-EPSG:6385
- ll 74.44279828416686 38.675154613053024
- en 469859.76054383046 8272968.012451627
- ll2 74.44279828240789 38.67515461739906
-EPSG:6386
- ll 41.82780898986209 32.73171362609213
- en 28590.273408563924 4637784.382839692
- ll2 41.82780898983077 32.73171362960043
-EPSG:6387
- ll -60.99523252758919 32.27385202435024
- en -63445.400068175106 -6783666.487209395
- ll2 -60.99523250134931 32.273852102159495
-EPSG:6391
- ll -37.67216578128196 -37.95031674300262
- en 2.3590731654757615E7 -2.0322547019935347E7
- ll2 -37.67216578128198 -37.95031674300262
-EPSG:6393
- ll 19.58567231102731 -20.37939217001329
- en 7211690.10545025 8209973.051883021
- ll2 19.585672311027274 -20.37939217001329
-EPSG:6394
- ll 55.075972877821044 -140.4585161759406
- en 385103.9648069311 382211.18972292263
- ll2 55.07597287781678 -140.4585161759406
-EPSG:6395
- ll -72.79442654796881 -146.61115825050365
- en 347846.8554712911 -1.4071141746678947E7
- ll2 -72.7944265477033 -146.6111582496962
-EPSG:6396
- ll 53.25714793431868 -142.56010620122316
- en 729508.3382291616 -77146.07917100887
- ll2 53.25714793415971 -142.56010620122473
-EPSG:6397
- ll 86.52706939503344 -144.39032012340374
- en 537891.1294615942 3629639.2404396064
- ll2 86.5270693950312 -144.390320128748
-EPSG:6398
- ll -78.10274246802133 -147.43597437421764
- en 650807.6025649577 -1.4666218198802907E7
- ll2 -78.10274246727876 -147.43597439512
-EPSG:6399
- ll 22.839268258674892 -160.83518573238982
- en 208932.0869750083 -3456035.624834488
- ll2 22.839268258666316 -160.83518573240232
-EPSG:6400
- ll -26.051153244942725 -167.7785147417934
- en -78829.73899979633 -8880378.65680252
- ll2 -26.051153244060703 -167.77851474340477
-EPSG:6401
- ll 83.52069624988931 -169.45097627047622
- en 456535.62878587353 3293353.33874848
- ll2 83.52069624988624 -169.45097627041056
-EPSG:6402
- ll -6.684026714297886 -165.2417244929013
- en 1026653.0932166605 -6726908.317679794
- ll2 -6.684026714226335 -165.2417244940705
-EPSG:6403
- ll 42.162156806141596 -97.80214341071617
- en 6346444.221016169 2243891.7718137056
- ll2 42.16215680614166 -97.80214341071617
-EPSG:6404
- ll -63.78804479492467 -118.19331143513458
- en -95682.552881905 -1.0521357812957032E7
- ll2 -63.78804479088609 -118.19331142416587
-EPSG:6405
- ll 71.43043035057761 -109.06361159966374
- en 1032689.6958184772 1.4762286390435323E7
- ll2 71.43043035055948 -109.06361159967416
-EPSG:6406
- ll -73.06032890109128 -115.15015414755403
- en 51411.335570181254 -1.1547016443074645E7
- ll2 -73.0603289006868 -115.15015414592186
-EPSG:6407
- ll 44.52070127408527 -117.15568588369767
- en -1122846.8535768618 5001237.0070848325
- ll2 44.520701264726284 -117.15568587491019
-EPSG:6408
- ll -43.42194780404876 -112.58223089114907
- en 307920.9284175787 -8240684.326794523
- ll2 -43.42194780404856 -112.5822308911488
-EPSG:6409
- ll -59.431443276483954 -120.21836295495464
- en -503109.7835486037 -3.2935988170660596E7
- ll2 -59.431443270474176 -120.21836294233601
-EPSG:6410
- ll 55.33787650914989 -163.8526569742662
- en -4053493.147168 4083358.0333008645
- ll2 55.33787650915001 -163.8526569742662
-EPSG:6411
- ll 35.70430671506266 -14.784879865739072
- en 2.19585665983891E7 9036484.395781381
- ll2 35.704306715062785 -14.784879865739072
-EPSG:6412
- ll 50.422039804146266 -138.38523106779542
- en -2929650.375934449 3166094.6994224964
- ll2 50.42203980414627 -138.38523106779542
-EPSG:6413
- ll -17.756057044024566 -93.66256448002603
- en 459227.7256511192 -1.970097402479277E7
- ll2 -17.756057044024548 -93.66256448002603
-EPSG:6414
- ll 19.18202814268855 -48.773331054735934
- en 7081671.727069327 730355.8428886393
- ll2 19.18202814268856 -48.773331054735934
-EPSG:6415
- ll -2.7234303978083645 -68.90325448378073
- en 9218101.708426047 -2360275.785751446
- ll2 -2.723430397808331 -68.90325448378071
-EPSG:6416
- ll 32.55585938657553 -89.95889708932073
- en 1.6312270690997535E7 966177.9429875724
- ll2 32.55585938657578 -89.95889708932073
-EPSG:6417
- ll 28.224945945666647 -99.89324482918214
- en 4185560.9506697357 -286859.7345228235
- ll2 28.224945945666676 -99.89324482918214
-EPSG:6418
- ll 10.76873859644024 -85.06178358617645
- en 2.098836498620297E7 -5565127.443965687
- ll2 10.768738596440274 -85.06178358617645
-EPSG:6419
- ll -14.014777299862583 -73.13950494464287
- en 9168352.089544691 -4048610.142100163
- ll2 -14.014777299862558 -73.13950494464285
-EPSG:6420
- ll -12.325149844664415 -138.99154619117786
- en -2788671.5717844935 -1.7551533531379465E7
- ll2 -12.325149844664386 -138.99154619117786
-EPSG:6421
- ll 22.4918514266404 -40.2017046177622
- en 9440403.294298947 2297378.745206585
- ll2 22.491851426640398 -40.2017046177622
-EPSG:6422
- ll 46.03270522175673 -111.91744875947973
- en 8384380.40001528 5621542.933733639
- ll2 46.03270522175674 -111.91744875947973
-EPSG:6423
- ll 77.00988584836355 -95.51293995138532
- en 2857160.5497683412 6074395.641355736
- ll2 77.00988584836354 -95.51293995138533
-EPSG:6424
- ll 54.08366919518927 -162.26323188489766
- en -3241799.782403603 1.1484553555981308E7
- ll2 54.083669195189266 -162.26323188489766
-EPSG:6425
- ll 85.55323884831749 -141.94837304985563
- en 1441209.116084698 8115013.893851288
- ll2 85.55323884831749 -141.94837304985563
-EPSG:6426
- ll 37.745616627735686 -78.0260882227728
- en 1.7400473991555598E7 5681874.321091158
- ll2 37.745616627735785 -78.02608822277281
-EPSG:6427
- ll -3.3984761415424636 -54.96859330363864
- en 7774273.314853207 -2730376.1471335
- ll2 -3.3984761415424405 -54.96859330363864
-EPSG:6428
- ll 40.42130913285851 -159.4933996271996
- en -1.116686838091523E7 6281063.618257439
- ll2 40.421309132858575 -159.4933996271996
-EPSG:6429
- ll 35.92143465473725 -158.82310611659022
- en -3625772.1211315533 1333444.0382440202
- ll2 35.92143465473738 -158.82310611659022
-EPSG:6430
- ll 22.51326397332985 -165.91106844351486
- en -1.6713440310732117E7 1770529.4530169792
- ll2 22.513263973329845 -165.91106844351486
-EPSG:6431
- ll 30.83916894127419 -99.22029838300996
- en 1519005.7915955512 -323082.6200828369
- ll2 30.8391689412742 -99.22029838300996
-EPSG:6432
- ll 83.62964160114193 -144.7044424856092
- en 98927.10059797249 2.1900056557937462E7
- ll2 83.62964160114193 -144.7044424856092
-EPSG:6433
- ll 41.67755756439166 -112.12357798580297
- en -2861426.5803549592 980255.7801715516
- ll2 41.677557564391705 -112.12357798580297
-EPSG:6434
- ll 63.74694197854552 -129.18306788871797
- en -8304872.095191858 1.2251610657531146E7
- ll2 63.7469419785455 -129.18306788871797
-EPSG:6435
- ll 22.100405892183588 -76.46434767628207
- en 91886.72073248454 -1762198.773937926
- ll2 22.100405892183574 -76.46434767628209
-EPSG:6436
- ll -34.834049032466055 -69.29371904551029
- en 2494905.4475161047 -2.6511706213350277E7
- ll2 -34.83404902995764 -69.29371904377113
-EPSG:6437
- ll -1.3315099546130682 -79.53957921359736
- en 362537.8342128184 -2839320.9991352037
- ll2 -1.331509954613058 -79.53957921359981
-EPSG:6438
- ll -87.28900983703342 -75.10133236697497
- en 758217.9008015906 -4.065689864338869E7
- ll2 -87.28900983703667 -75.10133237541113
-EPSG:6439
- ll 4.0710107843176075 -88.97671275801233
- en -192824.44294436066 -2133738.013248968
- ll2 4.071010784317607 -88.97671275801233
-EPSG:6440
- ll 39.28263413468347 -123.375655927949
- en -2732732.8241239544 1718690.0165165402
- ll2 39.28263413468355 -123.375655927949
-EPSG:6441
- ll 62.1603771299575 -135.2513006192437
- en -8204337.174092352 1.513009370481598E7
- ll2 62.16037712995745 -135.2513006192437
-EPSG:6442
- ll 30.521644958744304 -85.24988906754953
- en -111979.98947362974 690188.6948291046
- ll2 30.521644958704613 -85.2498890676248
-EPSG:6443
- ll 19.56411157640798 -85.04181389491819
- en -391345.48809535825 -1723176.2105233895
- ll2 19.564111576397814 -85.04181389491548
-EPSG:6444
- ll 7.8118821787982995 -80.46416119195528
- en 387782.84431347565 -2455641.7109064786
- ll2 7.81188217879818 -80.46416119195966
-EPSG:6445
- ll 60.909239227355016 -76.54055906857197
- en 1656798.2909948374 1.131239239002097E7
- ll2 60.909239224873645 -76.54055907229372
-EPSG:6446
- ll -61.874091282421645 -77.48779921733637
- en 1050926.1235002084 -1.0200061919593742E7
- ll2 -61.87409127592537 -77.48779923561696
-EPSG:6447
- ll 21.882954694042454 -89.82548183250167
- en 375808.7257275853 -2914638.590883313
- ll2 21.88295469346442 -89.82548183325854
-EPSG:6448
- ll -55.4820529792759 -108.00896625888613
- en 878513.3206857427 -1.0781273072475487E7
- ll2 -55.482052975025915 -108.00896626409553
-EPSG:6449
- ll 48.663395963539756 -116.97336967931453
- en 921897.3309390553 2564985.6877082363
- ll2 48.66339596347518 -116.97336967933275
-EPSG:6450
- ll -18.973430661234843 -105.26343232719582
- en 928331.8212673675 -6727301.7595308935
- ll2 -18.97343065943919 -105.26343232740015
-EPSG:6451
- ll 83.06891662086366 -108.66699147053097
- en 810818.1258646275 1.5139132185120117E7
- ll2 83.06891662085955 -108.6669914706053
-EPSG:6452
- ll 42.04464033603375 -109.14762829412821
- en 1346717.414401441 63124.297342944374
- ll2 42.04464032997519 -109.14762829682036
-EPSG:6453
- ll -81.19343359062921 -116.59503775251959
- en 2577266.005954687 -4.472501932841695E7
- ll2 -81.1934335906292 -116.59503775251959
-EPSG:6454
- ll 20.741245661610847 -82.2213674459374
- en 937448.28426776 -1752973.755806498
- ll2 20.741245660726918 -82.22136744518538
-EPSG:6455
- ll 56.952560618197026 -83.26764390793798
- en 1994989.4094448497 7435952.042081984
- ll2 56.95256061667212 -83.26764390910847
-EPSG:6456
- ll 16.45474348729917 -94.60046265786337
- en 226147.62601165014 -2234221.272581567
- ll2 16.45474348720927 -94.60046265769523
-EPSG:6457
- ll -74.47775059921898 -92.69400237863032
- en 2048879.716974789 -4.044954288584668E7
- ll2 -74.47775059921332 -92.69400237862665
-EPSG:6458
- ll 41.61839693428345 -92.18933316219952
- en -443745.1220930731 727838.7511386862
- ll2 41.61839692875435 -92.18933316023589
-EPSG:6459
- ll 18.410926867397905 -83.84970463209567
- en 957984.4590623601 -6117131.725262978
- ll2 18.410926867397507 -83.84970463209693
-EPSG:6460
- ll 17.485356010280384 -86.7993939638705
- en 930155.7109310912 -1967883.3232652782
- ll2 17.485356010280388 -86.7993939638705
-EPSG:6461
- ll 74.47302163243239 -91.98839160487553
- en 2472221.0363759426 1.4343882006695546E7
- ll2 74.47302163213733 -91.9883916034342
-EPSG:6462
- ll 88.81310765799005 -74.56399688257393
- en 1621798.256866775 7525101.905250252
- ll2 88.81310765799019 -74.56399688257392
-EPSG:6463
- ll 10.777060660938712 -52.518939803554474
- en 2.1186133374030385E7 -4439490.632929117
- ll2 10.777060660938735 -52.51893980355447
-EPSG:6464
- ll 0.8765562109629883 -35.34296177508284
- en 8014736.918023283 -2083497.627137331
- ll2 0.8765562109630155 -35.34296177508284
-EPSG:6465
- ll 45.951787744537086 -156.48765222170658
- en -1.306833740745529E7 7742404.42670861
- ll2 45.95178774453712 -156.48765222170658
-EPSG:6466
- ll 65.88235489426421 -29.781121999691806
- en 3631963.8442248143 4472100.359114208
- ll2 65.88235489426418 -29.78112199969182
-EPSG:6467
- ll 71.19891949833567 -19.684710574270866
- en 1.1352415263917152E7 1.7418897090560317E7
- ll2 71.19891949833567 -19.684710574270866
-EPSG:6468
- ll 83.11607948427074 -17.4297984622377
- en 2131406.916436627 7274438.185770741
- ll2 83.11607948427078 -17.429798462237684
-EPSG:6469
- ll 28.647814227413775 -56.70767203025291
- en 1.4436321409301786E7 1372306.313013241
- ll2 28.64781422741379 -56.707672030252915
-EPSG:6470
- ll -0.09733761253314555 -89.25580061014429
- en -185845.12672244455 -4461639.899450455
- ll2 -0.09733761253311377 -89.25580061014429
-EPSG:6471
- ll 34.49567456707578 -37.30075073549469
- en 1.521414527852821E7 2441629.098392957
- ll2 34.49567456707594 -37.30075073549469
-EPSG:6472
- ll 30.105683752942326 -15.017892155630449
- en 7737752.184336176 2790798.605340194
- ll2 30.10568375294234 -15.017892155630449
-EPSG:6473
- ll 41.001085246796606 -146.12010965529382
- en -1.0626347761594715E7 1.0193259340416934E7
- ll2 41.00108524679665 -146.12010965529382
-EPSG:6474
- ll 9.910463829055765 -22.996993280103112
- en 7602541.66827561 -89031.71731331048
- ll2 9.910463829055793 -22.996993280103105
-EPSG:6475
- ll 48.22833201958929 -44.598042585500465
- en 1.1544114276719466E7 8191866.51676289
- ll2 48.22833201958929 -44.598042585500465
-EPSG:6476
- ll 14.55022998086676 -34.82484824468196
- en 7190941.808874663 -107357.24461363694
- ll2 14.550229980866792 -34.82484824468197
-EPSG:6477
- ll -23.055434545441273 -104.15764377132659
- en -2831057.7470607553 -2.245802351780549E7
- ll2 -23.055434545441262 -104.15764377132659
-EPSG:6478
- ll 6.491006928352178 -132.77397226909767
- en -3857556.5695042303 -1619341.4648077274
- ll2 6.4910069283522205 -132.77397226909767
-EPSG:6479
- ll 28.489988955204353 -112.05692603006341
- en -3341916.2547217845 596865.5196318554
- ll2 28.48998895520437 -112.05692603006341
-EPSG:6480
- ll 66.44721069679397 -63.61483496212557
- en 745535.6914979202 2565222.2647542204
- ll2 66.44721069525215 -63.61483496572325
-EPSG:6481
- ll 78.10962446231403 -64.90079777231436
- en 768407.2437545556 3820430.9266855977
- ll2 78.10962446230667 -64.9007977723309
-EPSG:6482
- ll -83.09391022339484 -75.53208462985152
- en 230834.10457617603 -1.3977652241867159E7
- ll2 -83.09391022335775 -75.53208462739327
-EPSG:6483
- ll 26.08449818454966 -64.65232624375165
- en 685084.5447933872 -1944703.9998715494
- ll2 26.08449818447596 -64.65232624359983
-EPSG:6484
- ll 7.820571419491486 -62.39707510105319
- en 3196408.239069065 -1.3014018570263257E7
- ll2 7.820571419055564 -62.397075105969286
-EPSG:6485
- ll 76.96043744680964 -72.6054657621936
- en 838569.5164550155 3802719.088521164
- ll2 76.96043744680676 -72.60546576219086
-EPSG:6486
- ll -53.64394886915303 -70.84538430830725
- en 2805491.26299588 -3.507325464237565E7
- ll2 -53.64394886915301 -70.84538430830725
-EPSG:6487
- ll 6.724636274889143 -115.9484355010372
- en -4426679.822849991 -2562377.8839459717
- ll2 6.72463627488917 -115.9484355010372
-EPSG:6488
- ll 62.081907338403695 -48.20988762023282
- en 6663496.881790189 1.0027841905492557E7
- ll2 62.08190733840365 -48.20988762023283
-EPSG:6489
- ll -9.56711422313494 -45.70174130364876
- en 4351925.922723498 -5800810.2472448135
- ll2 -9.567114223134908 -45.70174130364876
-EPSG:6490
- ll 53.59200136196668 -35.23058057311219
- en 9277549.458408462 6204544.835576252
- ll2 53.59200136196669 -35.230580573112185
-EPSG:6491
- ll 56.12701054698438 -14.47715483140496
- en 3596161.972135412 3628013.5109744826
- ll2 56.127010546984415 -14.477154831404953
-EPSG:6492
- ll -2.200492712634052 -8.868003468193734
- en 2.8020886325225163E7 -4305746.472503961
- ll2 -2.200492712634015 -8.868003468193727
-EPSG:6493
- ll 15.687191551519145 -125.61589968891846
- en 1238890.196359462 -1958763.4981580079
- ll2 15.687191551519152 -125.61589968891846
-EPSG:6494
- ll 54.94581112503815 -36.18621481150683
- en 2.93851957555285E7 7231247.873212506
- ll2 54.94581112503826 -36.186214811506815
-EPSG:6495
- ll 17.65292918401489 -166.18026545157642
- en 89258.89939457364 1183115.9451570378
- ll2 17.652929184014873 -166.18026545157642
-EPSG:6496
- ll 8.532057393294341 -64.16532626520069
- en 3.610905523644065E7 -1.2696650708998028E7
- ll2 8.532057393294359 -64.16532626520068
-EPSG:6497
- ll 41.871747565998646 -90.28501351015758
- en 144022.8599875574 155629.84682025388
- ll2 41.8717475659985 -90.28501351015758
-EPSG:6498
- ll 15.36444309748822 -85.07190958964765
- en 3915905.5012604645 -3007926.724311208
- ll2 15.364443097488222 -85.07190958964765
-EPSG:6499
- ll 26.480419143505607 -57.69648812205425
- en 2.2035934730340246E7 -4119818.6259692465
- ll2 26.480419143505618 -57.69648812205425
-EPSG:6500
- ll 4.911057026354985 -58.8440018846981
- en 5586385.7238979405 -3638232.985725927
- ll2 4.911057026355011 -58.844001884698095
-EPSG:6501
- ll 53.22715665008984 -31.13121048044769
- en 1.51298537207432E7 8600314.35685321
- ll2 53.22715665008985 -31.131210480447677
-EPSG:6502
- ll 21.08397962211005 -74.55515613736975
- en 2904060.114565652 -2566599.798350729
- ll2 21.083979622110053 -74.55515613736975
-EPSG:6503
- ll 67.02527268172275 -133.74360417912746
- en -3308401.175835832 9574439.483811734
- ll2 67.02527268172275 -133.74360417912746
-EPSG:6504
- ll 7.849416297910938 -52.58964547536797
- en 6053364.597329093 -2700188.686747379
- ll2 7.849416297910956 -52.58964547536797
-EPSG:6505
- ll -1.0318073884316252 -106.63461558618536
- en -3469067.149579816 -1.6908641037575588E7
- ll2 -1.0318073884315835 -106.63461558618536
-EPSG:6506
- ll 30.152274578142 -95.23484929097224
- en -317322.4405509551 89668.587549418
- ll2 30.152274575873996 -95.23484929391724
-EPSG:6507
- ll -76.68695589033882 -94.80929519792683
- en 480914.25104283856 -3.8671642491872214E7
- ll2 -76.6869558897258 -94.80929518912176
-EPSG:6508
- ll 84.57352575597514 -88.88869543073226
- en 509095.58632919285 7097684.076335683
- ll2 84.57352575597515 -88.88869543073226
-EPSG:6509
- ll 39.705618125626245 -89.22578823586453
- en 794978.7836468804 1132683.883859701
- ll2 39.705618125626124 -89.22578823586429
-EPSG:6510
- ll 76.78015877454612 -88.86664477138814
- en 2419455.780373242 1.7261006879959628E7
- ll2 76.780158774546 -88.86664477138817
-EPSG:6511
- ll 48.553306938382036 -96.02342844756465
- en 239924.305136226 1418806.6828521285
- ll2 48.55330693820385 -96.02342844759588
-EPSG:6512
- ll 73.55118388323837 -94.58740026125005
- en 120862.8686010336 4202323.948205196
- ll2 73.55118388312246 -94.58740026097475
-EPSG:6513
- ll 86.33380780316557 -89.78122216878414
- en 883661.7658716758 5589499.067666372
- ll2 86.33380780316297 -89.78122216990347
-EPSG:6514
- ll 53.16762568439705 -100.38720645884923
- en 1211355.2464505148 1028150.3489098012
- ll2 53.167625684397045 -100.38720645884923
-EPSG:6515
- ll -11.542272191329848 -123.88507233751324
- en -6173736.51876747 -2.3299325832337443E7
- ll2 -11.542272191329825 -123.88507233751324
-EPSG:6516
- ll 2.492509815060398 -151.74527037391687
- en -6182558.079350022 -2397880.900332521
- ll2 2.492509815060426 -151.74527037391687
-EPSG:6518
- ll 12.249481954265917 -120.80602814790184
- en 49317.12004487461 3511532.4020246915
- ll2 12.249481954219798 -120.8060281475905
-EPSG:6519
- ll -9.035065063255914 -115.64277983809882
- en 2009733.9459924828 3787196.4205026636
- ll2 -9.03506506325591 -115.64277983809913
-EPSG:6520
- ll -63.185041126639945 -121.55241983371236
- en -100201.46514801454 -2868756.3705721777
- ll2 -63.185041123519206 -121.55241982686746
-EPSG:6521
- ll -75.49594950963058 -118.30259909233449
- en 406761.1164645221 -1.387686888470862E7
- ll2 -75.49594950962322 -118.3025990923273
-EPSG:6522
- ll 63.2926665400357 -120.1392271299743
- en 721962.3180212231 7174777.215927368
- ll2 63.2926665400347 -120.13922712997437
-EPSG:6523
- ll -72.45370792617314 -125.41498748635836
- en 1871704.2422650568 -2.5923476937838364E7
- ll2 -72.45370792341872 -125.414987458399
-EPSG:6524
- ll -2.4027519916218836 -74.47331959431953
- en -12277.23157608736 -4973015.162942068
- ll2 -2.402751991620969 -74.47331959424744
-EPSG:6525
- ll -5.962855431090517 -71.7619883680434
- en 949624.789434788 -1.760613359633104E7
- ll2 -5.962855431090521 -71.7619883680434
-EPSG:6526
- ll 55.293638467605376 -72.74790322428098
- en 261286.3607306208 1831134.316088606
- ll2 55.29363846760263 -72.7479032242803
-EPSG:6527
- ll 86.20876693027344 -71.9131930925088
- en 554775.2399563626 1.731759903995479E7
- ll2 86.20876693027337 -71.91319309251374
-EPSG:6528
- ll -25.404415502106666 -103.83988385491273
- en 742520.2723245311 -6243392.906980201
- ll2 -25.404415502102612 -103.83988385490422
-EPSG:6529
- ll -24.546460665527846 -100.40965723260688
- en 3583804.9205165603 -2.0205820967834976E7
- ll2 -24.546460664686393 -100.4096572311277
-EPSG:6530
- ll -36.99855133517707 -110.51012999348396
- en -385062.6813509284 -7544523.124981899
- ll2 -36.99855133210306 -110.51012999460873
-EPSG:6531
- ll -87.94896611514393 -101.60182182435685
- en 577144.5838679253 -4.331655573959941E7
- ll2 -87.94896611514392 -101.60182182436498
-EPSG:6532
- ll 52.88676106497229 -109.34370726750575
- en 728344.2403942965 2431910.2304029064
- ll2 52.88676106497113 -109.3437072675062
-EPSG:6533
- ll -70.08749343881917 -113.68104980093348
- en 1994574.4294534947 -3.680913699919387E7
- ll2 -70.08749343729097 -113.68104979433164
-EPSG:6534
- ll -25.67205832461127 -71.21286041217789
- en 789626.6789169207 -7280555.64015315
- ll2 -25.672058324064665 -71.2128604111373
-EPSG:6535
- ll 48.24339991919919 -74.3213428062003
- en 1371358.5121296723 3013051.5328710647
- ll2 48.24339991918674 -74.32134280619474
-EPSG:6536
- ll 26.449264356590774 -70.78705561744941
- en 520426.60764497344 -1367904.246611045
- ll2 26.449264356529476 -70.78705561732221
-EPSG:6537
- ll 38.823084436796805 -68.12058873550168
- en 2310328.8890194083 59871.474851037005
- ll2 38.82308443262573 -68.12058873533579
-EPSG:6538
- ll 17.709219546441993 -44.676189590607194
- en 3591461.2071491745 -1999791.294035285
- ll2 17.709219546442 -44.67618959060718
-EPSG:6539
- ll 50.39559925419431 -135.11074767910134
- en -1.2337211661030816E7 8591360.322913388
- ll2 50.3955992541943 -135.11074767910134
-EPSG:6540
- ll 72.33281966624097 -71.59754229561861
- en 586235.3379533895 3613256.502032262
- ll2 72.33281966306278 -71.59754232977491
-EPSG:6541
- ll 45.123985475627876 -73.54603844976553
- en 2448454.7924543717 1907868.0677893513
- ll2 45.12398547424483 -73.54603844980414
-EPSG:6542
- ll 63.140477781338916 -63.0522425356466
- en 1535093.0788137368 3488513.479009517
- ll2 63.14047778133887 -63.052242535646606
-EPSG:6543
- ll -11.218526868340206 -0.985029963931197
- en 3.624605642902552E7 -4029733.3199892906
- ll2 -11.218526868340193 -0.9850299639311686
-EPSG:6544
- ll 37.960817246861914 -167.81190938831287
- en -4666788.826945152 1451289.4225213912
- ll2 37.960817246861986 -167.81190938831287
-EPSG:6545
- ll 30.769481011851923 -16.128464121758128
- en 2.4393393181752276E7 7682057.918947852
- ll2 30.76948101185192 -16.128464121758114
-EPSG:6546
- ll 24.326187029360035 -105.26394704781106
- en 81777.70139854576 -2412267.194130813
- ll2 24.326187029360042 -105.26394704781106
-EPSG:6547
- ll 30.25442421629343 -104.2260222139022
- en 746217.3513333352 -5663093.871275854
- ll2 30.25442421629343 -104.2260222139022
-EPSG:6548
- ll 76.06992322155034 -38.84492810807609
- en 2084858.152923179 4770965.187252685
- ll2 76.06992322155034 -38.8449281080761
-EPSG:6549
- ll 82.45481369900911 -43.7430931483825
- en 4879155.1848116405 1.8445598201582793E7
- ll2 82.45481369900911 -43.7430931483825
-EPSG:6550
- ll 52.89230214570564 -38.24202949099387
- en 3548246.730908369 2407243.1793393823
- ll2 52.89230214570565 -38.24202949099387
-EPSG:6551
- ll 25.62870205283196 -11.019260391724032
- en 2.372078902711559E7 4542720.882939778
- ll2 25.628702052831954 -11.019260391724032
-EPSG:6552
- ll -2.451857016375662 -168.46625389921098
- en -8248535.215928623 -1107183.0724894237
- ll2 -2.451857016375648 -168.46625389921098
-EPSG:6553
- ll 11.991906651131949 -179.80579741292163
- en -2.6165923538135126E7 3995434.252485884
- ll2 11.99190665113198 -179.8057974129216
-EPSG:6554
- ll -11.18104575627213 -140.18972125445862
- en -5439000.475652772 -4198033.801566554
- ll2 -11.181045756272104 -140.18972125445862
-EPSG:6555
- ll -6.278318489905683 -74.87526682688073
- en 1.2525116753112987E7 -1.4433992081261288E7
- ll2 -6.278318489905628 -74.87526682688073
-EPSG:6556
- ll 60.303608727394234 -66.90572645265475
- en 3281598.235344989 3064813.5726793925
- ll2 60.303608727394185 -66.90572645265475
-EPSG:6557
- ll -5.378867200842308 -103.03671432223818
- en 1.01336976351224E7 -1.8426031752124045E7
- ll2 -5.3788672008422775 -103.03671432223818
-EPSG:6558
- ll 45.73433004580985 -106.76996891718048
- en 3563455.332933925 320349.4513480967
- ll2 45.73433004580986 -106.76996891718048
-EPSG:6559
- ll 61.30279292514848 -121.37441571298314
- en 8041280.50367379 6525105.4644487575
- ll2 61.30279292514845 -121.37441571298314
-EPSG:6560
- ll -10.243779041765531 -71.10502500236812
- en 9062865.23718152 -4323781.743884394
- ll2 -10.243779041765498 -71.10502500236812
-EPSG:6561
- ll 59.82484662519421 -86.87954461733094
- en 1.1238489744070327E7 8006598.92460241
- ll2 59.824846625194176 -86.87954461733094
-EPSG:6562
- ll 43.639606641008896 -20.01505885509198
- en 4924288.800365389 1882964.8673194859
- ll2 43.63960664100892 -20.01505885509198
-EPSG:6563
- ll -4.984618843145615 -71.9425436599989
- en 4812909.207686075 -1.814620392064059E7
- ll2 -4.9846188431455545 -71.9425436599989
-EPSG:6564
- ll -7.891448879735558 -134.96614594787377
- en -7538468.495865385 -3137423.5274402807
- ll2 -7.8914488797355276 -134.96614594787377
-EPSG:6565
- ll 37.45589655607468 -14.324721480378003
- en 1.8859074894854315E7 5656149.2382946275
- ll2 37.45589655607479 -14.32472148037801
-EPSG:6566
- ll 61.008395156606454 -114.98009957641523
- en -3482057.8981126114 6049855.552981029
- ll2 61.008395156606404 -114.98009957641524
-EPSG:6567
- ll -16.364758310581635 -73.0402822942793
- en -64576.51329125016 -6360419.085606474
- ll2 -16.364758310581514 -73.04028229427828
-EPSG:6568
- ll 56.01737877139573 -64.72774791907564
- en 1712519.5130207192 5516321.626264419
- ll2 56.01737876273607 -64.72774793579461
-EPSG:6569
- ll 38.20658383512884 -41.46631667562988
- en 3998417.2391278194 1363663.5613900125
- ll2 38.206583835128946 -41.466316675629876
-EPSG:6570
- ll 86.9735983518171 -151.53670193266976
- en -1745813.4273138356 2.7498633219136663E7
- ll2 86.97359835181712 -151.53670193266976
-EPSG:6571
- ll 22.741318575462586 -138.96891245399095
- en -3525577.9439639337 -1385892.8687349001
- ll2 22.7413185754626 -138.96891245399095
-EPSG:6572
- ll 30.516545858859857 -142.02367032206195
- en -1.106320533970758E7 -1442289.4362245114
- ll2 30.51654585885985 -142.02367032206195
-EPSG:6573
- ll 64.00556552672916 -137.16922709775324
- en -1279331.5328940414 2890375.051748141
- ll2 64.00556552672913 -137.16922709775324
-EPSG:6574
- ll -12.275451374372345 -85.9500268469414
- en 9828777.002367485 -2.247253693878409E7
- ll2 -12.275451374372318 -85.9500268469414
-EPSG:6575
- ll 11.043183219776829 -164.6569812798013
- en -7802218.085207092 908556.6916319949
- ll2 11.043183219776866 -164.6569812798013
-EPSG:6576
- ll 31.704520579647934 -31.158891774410534
- en 1.818611506221781E7 3708901.145363757
- ll2 31.7045205796482 -31.158891774410527
-EPSG:6577
- ll -12.959738628093092 -143.12946909070342
- en -5297065.929027133 -1041034.2050112556
- ll2 -12.959738628093065 -143.12946909070342
-EPSG:6578
- ll 54.71091176858991 -179.11336950485233
- en -1.4571739999235984E7 2.5481861891785987E7
- ll2 54.71091176858992 -179.1133695048523
-EPSG:6579
- ll 79.34331772279438 -139.18867238167533
- en -628110.4529816303 1.2221973364456203E7
- ll2 79.3433177227944 -139.18867238167533
-EPSG:6580
- ll 79.42064865176084 -174.94727046650434
- en -1085548.100242075 1.3764352876107348E7
- ll2 79.42064865176083 -174.9472704665043
-EPSG:6581
- ll 72.09835466303448 -160.76259255704218
- en -2350322.9002167056 6403209.280723533
- ll2 72.09835466303448 -160.76259255704218
-EPSG:6582
- ll 82.81488788482079 -160.1986640951264
- en -4213608.049463414 2.603826599686846E7
- ll2 82.81488788482079 -160.1986640951264
-EPSG:6583
- ll 5.334143476922499 -174.93788383491454
- en -8043420.458427323 2259242.6739313686
- ll2 5.334143476922515 -174.93788383491454
-EPSG:6584
- ll -16.306049274832787 -55.812237249596976
- en 2.2693558205178913E7 -8912832.049548786
- ll2 -16.306049274832777 -55.812237249596976
-EPSG:6585
- ll 37.83437508006294 -108.39097137199401
- en -585981.4047408476 6391194.583462223
- ll2 37.83437508006302 -108.39097137199401
-EPSG:6586
- ll -14.173378045115307 -122.48144031645032
- en -9851642.70223611 1645268.277257351
- ll2 -14.17337804511526 -122.48144031645032
-EPSG:6587
- ll 9.553064927877116 -66.07357389788685
- en 4375586.679543775 2469260.34227165
- ll2 9.55306492787713 -66.07357389788683
-EPSG:6588
- ll 7.075239475194188 -90.28541788507039
- en 5358971.585061256 5513658.093339735
- ll2 7.075239475194216 -90.28541788507039
-EPSG:6589
- ll 10.222237610462429 -77.96975022184594
- en -100126.97494969086 -3571516.8187686196
- ll2 10.222237610207943 -77.96975021983732
-EPSG:6590
- ll 12.995151080234834 -77.35330582448337
- en -88817.80860691346 -1.0711448984408481E7
- ll2 12.99515108009901 -77.35330582380602
-EPSG:6591
- ll 2.6330004595433323 -133.83411253320867
- en -6808569.973700666 -1883807.0831921834
- ll2 2.633000459543366 -133.83411253320867
-EPSG:6592
- ll -18.62321153772166 -50.27203803540847
- en 8178219.82586229 -4631621.091940949
- ll2 -18.623211537721634 -50.272038035408464
-EPSG:6593
- ll 63.378444727288304 4.409678719741493
- en 2.4724260970166508E7 2.2697098703337073E7
- ll2 63.37844472728826 4.409678719741493
-EPSG:6594
- ll 22.324307186073995 -111.29614408305767
- en 79102.89454993466 29048.196908960934
- ll2 22.324307186074005 -111.29614408305767
-EPSG:6595
- ll 31.1594012445334 -115.81418015840597
- en 47804.16103792202 3683646.733166943
- ll2 31.159401244533402 -115.81418015840597
-EPSG:6596
- ll 75.22536488231562 -67.06561892952108
- en 2148082.6058377936 3891837.870259736
- ll2 75.22536488231563 -67.06561892952107
-EPSG:6597
- ll -4.98716003112267 -141.5198693537955
- en -9205366.947591819 -2.016594615837612E7
- ll2 -4.98716003112263 -141.5198693537955
-EPSG:6598
- ll 10.144912534301138 -104.20580306905794
- en 2621400.639521826 -3938810.0459109116
- ll2 10.144912534301152 -104.20580306905794
-EPSG:6599
- ll 79.82643948542076 -104.3687905035266
- en 2998918.679734298 1.3738715835578313E7
- ll2 79.82643948542079 -104.3687905035266
-EPSG:6600
- ll 80.12009774355725 -131.99671921516054
- en -846537.6430692957 5650731.472791063
- ll2 80.12009774355725 -131.99671921516054
-EPSG:6601
- ll 58.329547170979055 -137.54592086456634
- en -9077401.073587395 1.1066774363816092E7
- ll2 58.32954717097904 -137.54592086456634
-EPSG:6602
- ll 45.5235848591964 -146.67787989541517
- en -4152181.156048964 2706821.0620890716
- ll2 45.523584859196404 -146.67787989541517
-EPSG:6603
- ll 78.06163081132033 -50.49146627301346
- en 5305497.586749494 1.7301270602839008E7
- ll2 78.06163081132033 -50.491466273013444
-EPSG:6605
- ll 15.227221925408834 -128.4354544589243
- en -1.275080964905998E7 -7310053.916154844
- ll2 15.227221925408857 -128.4354544589243
-EPSG:6606
- ll 69.3678813730746 -31.206976716748528
- en 2936909.633829807 3686724.5069831144
- ll2 69.3678813730746 -31.206976716748528
-EPSG:6607
- ll 62.99780600933521 -103.37810992349199
- en -358066.7635814112 6806546.09690915
- ll2 62.99780600933521 -103.37810992349199
-EPSG:6608
- ll 4.879639303359529 -146.8993247987032
- en -6546762.187197573 -1885144.1544249298
- ll2 4.8796393033595615 -146.8993247987032
-EPSG:6609
- ll 45.52423754928556 -18.41897049891125
- en 1.8154110208013687E7 8692358.400593042
- ll2 45.524237549285566 -18.41897049891125
-EPSG:6610
- ll 27.450045491403557 -88.84533742561965
- en 634104.9594800554 -1443186.4236258804
- ll2 27.450045491403504 -88.84533742561945
-EPSG:6611
- ll -83.91896189777324 -98.52016944182212
- en 278463.1535540924 -1.3811492446488341E7
- ll2 -83.91896189770681 -98.52016946634033
-EPSG:6612
- ll -30.15832476569961 -107.32942221462355
- en -27414.18207682803 -2.5669897267686266E7
- ll2 -30.158324765696285 -107.32942221463101
-EPSG:6613
- ll -55.041209767764585 -101.40800947805022
- en 778541.1068489874 -1.0502270698002491E7
- ll2 -55.041209763756555 -101.40800948262871
-EPSG:6614
- ll 18.800341852760667 -100.40073320589474
- en 3714537.8066513264 -7516407.599715228
- ll2 18.800341850926305 -100.40073320627567
-EPSG:6615
- ll -35.21758095892128 -110.85063223463996
- en 730144.2690369418 -8283526.41003125
- ll2 -35.217580958921275 -110.85063223464
-EPSG:6616
- ll -58.36528835824889 -104.27122488848471
- en 3739806.8278259714 -3.56660384089335E7
- ll2 -58.36528835493083 -104.27122489302158
-EPSG:6617
- ll -18.53485635600947 -107.38009465012644
- en 744638.1652168606 -6535371.713430411
- ll2 -18.5348563560094 -107.38009465012676
-EPSG:6618
- ll 73.2249876559687 -103.0609220262381
- en 2569160.8279921617 1.198246974533828E7
- ll2 73.22498765511035 -103.06092203164246
-EPSG:6619
- ll 2.1897442233340243 -55.36575305244605
- en 7615383.799011987 13785.866131554125
- ll2 2.1897442233340683 -55.365753052446046
-EPSG:6620
- ll 44.598366728354755 -56.57075107142305
- en 4583349.677997084 2809318.2709314264
- ll2 44.59836672835478 -56.57075107142304
-EPSG:6621
- ll 64.11199712067524 -157.13390628506036
- en -1931402.223138885 6780690.14795183
- ll2 64.11199712067523 -157.13390628506036
-EPSG:6622
- ll 45.975405781057574 -112.15910966919753
- en -3177604.4663613955 1220588.7454908825
- ll2 45.97540578105769 -112.15910966919755
-EPSG:6623
- ll 70.01290766160184 64.12164395302113
- en 2841544.6431444604 6589078.089987221
- ll2 70.01290766160187 64.12164395302113
-EPSG:6624
- ll -85.74253169094067 30.67653651902927
- en 1.4103699558624886E7 2981811.371177858
- ll2 -85.74253169094087 30.676536519029273
-EPSG:6625
- ll 85.03026772804967 -125.3077737851232
- en 797373.2488009327 2.6807530519765712E7
- ll2 85.0302677280497 -125.3077737851232
-EPSG:6626
- ll -16.24983676149978 -134.71333352214452
- en -1.1155519513065625E7 -1.9246042130546723E7
- ll2 -16.249836761499758 -134.71333352214452
-EPSG:6627
- ll 17.598629992136168 -100.95963434188478
- en 5521912.665317139 2983455.989986285
- ll2 17.598629992136207 -100.95963434188478
-EPSG:6628
- ll -52.443448652808065 -150.60541482412384
- en 832703.5695736725 -7906920.88234812
- ll2 -52.44344865149563 -150.6054148246805
-EPSG:6629
- ll -16.031151665522742 -158.57199531948558
- en 296070.67247406393 -4023161.3846530886
- ll2 -16.03115166552229 -158.5719953194825
-EPSG:6630
- ll -12.843439077567936 -160.85466041203787
- en 190006.612765647 -3763600.416838158
- ll2 -12.843439077563433 -160.85466041199803
-EPSG:6631
- ll -6.44337987549001 -156.5916303325024
- en 821859.1451438314 -3128733.8081654985
- ll2 -6.443379875487122 -156.59163033257877
-EPSG:6632
- ll 45.44969181157555 -163.41837170768827
- en 245628.78504683363 2643176.939099604
- ll2 45.449691811473414 -163.41837170772965
-EPSG:6633
- ll -57.761839358350784 -155.6946707138604
- en 2090570.9972896243 -2.870248555622555E7
- ll2 -57.76183935833733 -155.69467071385938
-EPSG:6634
- ll -86.1926630804784 -152.56064696240975
- en 547639.1700762885 -9575558.71805227
- ll2 -86.19266308048203 -152.56064698100653
-EPSG:6635
- ll -32.33932692964951 -147.4252564079556
- en 1024972.2750327609 -3591736.8049189965
- ll2 -32.33932692846367 -147.42525640648674
-EPSG:6636
- ll 88.65115659858941 -166.7334809913733
- en 511202.80246068496 1.984778498459916E7
- ll2 88.6511565985895 -166.7334809918265
-EPSG:6637
- ll -36.58992880332497 143.1957133970127
- en -39094.03313787351 -5345155.688074787
- ll2 -36.58992880332419 143.19571339701125
-EPSG:6646
- ll 26.58102506640418 40.76539237670312
- en 228768.67814488348 -258012.4329196279
- ll2 26.58102506500186 40.76539238069488
-EPSG:6649
- ll 47.591476335959754 90.16216755883192
- en 90.16216755883191 47.591476336899056
- ll2 47.59147633595988 90.1621675588319
-EPSG:6650
- ll -6.709024730685101 -141.6703331022532
- en 425914.45095607167 -741633.3870663664
- ll2 -6.709024730685134 -141.67033310225318
-EPSG:6651
- ll 32.57408522453031 -134.03055100680893
- en 590996.3360509397 3604486.094863232
- ll2 32.574085224530286 -134.03055100680882
-EPSG:6652
- ll 68.33666676567285 -135.60770573814483
- en 228224.00105455564 7594985.556514073
- ll2 68.33666676191507 -135.60770571884126
-EPSG:6653
- ll 33.31955109050921 -119.35748136288352
- en 839128.2680669227 3692639.6115253745
- ll2 33.31955109040908 -119.35748136273365
-EPSG:6654
- ll 0.08556179380104822 -117.37522436957113
- en 458246.66793976055 9457.353254519405
- ll2 0.08556179380104825 -117.37522436957114
-EPSG:6655
- ll -49.85052169730222 -111.48193984211005
- en 465353.8786427376 -5522122.615198825
- ll2 -49.85052169730239 -111.48193984211005
-EPSG:6656
- ll 81.51092891364962 -98.6086665597652
- en 605123.8057999781 9056041.194020435
- ll2 81.51092891343148 -98.6086665766943
-EPSG:6657
- ll 87.93445488230995 -97.59890969082684
- en 505637.6102291647 9767418.170779023
- ll2 87.93445488231013 -97.59890969082686
-EPSG:6658
- ll -78.11652905504917 -89.83848497474311
- en 572642.3692524314 -8673336.092979476
- ll2 -78.11652905503945 -89.83848497477176
-EPSG:6659
- ll -17.75153891577368 -83.5759962303078
- en 863155.4315669736 -1966008.3290103928
- ll2 -17.751538915754864 -83.57599623033519
-EPSG:6660
- ll -42.130521268242475 -76.51091939661966
- en 871052.6787711112 -4674029.537905434
- ll2 -42.130521267624644 -76.51091939639309
-EPSG:6661
- ll -44.92494847250706 -71.82685833687093
- en 750418.8716056789 -4979512.582259424
- ll2 -44.92494847242043 -71.82685833683153
-EPSG:6662
- ll 54.061833142495004 -75.49318127922426
- en 75289.97641833965 6009921.442279949
- ll2 54.06183313554232 -75.49318126901082
-EPSG:6663
- ll 50.72012976458055 -57.53837101400947
- en 885425.2351558502 5632942.065735617
- ll2 50.720129762074606 -57.5383710154378
-EPSG:6664
- ll -74.44952302370704 -59.83376825639138
- en 415230.4913837552 -8264209.571743098
- ll2 -74.44952302369676 -59.83376825638111
-EPSG:6665
- ll -35.523631914039846 -47.46886624684374
- en 820221.9965413606 -3936852.100992436
- ll2 -35.52363191394124 -47.468866246720815
-EPSG:6668
- ll -6.2885280802797325 -111.39854661338201
- en -111.39854661338201 -6.2885280802797325
- ll2 -6.2885280802797325 -111.39854661338201
-EPSG:6669
- ll 39.00800290825606 129.15075042507956
- en -30247.840585414848 666635.7511262938
- ll2 39.00800290825607 129.15075042507956
-EPSG:6670
- ll 21.65798566663635 131.1820963803263
- en 18846.556151789035 -1256681.3850257995
- ll2 21.65798566663635 131.1820963803263
-EPSG:6671
- ll 4.9112058251188415 129.8709200105815
- en -254671.46448570484 -3441695.079137108
- ll2 4.9112058251183255 129.87092001060483
-EPSG:6672
- ll 24.60757506903434 131.5528714668327
- en -197187.76796604425 -928674.2059602791
- ll2 24.607575069033302 131.55287146683062
-EPSG:6673
- ll -81.54601960447702 129.75085062326477
- en -75157.79534467502 -1.3044988853882598E7
- ll2 -81.54601960444118 129.75085062410187
-EPSG:6674
- ll 25.1631401831756 135.2044322841642
- en -80199.8975125169 -1201059.8927426245
- ll2 25.1631401831756 135.20443228416417
-EPSG:6675
- ll 1.1108541167704828 138.54260872256742
- en 153140.0688879286 -3862288.701289028
- ll2 1.1108541167704764 138.5426087225656
-EPSG:6676
- ll -22.49357611499579 131.94004608056156
- en -676009.893238947 -6488201.240927981
- ll2 -22.49357611347256 131.94004607864937
-EPSG:6677
- ll 46.181531736290395 141.750607413616
- en 148016.02726928008 1132395.2208865418
- ll2 46.18153173628599 141.75060741361892
-EPSG:6678
- ll -54.62916984695047 136.5576485468276
- en -276024.2877050423 -1.0492834615957474E7
- ll2 -54.62916984637288 136.557648547002
-EPSG:6679
- ll -46.481064747576944 137.60825667555775
- en -202833.53938898584 -1.0025771188114883E7
- ll2 -46.48106474754665 137.60825667554363
-EPSG:6680
- ll -42.278481673250255 145.63329716238056
- en 279070.96741605457 -9560982.650240071
- ll2 -42.27848167313565 145.63329716244954
-EPSG:6681
- ll 72.19090574674325 146.0740931542105
- en 62278.80425746364 3140239.645974814
- ll2 72.19090574674215 146.07409315421032
-EPSG:6682
- ll -40.290206650676964 143.43573035249688
- en 122071.86633838547 -7338842.689894193
- ll2 -40.29020665067636 143.43573035249779
-EPSG:6683
- ll -41.23879964549967 125.69774874051801
- en -151072.35296081594 -7444750.194201156
- ll2 -41.23879964549716 125.69774874051518
-EPSG:6684
- ll 73.54143080388468 119.98547292970711
- en -126906.85073317993 5291047.745688748
- ll2 73.54143080378037 119.98547292994122
-EPSG:6685
- ll -78.20080066157871 124.39167155227562
- en -150587.71280957962 -1.1568442276221221E7
- ll2 -78.20080066082805 124.39167157451313
-EPSG:6686
- ll -14.896144914128456 140.75957198348223
- en 512604.56212019385 -3864960.907243938
- ll2 -14.896144913996876 140.75957198307552
-EPSG:6687
- ll -38.78592399522906 151.26754885048018
- en -237409.850174118 -7174403.751455089
- ll2 -38.78592399520264 151.26754885045216
-EPSG:6688
- ll 85.46439554904148 125.46816768895015
- en 521784.5070144902 9492046.368171167
- ll2 85.46439554904136 125.46816768894693
-EPSG:6689
- ll -43.9419212584044 130.0902753703452
- en 587497.2860288011 -4865999.919071132
- ll2 -43.94192125840427 130.0902753703454
-EPSG:6690
- ll 1.6821682640618434 141.69174006448966
- en 1246010.8410324864 187213.96005919768
- ll2 1.6821682638662343 141.69174005302222
-EPSG:6691
- ll -79.44523547317284 145.4003441270152
- en 589900.4672072713 -8823062.245455174
- ll2 -79.44523547311874 145.40034412644442
-EPSG:6692
- ll -61.23147677120083 146.46799944263697
- en 471436.14600281324 -6788686.971548306
- ll2 -61.231476771200825 146.46799944263697
-EPSG:6696
- ll -51.287878381346836 16.056627611051198
- en 16.056627611051198 -51.28787838226721
- ll2 -51.28787838134704 16.056627611051198
-EPSG:6697
- ll -22.15997035536583 68.27197329362687
- en 68.27197329362687 -22.15997035536583
- ll2 -22.15997035536583 68.27197329362687
-EPSG:6700
- ll 57.31254202634804 41.57845202926603
- en 41.570541372391574 57.310414739183024
- ll2 57.31254202548012 41.57845202604273
-EPSG:6703
- ll 50.995132087580316 -64.5109825199385
- en 183500.96689208876 1.5658974533882711E7
- ll2 50.99513208677675 -64.51098251977135
-EPSG:6706
- ll -51.24981309716597 42.06854076925816
- en 42.06854076925816 -51.24981309808662
- ll2 -51.24981309716619 42.06854076925816
-EPSG:6707
- ll 72.13164494324377 9.534442874195774
- en 518302.6379429123 8003697.736525949
- ll2 72.13164494324472 9.534442874195774
-EPSG:6708
- ll -12.15357044339072 9.005085737443228
- en -153323.58379080833 -1350750.5006468766
- ll2 -12.153570442859813 9.005085740203533
-EPSG:6709
- ll -85.6468480963907 14.440921555599848
- en 444535.4391618421 -9515117.079861417
- ll2 -85.64684809638806 14.44092157752792
-EPSG:6720
- ll 78.70154323501907 108.52245969948065
- en 113373.64407196348 1.0041941659576098E7
- ll2 78.70154323501359 108.5224596994675
-EPSG:6721
- ll 45.08197648770857 106.2007830248378
- en 95335.02479262509 6294341.49383435
- ll2 45.081976487708666 106.20078302483779
-EPSG:6722
- ll 72.50493167449613 95.17826064687902
- en -6948.711222477221 9449278.540337674
- ll2 72.50493167449544 95.17826064687911
-EPSG:6723
- ll 25.552350811404565 91.56778807966576
- en -483822.7403418649 4337909.08843424
- ll2 25.55235081090074 91.56778807870353
-EPSG:6736
- ll -70.38968460310981 86.4403957914052
- en 254708.73645537338 2177424.708473482
- ll2 -70.389684600237 86.44039581014397
-EPSG:6737
- ll 47.486484183271244 98.30177635325171
- en 447400.9990082821 1.5259463886696294E7
- ll2 47.48648418327137 98.30177635325171
-EPSG:6738
- ll -51.39643562214007 174.21215714147854
- en 723443.744648092 4301191.422892893
- ll2 -51.39643562203473 174.2121571414905
-EPSG:6783
- ll 69.14952555970396 -135.30965743390556
- en -135.30965743390556 69.14952555970396
- ll2 69.14952555970396 -135.30965743390556
-EPSG:6784
- ll 38.92956412269142 -123.65567650673893
- en -465132.97263695294 -602637.0512242164
- ll2 38.929564120242205 -123.65567650738802
-EPSG:6785
- ll 71.82557261366361 -116.85868108259
- en 242613.10787926125 9987028.143006714
- ll2 71.82557261366358 -116.85868108259
-EPSG:6786
- ll 37.526031437791175 -119.39283712768376
- en -97878.42093142206 -773470.41985886
- ll2 37.52603143779034 -119.39283712768524
-EPSG:6787
- ll 34.02302418647473 -122.11534713949379
- en -1166955.7994563517 -3789597.592522726
- ll2 34.02302418619515 -122.11534713985517
-EPSG:6788
- ll 79.58209550741492 -122.85528419596832
- en 57675.60916203495 4215662.819202702
- ll2 79.58209550741492 -122.85528419596832
-EPSG:6789
- ll -14.026532796775513 -119.77111225744024
- en 964052.2304617023 -2.026666902370002E7
- ll2 -14.02653279677501 -119.7711122574455
-EPSG:6790
- ll -31.060166764520623 -122.05935949872716
- en 50467.442829413805 -8063167.614524504
- ll2 -31.060166764520623 -122.05935949872716
-EPSG:6791
- ll 49.61835331485446 -128.5818894213787
- en -1356934.4245100091 2943470.0216861344
- ll2 49.618353305568064 -128.58188940921434
-EPSG:6792
- ll 55.78401226228637 -144.35104407022007
- en -1379587.7961009915 1583255.4202285674
- ll2 55.78401226228643 -144.35104407022007
-EPSG:6793
- ll -10.886410338823953 -78.84784069290725
- en 2.24473867631003E7 -1.708993354351425E7
- ll2 -10.886410338823918 -78.84784069290725
-EPSG:6794
- ll 51.97552711428948 -136.4450044406895
- en -967097.3220056146 1042990.2223852731
- ll2 51.97552711428949 -136.4450044406895
-EPSG:6795
- ll 47.488433091246954 -106.89866930486814
- en 3797215.011210746 1768087.489562124
- ll2 47.48843309124697 -106.89866930486814
-EPSG:6796
- ll 79.69178538969608 -81.81620550018735
- en 1129814.938162411 4701191.130523902
- ll2 79.69178538969608 -81.81620550018737
-EPSG:6797
- ll 9.338459070608955 -122.02903216911196
- en -571849.9147353006 -1.2988557746604206E7
- ll2 9.33845907060898 -122.02903216911196
-EPSG:6798
- ll 30.733172806208678 -81.54494125055264
- en 3737348.2549919877 -539625.8092113449
- ll2 30.733172806208675 -81.54494125055264
-EPSG:6799
- ll 31.407364401696448 -42.46510959612536
- en 2.162591767971606E7 6369119.899874128
- ll2 31.407364401696437 -42.46510959612536
-EPSG:6800
- ll 24.313553659855685 -119.21836122184723
- en 457953.3262957554 -2011112.4581829126
- ll2 24.3135536597604 -119.21836122166488
-EPSG:6801
- ll -57.01416144493798 -118.57798321769792
- en 1078636.0733390937 -3.621883137953925E7
- ll2 -57.01416144389332 -118.577983218341
-EPSG:6802
- ll 8.922385024516487 -128.9126692318939
- en -574597.0564114864 -3716118.281327614
- ll2 8.92238502425357 -128.91266922931908
-EPSG:6803
- ll 64.63499378531708 -117.87014700340963
- en 987557.8105083047 8119740.171213293
- ll2 64.63499378363409 -117.87014700659863
-EPSG:6804
- ll 15.952847284695814 -157.78775138635862
- en -4193548.5852645207 -2374767.990263613
- ll2 15.952847284695824 -157.78775138635862
-EPSG:6805
- ll -10.058723704475767 -142.20167803936008
- en -1.1277064431244506E7 -2.1794567005184866E7
- ll2 -10.058723704475737 -142.20167803936008
-EPSG:6806
- ll 77.94966138025211 -80.65723856888938
- en 1284898.0743241454 4181849.693293345
- ll2 77.94966138025212 -80.65723856888937
-EPSG:6807
- ll 39.413505942495256 -125.99077745452023
- en -1066990.6505111163 -2131491.060556819
- ll2 39.41350594249533 -125.99077745452023
-EPSG:6808
- ll 45.56395312226476 -121.68585054982273
- en 270891.36756911036 147314.13109662523
- ll2 45.563953122264714 -121.68585054982275
-EPSG:6809
- ll 46.830457317186834 -124.59062249681173
- en 154007.05684750984 946402.3002749813
- ll2 46.83045731718676 -124.59062249681173
-EPSG:6810
- ll 46.43708571908774 -122.23066912748276
- en 227426.21650165226 243807.7577916719
- ll2 46.43708571908767 -122.23066912748277
-EPSG:6811
- ll 45.71589604489592 -123.27750590716711
- en 481279.6521524341 536076.5262081573
- ll2 45.71589604489584 -123.27750590716711
-EPSG:6812
- ll -12.809923579443065 -124.61773044024015
- en -89456.59360923604 -6161375.719777915
- ll2 -12.809923579443032 -124.61773044023946
-EPSG:6813
- ll -37.06426347408818 -120.87405144959418
- en 881706.0286192823 -2.903832499245256E7
- ll2 -37.06426347407561 -120.87405144957751
-EPSG:6814
- ll -30.64502436433532 -121.50063156902
- en 225694.37094277138 -8137443.849740959
- ll2 -30.64502436433404 -121.5006315690169
-EPSG:6815
- ll 14.745145305402815 -119.52084577008596
- en 1511783.6464712212 -1.0203423367393877E7
- ll2 14.745145305371581 -119.52084577021434
-EPSG:6816
- ll -8.16708591576257 -120.37214603994957
- en 149197.15719791828 -5833207.15480912
- ll2 -8.16708591576257 -120.3721460399496
-EPSG:6817
- ll 20.75513296627652 -115.8180180472792
- en 2034977.8700863456 -8612303.069479635
- ll2 20.755132965967437 -115.81801804698026
-EPSG:6818
- ll -69.71923062845332 -124.95254645339647
- en -72887.36928509729 -1.2673381306772068E7
- ll2 -69.71923062829718 -124.95254645320485
-EPSG:6819
- ll 28.432746999585177 -118.55507731169554
- en 1048510.3775922111 -5842330.03796896
- ll2 28.432746999579283 -118.55507731168234
-EPSG:6820
- ll 53.714500151729595 -117.41008892746896
- en 429883.96872031054 1123515.993733745
- ll2 53.71450014830439 -117.41008893065734
-EPSG:6821
- ll 5.133683618805108 -122.50152595917217
- en 406006.67462790554 -1.4036752658751462E7
- ll2 5.133683618805109 -122.50152595917221
-EPSG:6822
- ll 52.06158770672451 -121.46558610405039
- en 166664.02884693883 925531.2654753795
- ll2 52.06158770672216 -121.46558610404948
-EPSG:6823
- ll 4.7427095877286405 -124.99172428144296
- en -500362.6424603918 -1.4177852074628655E7
- ll2 4.742709587728522 -124.99172428143581
-EPSG:6824
- ll -21.295892494817707 -120.72171488752772
- en 321073.50677475025 -6982251.881765378
- ll2 -21.29589249481313 -120.7217148875248
-EPSG:6825
- ll 32.29264286468457 -122.4072482109196
- en 450246.0715027513 -3442369.4757978157
- ll2 32.292642864684545 -122.4072482109195
-EPSG:6826
- ll -61.36867358362594 -119.51684600015606
- en 254029.99164446845 -1.1436903875389094E7
- ll2 -61.36867358338574 -119.51684600026043
-EPSG:6827
- ll 10.131056469690137 -123.40828628836113
- en 137090.4348365672 -1.149497413946122E7
- ll2 10.131056469690146 -123.40828628836113
-EPSG:6828
- ll -75.32560101065756 -116.28481640663529
- en 180837.03476078104 -1.335762530593836E7
- ll2 -75.3256010097978 -116.2848164162988
-EPSG:6829
- ll -37.7864207341912 -120.85350744427043
- en 460508.4351649326 -3.0086044490621418E7
- ll2 -37.7864207341906 -120.85350744426933
-EPSG:6830
- ll 18.961544014925607 -119.39621365203327
- en 319449.3179094614 -2885098.5738087962
- ll2 18.961544014917756 -119.3962136520398
-EPSG:6831
- ll -82.07495618483382 -123.74822150650883
- en -38671.131817010624 -4.62688937394701E7
- ll2 -82.0749561848338 -123.7482215065088
-EPSG:6832
- ll -69.7892209438667 -118.4300445957709
- en 23410.307933808264 -1.2732123827718697E7
- ll2 -69.7892209438667 -118.4300445957709
-EPSG:6833
- ll 51.46434278147555 -121.94021774336538
- en -767098.3302364793 2382755.7596005234
- ll2 51.46434278111679 -121.94021774334357
-EPSG:6834
- ll -20.231803255442756 -122.11046784646038
- en -389853.6247861774 -7229250.198368815
- ll2 -20.231803255373382 -122.11046784650375
-EPSG:6835
- ll -54.72365926544808 -119.97471277424505
- en -286237.5918659343 -3.626850155035925E7
- ll2 -54.723659265442436 -119.97471277424631
-EPSG:6836
- ll 8.403357177857487 -122.24157523563561
- en -498101.6025889539 -3857745.49684792
- ll2 8.403357177692609 -122.24157523379336
-EPSG:6837
- ll -37.726346192899804 -113.02440955249304
- en 1412682.9253552544 -2.9448700174975332E7
- ll2 -37.72634619266597 -113.02440955228089
-EPSG:6838
- ll -32.21072296865506 -121.71735646835741
- en -364998.3309423141 -8366326.760411647
- ll2 -32.21072296822325 -121.71735646898402
-EPSG:6839
- ll 87.66370660454749 -123.96104878101747
- en 158726.42161959413 1.6249803983048875E7
- ll2 87.66370660458031 -123.96104874319191
-EPSG:6840
- ll 44.65134268332632 -124.08199177228094
- en 132205.63099228486 358176.1400164105
- ll2 44.651342683326234 -124.08199177228094
-EPSG:6841
- ll 44.845425174182616 -124.41872351084896
- en 346432.33898242295 1246094.359471108
- ll2 44.84542517418252 -124.41872351084898
-EPSG:6842
- ll 43.00511026892997 -123.98862474357405
- en 139744.9463912138 175265.9795977855
- ll2 43.00511026892985 -123.98862474357405
-EPSG:6843
- ll 42.90185212395724 -124.01047790409602
- en 452651.1225907067 537381.1836737535
- ll2 42.90185212395714 -124.010477904096
-EPSG:6844
- ll 3.2840996801667615 -121.59910749825579
- en -210429.78279112844 -4649467.227748091
- ll2 3.28409968016626 -121.59910749822265
-EPSG:6845
- ll -25.712025122442995 -124.43832354377577
- en -1540548.4602940013 -2.581562247152684E7
- ll2 -25.71202512195369 -124.43832354471543
-EPSG:6846
- ll -51.488328787167546 -118.08829652521621
- en 134904.08647056195 -1.072017562479932E7
- ll2 -51.4883287871674 -118.08829652521611
-EPSG:6847
- ll -54.72852141781964 -122.23467453181883
- en -451559.5261152882 -3.636665779757793E7
- ll2 -54.72852141774052 -122.23467453182039
-EPSG:6848
- ll -78.50779668716507 -112.63115384434822
- en 156704.74588124373 -1.3721317600470798E7
- ll2 -78.50779668685661 -112.63115385022262
-EPSG:6849
- ll 33.4387716636398 -121.40946592914239
- en -840379.243144748 -4228296.8944467595
- ll2 33.438771663603156 -121.40946592920075
-EPSG:6850
- ll -44.17789923429507 -121.69689261347412
- en -239022.58729211474 -9895031.467776082
- ll2 -44.177899234175364 -121.69689261352987
-EPSG:6851
- ll -61.66799470734344 -119.09298870844329
- en -33607.18736968579 -3.883347287262508E7
- ll2 -61.667994707343404 -119.09298870844329
-EPSG:6852
- ll -2.763879480578405 -172.98242934804367
- en -7069670.138000696 -3602159.039155338
- ll2 -2.7638794805783657 -172.98242934804367
-EPSG:6853
- ll 45.712875707170774 -81.21127005419123
- en 1.0472881686850589E7 2924643.822405026
- ll2 45.71287570717079 -81.21127005419122
-EPSG:6854
- ll 73.15050720697293 -134.5155933384675
- en -344439.91440849664 3315771.119220968
- ll2 73.15050720697292 -134.5155933384675
-EPSG:6855
- ll 87.59588623342422 -40.275757360217966
- en 2449499.498002461 1.9479243302356824E7
- ll2 87.59588623342418 -40.27575736021792
-EPSG:6856
- ll 52.85440991178004 -129.47025212204957
- en -380003.14543389005 966705.4331523703
- ll2 52.854409905424745 -129.47025211394336
-EPSG:6857
- ll -27.15016042547537 -121.83728539866149
- en 569286.781309711 -2.5970543820291366E7
- ll2 -27.150160425475278 -121.83728539866121
-EPSG:6858
- ll -66.12433748735532 -120.17525412724689
- en 181360.74990937917 -1.2250736432355858E7
- ll2 -66.12433748732042 -120.17525412725728
-EPSG:6859
- ll -21.725355896941025 -122.74679823103457
- en 278275.4221528855 -2.3997248787085664E7
- ll2 -21.725355896941025 -122.74679823103457
-EPSG:6860
- ll -88.32119837460621 -126.70640167670587
- en -13754.082786972343 -1.4700319038469514E7
- ll2 -88.32119837460624 -126.70640167630737
-EPSG:6861
- ll -49.44274710450432 -128.97002546942468
- en -1539142.8373564328 -3.4067320462687425E7
- ll2 -49.44274709777004 -128.97002546241947
-EPSG:6862
- ll -56.80745603483246 -118.19827691489357
- en 262715.49937743373 -1.1191546771645043E7
- ll2 -56.80745603425558 -118.19827691513086
-EPSG:6863
- ll -46.787374895377205 -124.70841456682976
- en -553319.9662454532 -3.304009609976948E7
- ll2 -46.78737489536677 -124.70841456683544
-EPSG:6867
- ll 74.49823432323558 -147.85906184335693
- en -574947.1833235831 4017025.0874365196
- ll2 74.49823432323558 -147.85906184335693
-EPSG:6868
- ll -5.507229403994444 -153.71824213489347
- en -1.5162824258847807E7 -1.6053917319308566E7
- ll2 -5.507229403994397 -153.7182421348935
-EPSG:6870
- ll 39.86461498128014 20.270674086956785
- en 523159.5028562024 4414531.845014519
- ll2 39.86461498128016 20.270674086956788
-EPSG:6875
- ll 6.093472100379913 17.36060175915712
- en 7593352.636250239 675748.9615547056
- ll2 6.093472100233473 17.360601756696713
-EPSG:6876
- ll -59.557996620654194 15.513978986489922
- en 3198629.0480859727 -6610083.692313444
- ll2 -59.55799662049641 15.51397898644982
-EPSG:6879
- ll 51.04631370064378 -116.87530065783551
- en -1261548.1139546046 1114148.8189603896
- ll2 51.04631370064376 -116.87530065783551
-EPSG:6880
- ll 10.110527893337157 -107.9648683997631
- en -1637446.917477446 -1.1197245803382708E7
- ll2 10.110527893337157 -107.9648683997631
-EPSG:6881
- ll -8.367130169715324 117.2034624866132
- en 117.20242615507958 -8.3702116185801
- ll2 -8.367130120109895 117.20346250318671
-EPSG:6882
- ll -52.49727017324805 -122.18865702156484
- en -122.18649420934244 -52.50258544094294
- ll2 -52.49726995892867 -122.18865710854456
-EPSG:6883
- ll 1.1573359147207896 132.46266257460917
- en 132.4604376376248 1.15382975100681
- ll2 1.1573357285773342 132.46266245727668
-EPSG:6884
- ll 10.603190585548447 -112.5715661474215
- en 3519256.4724190217 -3835256.6550936783
- ll2 10.603190585548482 -112.5715661474215
-EPSG:6885
- ll 24.237196271909816 -123.78895197272846
- en 7037565.641676524 -7206913.357718663
- ll2 24.23719627190983 -123.78895197272846
-EPSG:6886
- ll 75.7553001975717 -145.53759236259265
- en 641964.1598454764 4192284.472132236
- ll2 75.75530019757169 -145.53759236259265
-EPSG:6887
- ll 20.10995853649176 -159.49314592492726
- en -8971388.36891402 -4761944.348510992
- ll2 20.109958536491774 -159.49314592492726
-EPSG:6892
- ll 37.89359915345621 56.48445592403522
- en 56.48517042259178 37.897589414939205
- ll2 37.89359895191451 56.48445588809986
-EPSG:6894
- ll 12.203106779764582 -4.898401963008666
- en -4.8999639448885315 12.202624941045741
- ll2 12.203106775230681 -4.898401977612411
-EPSG:6915
- ll 59.24239639823335 58.76085253830417
- en 600499.5144249296 6568369.10145626
- ll2 59.24239620619542 58.76085246694131
-EPSG:6917
- ll 37.58486393756587 -139.86744106919747
- en -139.86744106919747 37.58486393756587
- ll2 37.58486393756587 -139.86744106919747
-EPSG:6922
- ll -3.842706437067264 -85.98914726314806
- en 2145310.03011474 -4718640.504147083
- ll2 -3.8427064370672346 -85.98914726314806
-EPSG:6923
- ll 62.54525833772834 -72.67814579625158
- en 6047074.7801715555 1.0646558164675215E7
- ll2 62.5452583377283 -72.67814579625158
-EPSG:6924
- ll 58.41838361058974 -115.11095242994057
- en -649844.2667672578 2638450.448700941
- ll2 58.41838361058973 -115.11095242994057
-EPSG:6925
- ll 44.562134121603194 -138.4277923256524
- en -8887325.590238895 5385628.476638089
- ll2 44.562134121603236 -138.4277923256524
-EPSG:6927
- ll 21.722660788007403 98.62220473909697
- en -511694.6328233618 2299818.3212650786
- ll2 21.722660787667138 98.62220473865086
-EPSG:6931
- ll 84.17356525365668 -157.7611405916218
- en -246184.2838840614 602088.5698352744
- ll2 84.1735652497907 -157.7611405916218
-EPSG:6932
- ll -63.291400053231484 119.06176433046807
- en 2582260.389760217 -1435011.4388527912
- ll2 -63.29140004992049 119.06176433046805
-EPSG:6956
- ll -57.90785070463407 100.59998171742116
- en -83184.38167124125 -5921178.509116087
- ll2 -57.90785069640833 100.59998166871743
-EPSG:6957
- ll 3.82414828420913 104.20454338553567
- en -88543.72958832112 922969.2003033648
- ll2 3.824148284710846 104.20454338466665
-EPSG:6958
- ll 6.14553736324018 107.80825932713039
- en -21415.415473985347 1179613.3582917207
- ll2 6.145537364987468 107.80825932414368
-EPSG:6959
- ll 69.48395579467103 111.9046685134209
- en 162247.07672525482 8216218.102444648
- ll2 69.48395578532748 111.90466858276876
-EPSG:6962
- ll 2.9616361328601855 44.57320970609966
- en 3292248.760035777 -4045932.7158946353
- ll2 2.9616361328602068 44.573209706099675
-EPSG:6980
- ll 27.4831611009116 76.3089512220597
- en 76.3089512220597 27.483161100911605
- ll2 27.483161100911605 76.3089512220597
-EPSG:6983
- ll 33.30717396181798 98.60415893188372
- en 98.60415893188372 33.30717396181798
- ll2 33.30717396181798 98.60415893188372
-EPSG:6984
- ll -57.68873345385306 41.95891931650901
- en 621998.1284601851 -9302261.328879608
- ll2 -57.68873344565411 41.9589192989667
-EPSG:6987
- ll -31.26156324862974 74.88654360921146
- en 74.88654360921146 -31.261563248629738
- ll2 -31.26156324862974 74.88654360921146
-EPSG:6990
- ll 36.80628344662061 50.648014373538786
- en 50.648014373538786 36.80628344662061
- ll2 36.80628344662061 50.64801437353879
-EPSG:6991
- ll -29.283849022095836 29.043599380014136
- en -379745.9817121773 -6142067.850962174
- ll2 -29.283849020413673 29.0435993775029
-EPSG:7005
- ll -13.717023355966148 45.73003582732539
- en 1229091.272030523 -1526941.1443146132
- ll2 -13.717023185572952 45.730035850045596
-EPSG:7006
- ll 76.66505526419118 45.0800342366532
- en 501991.85466057446 8509001.91639676
- ll2 76.6650552428296 45.08003420369899
-EPSG:7007
- ll 61.29283466195861 53.89553024744499
- en 655031.8445200035 6798441.06956629
- ll2 61.29283465514474 53.895530233445015
-EPSG:7035
- ll 72.60220952476308 127.78197620493864
- en 127.78197620493866 72.60220952476308
- ll2 72.60220952476308 127.78197620493866
-EPSG:7037
- ll -74.64847777356124 98.40926448590369
- en 98.40926448590369 -74.64847777356124
- ll2 -74.64847777356124 98.40926448590369
-EPSG:7039
- ll -49.98701528590978 15.202691071218567
- en 15.202691071218569 -49.98701528590977
- ll2 -49.98701528590977 15.202691071218567
-EPSG:7041
- ll -66.13017862718904 -145.6663235937155
- en -145.6663235937155 -66.13017862718904
- ll2 -66.13017862718904 -145.6663235937155
-EPSG:7057
- ll 15.208674139364092 -117.83176373802814
- en 2734705.1265459578 223465.26507840594
- ll2 15.208674139364101 -117.83176373802814
-EPSG:7058
- ll 79.170848886598 -121.62714082250795
- en 9825124.831858536 2.469760232475355E7
- ll2 79.170848886598 -121.62714082250795
-EPSG:7059
- ll -50.80969772368508 -92.57794478909408
- en 1.318134843221895E7 -2.4801842976090122E7
- ll2 -50.80969772368442 -92.57794478909445
-EPSG:7060
- ll 66.23219908744555 -119.23934582521953
- en 1.05529879621703E7 1.8119829514607433E7
- ll2 66.23219908744555 -119.23934582521953
-EPSG:7061
- ll 27.372714985004144 -174.95225785679125
- en -8033926.034780912 1.5797763473088188E7
- ll2 27.372714985004144 -174.95225785679128
-EPSG:7062
- ll -42.84423611733005 -89.97250701445877
- en 1.8045294175730422E7 -2.3646636385961223E7
- ll2 -42.84423611451685 -89.97250701478043
-EPSG:7063
- ll 15.910103730583373 -90.19860117181399
- en 1.9059406118634358E7 -2034183.236568553
- ll2 15.910103730495834 -90.19860117201976
-EPSG:7064
- ll 10.85392464268378 -99.53222796262773
- en 1.641035861895225E7 -3665941.103106226
- ll2 10.853924642282633 -99.53222795990658
-EPSG:7065
- ll 29.293501925866977 -96.49918328231787
- en 1.832565505064048E7 3230560.803264403
- ll2 29.293501925791467 -96.4991832824651
-EPSG:7066
- ll 29.85726189751452 -174.5842920256359
- en -2358410.953591073 1.5585982786068879E7
- ll2 29.857261897514526 -174.5842920256359
-EPSG:7067
- ll 24.36435752913637 -96.73448502962967
- en 1.9433000808128834E7 1866453.1884065082
- ll2 24.36435752793223 -96.73448503162126
-EPSG:7068
- ll 64.50357302237997 -149.6976430823845
- en 1.3379473742456434E7 1.8117281606609438E7
- ll2 64.50357302237995 -149.6976430823845
-EPSG:7069
- ll -16.159489602288417 -85.46610814937827
- en 2.5767507958641253E7 -1.4123470825291445E7
- ll2 -16.159489601255437 -85.46610815112093
-EPSG:7070
- ll -63.87211822216978 -96.54143637892355
- en 2.364737702531699E7 -3.1706351659963522E7
- ll2 -63.87211822070406 -96.54143637658449
-EPSG:7073
- ll 41.580287707707356 43.62420507792913
- en 43.62420507792913 41.580287707707356
- ll2 41.580287707707356 43.62420507792913
-EPSG:7074
- ll 40.75082415732089 37.99304733972756
- en 414994.9590642384 1.4511584404006457E7
- ll2 40.75082415732082 37.99304733972742
-EPSG:7075
- ll -13.00548361153443 42.557210684733846
- en 235033.78037012828 8560986.163376449
- ll2 -13.005483611532714 42.55721068475139
-EPSG:7076
- ll -34.778569732949585 54.194345661559915
- en 792325.6965451667 6146861.250068235
- ll2 -34.7785697328985 54.19434566163166
-EPSG:7077
- ll -80.41216523965768 56.64683758358321
- en 493433.16010635893 1072389.7266220916
- ll2 -80.41216523965767 56.64683758358321
-EPSG:7078
- ll 14.138662204135244 64.96098689448696
- en 711677.5514123858 1.1563946840871619E7
- ll2 14.138662204134768 64.96098689448203
-EPSG:7079
- ll 23.86118486932449 69.74050584634753
- en 575399.6365775318 1.2639055018329522E7
- ll2 23.861184869324493 69.74050584634755
-EPSG:7080
- ll -36.195888995858425 71.31512362700816
- en 168644.4789624808 5988026.749531828
- ll2 -36.195888995724715 71.31512362685608
-EPSG:7081
- ll -2.436091151269352 78.4861164484505
- en 220428.8261372468 9730476.286296936
- ll2 -2.436091151268895 78.4861164484906
-EPSG:7084
- ll 67.74645751800352 -58.91833886399759
- en -58.9183388639976 67.74645751800352
- ll2 67.74645751800352 -58.9183388639976
-EPSG:7086
- ll 42.10787708946171 -159.9998455811192
- en -159.9998455811192 42.10787708946171
- ll2 42.10787708946171 -159.9998455811192
-EPSG:7088
- ll -87.93398224718703 85.73994866865377
- en 85.73994866865377 -87.93398224718703
- ll2 -87.93398224718703 85.73994866865377
-EPSG:7109
- ll 87.19031200504375 -110.56093305717876
- en 160616.1589274685 4314987.552782479
- ll2 87.19031200504375 -110.56093305717913
-EPSG:7110
- ll -28.21599278933899 -107.71339073163456
- en 570271.448640811 -8451711.1362505
- ll2 -28.215992789003735 -107.7133907309971
-EPSG:7111
- ll 47.744044043446834 -155.99273222218605
- en -3033724.5556993196 1080110.2222036072
- ll2 47.744044043446856 -155.99273222218605
-EPSG:7112
- ll 10.452188999657757 -56.10325036297772
- en 6631248.939038842 -2069259.8189488132
- ll2 10.452188999657762 -56.10325036297772
-EPSG:7113
- ll 62.84194565521264 -102.32769097099766
- en 367579.8960651286 1738016.7842662428
- ll2 62.8419456552126 -102.32769097099766
-EPSG:7114
- ll 51.07090466746161 -115.58209830252977
- en -605508.6210848803 401063.0465674826
- ll2 51.070904667461626 -115.58209830252977
-EPSG:7115
- ll -16.547624533983566 -114.37627498330652
- en -508713.0847747121 -6800120.398455033
- ll2 -16.547624532730012 -114.37627498149794
-EPSG:7116
- ll 36.67754201204416 -79.05932428539334
- en 2936888.5097703156 -384399.99973641994
- ll2 36.677542012044285 -79.05932428539333
-EPSG:7117
- ll 80.35431931552837 -133.21579258384492
- en -416120.26801878936 4345700.3722738195
- ll2 80.35431931552837 -133.21579258384492
-EPSG:7118
- ll -78.50774977733202 -109.09988529631919
- en 82940.27393208299 -1.3447551656184938E7
- ll2 -78.50774977733202 -109.09988529631919
-EPSG:7119
- ll -77.70273775236274 -109.46030913495575
- en 729267.9514637912 -4.5954023041144066E7
- ll2 -77.70273775235353 -109.4603091349758
-EPSG:7120
- ll -23.36898983674942 -110.48628182206467
- en 1003787.5461353164 -2.594083742700959E7
- ll2 -23.36898983674829 -110.48628182206292
-EPSG:7121
- ll 87.36331789561979 -154.62869381161772
- en -738453.8657928033 1.7288568322064538E7
- ll2 87.36331789561974 -154.6286938116177
-EPSG:7122
- ll 60.08991834516924 -141.39145679369148
- en -5298763.788488454 6056470.949488507
- ll2 60.089918345169195 -141.39145679369148
-EPSG:7123
- ll 4.330838734340487 -119.83918083654912
- en -6066692.829553209 -1.655241143705117E7
- ll2 4.330838734340526 -119.83918083654912
-EPSG:7124
- ll 53.87186210085521 -97.71657826133382
- en 2013202.1231641232 2274568.8286133367
- ll2 53.871862100855225 -97.71657826133382
-EPSG:7125
- ll 38.99420447384408 -109.98359393941689
- en 21184.560537425798 -2089965.835843782
- ll2 38.9942044738361 -109.9835939394264
-EPSG:7126
- ll 7.3692836402458965 -86.6348403514688
- en 1.1092370665767057E7 -1.3166030262930593E7
- ll2 7.369283640245926 -86.6348403514688
-EPSG:7127
- ll 50.47723449993842 -173.0969569817872
- en -1.2865104976784555E7 7667821.299233565
- ll2 50.47723449993843 -173.09695698178723
-EPSG:7128
- ll 81.9103053089892 -113.81687158393088
- en 45674.275399396254 1.4363149586869566E7
- ll2 81.91030530890379 -113.81687157968388
-EPSG:7131
- ll -13.162828704393192 -115.93510113854467
- en 755685.5463863529 -5620704.9129101215
- ll2 -13.162828703413766 -115.93510114253753
-EPSG:7132
- ll -68.42833569495357 -125.46695763961537
- en -248676.9589118987 -3.855806739368314E7
- ll2 -68.42833569491808 -125.46695763959933
-EPSG:7133
- ll 86.98322344033556 37.31508327167529
- en 37.31508327167529 86.98322344033556
- ll2 86.98322344033556 37.31508327167529
-EPSG:7136
- ll 85.46733505320509 36.41039118010667
- en 36.41039118010667 85.46733505320509
- ll2 85.46733505320509 36.41039118010667
-EPSG:7139
- ll -80.762778746511 -96.36265162689168
- en -96.36265162689168 -80.762778746511
- ll2 -80.762778746511 -96.36265162689168
-EPSG:7142
- ll 80.90720688328011 31.925631982247165
- en 111819.90427440633 5602640.537587516
- ll2 80.90720698441702 31.925631751413288
-EPSG:7257
- ll 8.595673759666624 -80.88763448944482
- en 687550.3802857723 -3501815.3265018254
- ll2 8.595673759635394 -80.88763448985897
-EPSG:7258
- ll 84.57052233378997 -90.35155695756478
- en 600380.1206512768 1.6219740643694874E7
- ll2 84.57052233376945 -90.35155695379797
-EPSG:7259
- ll -61.17459777581574 -85.10425697603327
- en 237080.32886171655 -1.1278769030459715E7
- ll2 -61.17459777581573 -85.10425697603327
-EPSG:7260
- ll -88.43539129978821 -89.7077046996029
- en 740846.7871453402 -4.698710648329219E7
- ll2 -88.43539129978842 -89.70770469860273
-EPSG:7261
- ll -49.7941989125304 -88.11978634732725
- en 76575.1740489 -9803188.955711175
- ll2 -49.794198912517366 -88.11978634733201
-EPSG:7262
- ll 16.82000019213295 -85.10980779199944
- en 1046253.5732711066 -7946288.337004726
- ll2 16.820000192132955 -85.10980779199947
-EPSG:7263
- ll 80.54715006103925 -93.4772727014594
- en 126897.72854221598 4508888.925105852
- ll2 80.54715006077592 -93.47727268911747
-EPSG:7264
- ll 3.073727809172979 -89.77520643417044
- en -115612.1494629489 -1.3462634404196894E7
- ll2 3.073727809172455 -89.77520643413393
-EPSG:7265
- ll 24.192376816137326 -83.33619854427235
- en 449720.40989289485 -1721003.0686619787
- ll2 24.192376816135923 -83.33619854426972
-EPSG:7266
- ll 75.2921486456494 -80.07751590565317
- en 1281884.2422096964 1.3016352379985526E7
- ll2 75.2921486452362 -80.07751590869577
-EPSG:7267
- ll 63.51780892460272 -84.81522125945338
- en 323852.56755379075 2698185.206134042
- ll2 63.51780892460111 -84.81522125945331
-EPSG:7268
- ll -75.39012648026811 -88.64663633597073
- en 589058.5234930213 -4.173599116987386E7
- ll2 -75.3901264802663 -88.64663633596987
-EPSG:7269
- ll 53.07218603128106 -85.17232743337505
- en 315583.39144261926 1600791.3012430347
- ll2 53.072186031280864 -85.17232743337495
-EPSG:7270
- ll -25.5542592320718 -89.93596644960888
- en -411920.03489605745 -2.3343718337040957E7
- ll2 -25.554259232022012 -89.93596644971065
-EPSG:7271
- ll -40.112931265173955 -84.78208562796364
- en 399254.3230699949 -8881917.55444866
- ll2 -40.11293126517102 -84.78208562796007
-EPSG:7272
- ll -72.0959613300077 -90.39326345327503
- en 366068.3962998518 -4.083029819408031E7
- ll2 -72.0959613299232 -90.39326345315287
-EPSG:7273
- ll 0.5950635119138212 -89.95131250483608
- en -155575.21103744733 -4388798.69708492
- ll2 0.5950635119128038 -89.95131250457135
-EPSG:7274
- ll 59.82896815776712 -84.8594765800668
- en 1070869.8682817072 7157076.765540505
- ll2 59.828968157766006 -84.85947658006663
-EPSG:7275
- ll 11.90850758667851 -91.90861704697228
- en -448552.6760084698 -2863399.8026485555
- ll2 11.908507585938157 -91.90861704301463
-EPSG:7276
- ll 46.95259225149587 -88.52026918012338
- en 58075.3987715628 3339859.5646692244
- ll2 46.952592251439924 -88.52026918014478
-EPSG:7277
- ll -62.2603824090731 -81.65992583034186
- en 524971.3698386988 -1.121747338273178E7
- ll2 -62.26038240706677 -81.65992583345738
-EPSG:7278
- ll -22.53871850273373 -81.49784700120858
- en 2697201.0269038407 -2.232215157844012E7
- ll2 -22.538718502135705 -81.49784700032257
-EPSG:7279
- ll -16.21576224098503 -90.87122658598145
- en -217048.69366245036 -6208667.254021576
- ll2 -16.215762240915165 -90.87122658582913
-EPSG:7280
- ll 79.00294615911699 -87.04608525191523
- en 756220.27186705 1.431690940314213E7
- ll2 79.00294615911697 -87.04608525191523
-EPSG:7281
- ll 46.74472329689465 -89.82142186250827
- en -13812.53529027602 1001655.4509235
- ll2 46.74472329677431 -89.82142186254605
-EPSG:7282
- ll -88.33294943770682 -83.59985134563946
- en 818304.6280884126 -4.59282339957586E7
- ll2 -88.33294943770682 -83.59985134565336
-EPSG:7283
- ll 88.5336319337529 -83.36230708727575
- en 250675.92511407455 5617181.938882788
- ll2 88.53363193375287 -83.3623070874131
-EPSG:7284
- ll 49.79180864048644 -82.22980193970386
- en 1937706.2808918753 4290206.8087042
- ll2 49.79180863923051 -82.2298019400401
-EPSG:7285
- ll -34.22167409745968 -91.32934720054226
- en -352903.2595643138 -8050889.818584974
- ll2 -34.22167409426198 -91.32934720266421
-EPSG:7286
- ll 11.587542537919973 -90.96682789300547
- en -1387291.9093895187 -9695551.35147003
- ll2 11.58754253736198 -90.96682788977857
-EPSG:7287
- ll 55.73762599132712 -90.06604819928195
- en -37302.595383151434 1894650.6134975704
- ll2 55.737625990637724 -90.0660481990032
-EPSG:7288
- ll -79.48742862758365 -87.08570966601752
- en 691426.3700063695 -4.3052232648304686E7
- ll2 -79.48742862758357 -87.0857096660175
-EPSG:7289
- ll 25.345170935683157 -88.7063765568409
- en -138326.77378918434 -1722796.3338331217
- ll2 25.34517093562355 -88.70637655696166
-EPSG:7290
- ll 79.09781098876874 -91.82543724076396
- en 311981.3558511722 1.3978867061038593E7
- ll2 79.0978109880491 -91.82543720864004
-EPSG:7291
- ll 70.51021476979452 -82.95380757942439
- en 388773.1946325657 3637170.55283306
- ll2 70.51021476964209 -82.953807579639
-EPSG:7292
- ll 8.488330011578626 -90.5240378387245
- en -504541.0772938072 -1.067349978110638E7
- ll2 8.488330011565099 -90.52403783851916
-EPSG:7293
- ll 30.03495005606898 -84.35223401414149
- en 384476.24158182996 -1140811.4441963022
- ll2 30.03495005606862 -84.35223401414048
-EPSG:7294
- ll 33.35508319248967 -82.80864761138538
- en 1716343.4145861499 -2524498.3932138346
- ll2 33.35508319245569 -82.80864761133063
-EPSG:7295
- ll 60.54868622308183 -83.5630996247915
- en 321589.7074039646 2405959.271339585
- ll2 60.54868622308094 -83.56309962479138
-EPSG:7296
- ll 78.02722970307374 -91.40695151806185
- en 305110.134698584 1.4313509668279514E7
- ll2 78.02722970243732 -91.40695150243624
-EPSG:7297
- ll 5.71248813732835 -86.3447659122503
- en 345819.08786147204 -3756309.1071472974
- ll2 5.712488137328348 -86.34476591225055
-EPSG:7298
- ll -68.29486393134957 -86.73400880226126
- en 864071.0578428631 -3.9262243443097934E7
- ll2 -68.29486393134954 -86.73400880226126
-EPSG:7299
- ll 82.61412416253029 -83.02426512293663
- en 287008.33707059314 4685062.9940415155
- ll2 82.61412416252692 -83.02426512297747
-EPSG:7300
- ll 86.43657571499185 -89.9088696090369
- en 705256.5692648974 1.676976447140986E7
- ll2 86.43657571499122 -89.90886960893731
-EPSG:7301
- ll 78.75149411254748 -94.00822288934148
- en 101748.41912090572 4565180.298257545
- ll2 78.75149411201946 -94.008222873573
-EPSG:7302
- ll -26.826715781247856 -91.01828053061308
- en -311510.9225107642 -2.3494433877224308E7
- ll2 -26.826715781212727 -91.01828053068694
-EPSG:7303
- ll -23.70617286511171 -86.14888495436628
- en 194220.17967876286 -7055451.033928336
- ll2 -23.7061728651117 -86.14888495436628
-EPSG:7304
- ll -81.32766960617455 -89.12016759340818
- en 598535.5530704847 -4.418607792837425E7
- ll2 -81.32766960616762 -89.12016759334846
-EPSG:7305
- ll 80.41348102964645 -88.86281856424358
- en 186772.36786988474 4550348.975827112
- ll2 80.41348102964328 -88.86281856423165
-EPSG:7306
- ll 65.26655651286731 -88.96747482367165
- en 332807.3928018277 9389708.997793956
- ll2 65.26655651282525 -88.96747482365966
-EPSG:7307
- ll 57.397079460468575 -81.89399717102243
- en 474774.5534877287 2016282.7013299526
- ll2 57.39707946014925 -81.89399717111687
-EPSG:7308
- ll -61.39944005425316 -79.83332630298425
- en 1832275.255417653 -3.667858176172971E7
- ll2 -61.399440050821305 -79.8333263094492
-EPSG:7309
- ll 47.973347372372615 -83.26962436655919
- en 455056.24934201746 1153563.0502591357
- ll2 47.9733473723199 -83.26962436654152
-EPSG:7310
- ll 3.3135295728238248 -82.88137539010229
- en 1979866.1099313584 -1.2464072226448832E7
- ll2 3.3135295728205567 -82.88137539026346
-EPSG:7311
- ll 39.8359604445175 -81.16618506756137
- en 606762.9065074592 54336.68801954325
- ll2 39.83596044410214 -81.16618506730235
-EPSG:7312
- ll -42.652633964607745 -82.10058734936004
- en 1688555.2027875113 -2.9841598907553613E7
- ll2 -42.65263396449802 -82.10058734929645
-EPSG:7313
- ll -9.306736446999224 -79.43486330716959
- en 979389.7060714128 -5468770.039939495
- ll2 -9.306736446038899 -79.43486331519665
-EPSG:7314
- ll -67.93149799009839 -86.26159831681063
- en 772041.9272170197 -3.927489199383887E7
- ll2 -67.93149799009839 -86.26159831681063
-EPSG:7315
- ll 5.342695421884045 -87.22959337926468
- en 48258.11490542104 -3874787.2003110535
- ll2 5.342695421883949 -87.22959337925937
-EPSG:7316
- ll -40.28610909497065 -83.45218370047392
- en 1358760.3427028758 -2.9295613980910778E7
- ll2 -40.28610909496553 -83.45218370046818
-EPSG:7317
- ll 3.246367568378261 -88.68766626398694
- en -64392.40051101486 -3889905.922189461
- ll2 3.246367568377213 -88.6876662639249
-EPSG:7318
- ll -86.19350499239076 -81.6622548366343
- en 891614.2816278905 -4.536572661092084E7
- ll2 -86.19350499238882 -81.66225483710551
-EPSG:7319
- ll -13.124915212942128 -83.03193970184483
- en 681447.6643512012 -5926512.211861569
- ll2 -13.124915212898786 -83.03193970209237
-EPSG:7320
- ll -77.86705440601335 -86.71420132523919
- en 817110.6204906397 -4.30400537331109E7
- ll2 -77.86705440601337 -86.71420132523919
-EPSG:7321
- ll 73.6918513938491 -86.79535305396517
- en 183711.07289906542 3755080.296263355
- ll2 73.69185139384828 -86.79535305396502
-EPSG:7322
- ll -36.364378796250705 -78.572278111968
- en 2681269.169420523 -2.7796476725442387E7
- ll2 -36.364378792527724 -78.57227811068292
-EPSG:7323
- ll -61.93835668861158 -87.36258024883502
- en 134340.47243166884 -1.1104559702324286E7
- ll2 -61.93835668860652 -87.36258024883514
-EPSG:7324
- ll 16.14383802539166 -83.96513674584872
- en 1273415.7724518487 -8026756.742937047
- ll2 16.1438380253916 -83.96513674584935
-EPSG:7325
- ll 45.60301770028627 -87.73029904991273
- en 89403.72948780746 793492.8903358821
- ll2 45.60301770028176 -87.73029904991589
-EPSG:7326
- ll -0.7464975857686795 -92.36847926507674
- en -1616708.0020979901 -1.4250310376079163E7
- ll2 -0.746497585692054 -92.36847925481415
-EPSG:7327
- ll -52.46205521274883 -87.35669401688982
- en 157981.60945233062 -1.0131566791897735E7
- ll2 -52.46205521274852 -87.35669401688997
-EPSG:7328
- ll 43.86192003741937 -88.77021632827879
- en 96279.6256458815 1791417.7741778991
- ll2 43.861920037392885 -88.77021632829583
-EPSG:7329
- ll 60.44983939924231 -90.85245222082136
- en 52780.236369553226 2493168.7933573388
- ll2 60.449839399116385 -90.85245222078976
-EPSG:7330
- ll 86.87413094427026 -81.92839240967432
- en 897565.5652072304 1.7843232686762325E7
- ll2 86.87413094426947 -81.92839241431108
-EPSG:7331
- ll 67.5258056271758 -80.70964833408755
- en 442143.04746544606 2968498.168343955
- ll2 67.5258056266009 -80.70964833503332
-EPSG:7332
- ll 22.419487152841455 -84.68253391024847
- en 1046650.1942841058 -6732142.659265714
- ll2 22.419487152841448 -84.68253391024847
-EPSG:7333
- ll 70.83759497043056 -93.12156229302748
- en 30573.40527025456 3401145.434889591
- ll2 70.83759496920067 -93.12156228753811
-EPSG:7334
- ll -14.448095901047353 -82.1419717240507
- en 2649749.0974342166 -1.993385871857437E7
- ll2 -14.448095900799919 -82.14197172485463
-EPSG:7335
- ll 60.5067719550257 -90.11560641939248
- en 55128.58366301807 2221854.6678622644
- ll2 60.50677195490802 -90.11560641936403
-EPSG:7336
- ll -37.145472381378745 -91.15007228423644
- en -495490.4608257364 -2.8265800779974494E7
- ll2 -37.14547238096578 -91.1500722846012
-EPSG:7337
- ll 85.70315849366446 -93.35318388598454
- en 182783.51712089372 5248652.458306016
- ll2 85.7031584936734 -93.35318385334904
-EPSG:7338
- ll 62.62926244629875 -82.96120584865666
- en 1382967.6082166992 8776766.526093462
- ll2 62.629262446155636 -82.96120584871153
-EPSG:7339
- ll -53.658428332485926 -87.19444149298938
- en 223839.1403006595 -1.0280708942310162E7
- ll2 -53.65842833248593 -87.19444149298938
-EPSG:7340
- ll -40.5760733409254 -90.71767441823502
- en -259389.00745332288 -2.897980710757827E7
- ll2 -40.57607334072474 -90.71767441836876
-EPSG:7341
- ll 5.070476227163468 -90.48251625873593
- en -157520.75395452726 -3737476.275591003
- ll2 5.070476227154695 -90.48251625848383
-EPSG:7342
- ll 1.5345646319589576 -93.57670649424938
- en -1655831.3530450533 -1.354464165698632E7
- ll2 1.5345646317831219 -93.57670648292596
-EPSG:7343
- ll -37.31294962251732 -82.37101942165457
- en 681522.496394044 -8492191.888561219
- ll2 -37.31294962164384 -82.37101942102116
-EPSG:7344
- ll -30.182352327795265 -90.61301897948937
- en -243932.92900497187 -2.5243118393509272E7
- ll2 -30.182352327755815 -90.61301897956545
-EPSG:7345
- ll 82.46684711425004 -88.65014287687262
- en 211450.34001489513 5011888.867396954
- ll2 82.4668471142499 -88.65014287687224
-EPSG:7346
- ll -44.343244712009735 -85.16033956844319
- en 1190217.3099810346 -2.9732868491137184E7
- ll2 -44.343244712008605 -85.16033956844211
-EPSG:7347
- ll 20.062124075504443 -86.37090974501025
- en 337193.12564359064 -1935364.3143733083
- ll2 20.06212407550444 -86.37090974501028
-EPSG:7348
- ll -42.74948644662444 -83.00566948607053
- en 1940988.7414998794 -2.9195564980971325E7
- ll2 -42.749486446137006 -83.00566948589254
-EPSG:7349
- ll 71.60146877156885 -89.1237331231408
- en 198637.60206642962 3804361.1943775928
- ll2 71.60146877156876 -89.1237331231408
-EPSG:7350
- ll -53.47663267317965 -88.81295852308884
- en 599419.0495939461 -3.3044201727095906E7
- ll2 -53.4766326731796 -88.81295852308887
-EPSG:7351
- ll 23.414377496113403 -90.54659301238928
- en -322408.7272037744 -1759127.8916010486
- ll2 23.414377495580645 -90.54659301328526
-EPSG:7352
- ll 41.908071416033835 -81.77825801432577
- en 1678094.3644255248 939623.3306560186
- ll2 41.9080714159417 -81.77825801426548
-EPSG:7353
- ll -35.592058065556735 -80.26976863132644
- en 696076.0536694134 -8223664.966166609
- ll2 -35.59205806473242 -80.26976863056251
-EPSG:7354
- ll -64.99157555373152 -84.55630165891307
- en 902544.4998178978 -3.7671993177395046E7
- ll2 -64.99157555373154 -84.55630165891307
-EPSG:7355
- ll -15.461178867826831 -87.29822229430287
- en 89930.29028150628 -6026499.034060612
- ll2 -15.461178867826765 -87.29822229430214
-EPSG:7356
- ll -2.276805603678241 -91.69886287778257
- en -1332502.643257808 -1.4990151940383077E7
- ll2 -2.276805603579807 -91.69886287321162
-EPSG:7357
- ll -67.94781171851581 -89.73935416749569
- en 127301.9638316914 -1.1686427376163004E7
- ll2 -67.94781171849716 -89.73935416749025
-EPSG:7358
- ll 12.796826249034524 -84.1581179923241
- en 1817922.4123936638 -8946168.358910102
- ll2 12.796826249029658 -84.15811799236698
-EPSG:7359
- ll -37.79962644787005 -87.60300126990775
- en 10722.118358981621 -8748913.672880562
- ll2 -37.799626447851495 -87.60300126993003
-EPSG:7360
- ll -33.04012403897958 -81.63364694249702
- en 1819356.1214272312 -2.6977244584045224E7
- ll2 -33.040124038918634 -81.6336469424006
-EPSG:7361
- ll -26.99260893674549 -86.68218252686206
- en 321180.7022959235 -7258600.846700853
- ll2 -26.992608936745484 -86.68218252686204
-EPSG:7362
- ll 27.831767214288462 -86.22958248204155
- en 1198036.0773888754 -3907396.9747413197
- ll2 27.831767214288348 -86.22958248204121
-EPSG:7363
- ll -88.68834509515449 -85.91724645512093
- en 242512.59595505625 -1.4271591903479911E7
- ll2 -88.68834509515447 -85.91724645512095
-EPSG:7364
- ll 37.58090090834217 -82.68881693319614
- en 2008098.836492172 -808446.7458597677
- ll2 37.580900908015245 -82.68881693291024
-EPSG:7365
- ll -5.2024658583906245 -88.35270554724985
- en 151004.6659608776 -4724701.785336609
- ll2 -5.202465858390626 -88.35270554724974
-EPSG:7366
- ll -40.02826918753201 -92.58406428168341
- en -622713.6396435327 -2.8196325863108568E7
- ll2 -40.02826918643226 -92.58406428213517
-EPSG:7367
- ll -76.98235897388739 -90.71518919275034
- en 157902.8440386588 -1.2861020045132322E7
- ll2 -76.98235897387094 -90.71518919271243
-EPSG:7368
- ll -67.12416610722406 -84.17096507548996
- en 1254098.2980930996 -3.8590628831382886E7
- ll2 -67.12416610715816 -84.17096507552297
-EPSG:7369
- ll 32.51104674685817 -86.72258560990717
- en 101616.90571049665 -855152.3386762316
- ll2 32.511046746857765 -86.72258560990821
-EPSG:7370
- ll -84.41633827715306 -84.09631017197414
- en 828532.3894990203 -4.5385481441471465E7
- ll2 -84.41633827715305 -84.09631017197415
-EPSG:7373
- ll -42.432736010880745 5.693505221239462
- en 5.6935052212394615 -42.432736011820374
- ll2 -42.43273601088081 5.6935052212394615
-EPSG:7374
- ll -70.67400757714015 51.89514062593331
- en 533061.7491200136 -7841283.269353138
- ll2 -70.67400757714108 51.895140625933315
-EPSG:7375
- ll -4.313802804262053 61.78652121013585
- en 1031737.1148532139 -478487.4899256014
- ll2 -4.31380280421196 61.78652120878252
-EPSG:7376
- ll 78.2988508139656 58.19889493453193
- en 391419.15888817084 8696179.403895693
- ll2 78.29885081384573 58.198894935771854
-EPSG:7400
- ll 23.446010584192763 -104.92244306980193
- en -107.25823475000186 23.44602214172451
- ll2 23.446010584697778 -104.92244300735727
-EPSG:7401
- ll 46.78928737486475 -17.568477679673194
- en -903469.3830529272 2390229.0633745273
- ll2 46.789287377194896 -17.568477665783913
-EPSG:7402
- ll -9.922234981707104 -77.08383890144988
- en -1.0686343363600982E7 1118218.2637768793
- ll2 -9.922235023686712 -77.083838884402
-EPSG:7403
- ll 69.98669369613894 4.34581239836011
- en 687597.4045197306 6204201.634689139
- ll2 69.9866936932144 4.345812407133028
-EPSG:7404
- ll -84.89825646169402 14.559006595084696
- en 14.568311905097286 -84.90166643122097
- ll2 -84.89825567036084 14.559005107347213
-EPSG:7405
- ll -73.1264445173419 -7.4915615304655585
- en 222432.10366418687 -1.3649702484474435E7
- ll2 -73.12644372927609 -7.491561842167236
-EPSG:7408
- ll 56.35890838635473 33.87671451501271
- en 33.88160149083351 56.35990166168475
- ll2 56.358908384247414 33.87671451561779
-EPSG:7409
- ll 51.85475055337719 102.55015818236575
- en 102.55015818236576 51.85475055429331
- ll2 51.854750553377436 102.55015818236576
-EPSG:7410
- ll 32.75656465349253 162.39058700009753
- en 162.38542957043978 32.759192112944056
- ll2 32.75656471581174 162.39058681248585
-EPSG:7411
- ll 55.36016795411484 26.89778434984717
- en 2150542.1156502077 3400160.548555753
- ll2 55.360167954104746 26.897784347708
-EPSG:7412
- ll -8.56072720085932 -55.13402410383443
- en -8143294.070969617 -1547054.4966387171
- ll2 -8.56072720705813 -55.13402410124991
-EPSG:7413
- ll 60.697919059600096 -33.400268101545244
- en -1383448.9485671856 5512745.067294309
- ll2 60.69791906461676 -33.400268071667846
-EPSG:7414
- ll 70.76498566615047 -58.37972006984447
- en -58.38356089389174 70.75829836276213
- ll2 70.76498588137363 -58.37971994628078
-EPSG:7415
- ll -5.801182552202434 -53.83784819772056
- en -8679158.040877933 -4297946.241148539
- ll2 -5.801182232336352 -53.837847872905705
-EPSG:7416
- ll -7.451090637128431 12.60053204515441
- en 897542.9515274377 -825237.3003082051
- ll2 -7.451090637115773 12.600532044924858
-EPSG:7417
- ll 14.352814672996473 18.62535094505939
- en 891130.3072385988 1589816.8995150537
- ll2 14.352814672974299 18.62535094495208
-EPSG:7418
- ll 11.140331339962898 16.483994957191115
- en 964627.8743085689 1240964.5035002509
- ll2 11.140331338539614 16.48399494864201
-EPSG:7419
- ll -28.591430973027073 8.026375967298367
- en 111151.01875116327 -3170287.949022901
- ll2 -28.591430972913912 8.026375967076921
-EPSG:7420
- ll -62.972135256126364 15.460834949782626
- en 923373.91554646 -6985362.458268055
- ll2 -62.972135256127025 15.460834949782628
-EPSG:7421
- ll 83.48234560666327 -0.8300029102988873
- en 541212.4692272695 6739334.60346086
- ll2 83.48234559525191 -0.8300028593893515
-EPSG:7422
- ll 65.3397942066284 -2.1189672897428125
- en 374757.8492952932 5633110.071078198
- ll2 65.33979420545482 -2.1189672796598362
-EPSG:7423
- ll 89.81827767486618 -37.97342554929898
- en -37.97342554929898 89.81827767487088
- ll2 89.81827767486365 -37.97342554929899
-EPSG:7528
- ll 0.12382844631163437 -84.00119444162851
- en 816257.2143092072 -4789862.010082513
- ll2 0.12382844630482195 -84.00119444740021
-EPSG:7529
- ll 69.18289423260896 -88.31996327804943
- en 264156.20624702633 2616251.478721279
- ll2 69.18289423260248 -88.31996327805076
-EPSG:7530
- ll -18.330292930144907 -87.91422141888721
- en 509470.3804208052 -7032145.609458068
- ll2 -18.330292930098143 -87.91422141891687
-EPSG:7531
- ll -2.604002133872939 -59.22279046596333
- en 5019566.683930283 -4987804.910202292
- ll2 -2.6040021338729065 -59.22279046596333
-EPSG:7532
- ll -1.0351102596406463 -81.87218277239114
- en 714960.5247603379 -4873336.1959352605
- ll2 -1.0351102595748856 -81.87218277896258
-EPSG:7533
- ll -59.26322166089801 -85.33641592685579
- en 543399.2643657619 -1.140649741235868E7
- ll2 -59.263221654891936 -85.33641593926436
-EPSG:7534
- ll -6.542313812131793 -150.70068696217322
- en -8480070.336755073 -3296190.1306351074
- ll2 -6.5423138121317495 -150.70068696217322
-EPSG:7535
- ll 13.872735061211785 -89.55847584825149
- en 130331.79165856692 -3197125.9352133465
- ll2 13.872735061211772 -89.55847584825126
-EPSG:7536
- ll 86.32622132070158 -142.93231288171165
- en -563998.3746461886 5594745.104038195
- ll2 86.32622132070155 -142.93231288171165
-EPSG:7537
- ll -80.24826654833483 -89.48397918351381
- en 223109.4988557128 -1.3743120692121867E7
- ll2 -80.24826654833485 -89.48397918351381
-EPSG:7538
- ll 71.37183475129622 -20.701070076299573
- en 2722938.1380026815 4491997.5702852495
- ll2 71.37183475129623 -20.70107007629956
-EPSG:7539
- ll 8.41849202585772 -33.90015706881974
- en 6970224.830701477 -1596675.6517648133
- ll2 8.41849202585776 -33.90015706881974
-EPSG:7540
- ll 22.007442900904408 -82.8466608547405
- en 969039.3938441268 -2211080.5065081595
- ll2 22.007442900904433 -82.8466608547405
-EPSG:7541
- ll 4.04406620024055 -91.67357101612315
- en -58669.75993380335 -4145409.2282604077
- ll2 4.0440662002387056 -91.6735710160407
-EPSG:7542
- ll 1.0037740516620914 -83.62412962711721
- en 565126.9580454949 -4807140.426617435
- ll2 1.0037740516600644 -83.62412962742387
-EPSG:7543
- ll -5.244466694933465 -95.03807025712928
- en -287079.7169107291 -5664118.660682468
- ll2 -5.24446669492971 -95.03807025701141
-EPSG:7544
- ll -58.62369588440866 -95.46057594697602
- en -155327.50604523823 -1.1425921737691617E7
- ll2 -58.623695884229974 -95.46057594693397
-EPSG:7545
- ll 78.8682290425109 -148.1835757399642
- en -1369012.2121726873 4743438.585801663
- ll2 78.86822904251092 -148.18357573996417
-EPSG:7546
- ll -47.55621287082977 -91.92474496357167
- en -151220.99608040726 -1.0310315539012177E7
- ll2 -47.556212870562334 -91.92474496361696
-EPSG:7547
- ll 57.70112883610403 -85.67891571825217
- en 451979.3223255529 1527498.6197483307
- ll2 57.701128836044525 -85.67891571825506
-EPSG:7548
- ll -5.588062867859406 -89.45116312799223
- en 391778.35367091733 -5204499.2482822
- ll2 -5.588062867859385 -89.45116312799371
-EPSG:7549
- ll -12.12089510739344 -97.51955175314185
- en -1095083.1179372778 -6911090.333036806
- ll2 -12.120895107393412 -97.51955175314185
-EPSG:7550
- ll 22.829231192078836 -125.15139150345583
- en -3647813.0725471918 -1459845.4890797003
- ll2 22.82923119207883 -125.15139150345583
-EPSG:7551
- ll -80.98509353966028 -84.53584355310981
- en 211376.97573510066 -1.371194547310359E7
- ll2 -80.98509353952252 -84.53584355842142
-EPSG:7552
- ll -34.573789161388966 -83.88341875464933
- en 806152.4924751655 -8879524.47670295
- ll2 -34.57378915827495 -83.88341875267662
-EPSG:7553
- ll -22.658257764314385 -90.01281098255467
- en 112464.232636335 -7384164.550919479
- ll2 -22.658257764314396 -90.01281098255467
-EPSG:7554
- ll 56.79291447469336 -84.86996708037032
- en 370722.6779795551 1625274.6998671838
- ll2 56.7929144746233 -84.86996708037289
-EPSG:7555
- ll -67.41009585101382 -83.84564103769985
- en 238641.11987952318 -1.2277463041956445E7
- ll2 -67.4100958508805 -83.8456410378011
-EPSG:7556
- ll 65.1199181879515 -86.16808531301498
- en 372049.67272679356 2421805.745011236
- ll2 65.11991818680782 -86.16808531490213
-EPSG:7557
- ll 78.05647991833644 -94.35396969548285
- en 40200.806735025515 4060589.3613187256
- ll2 78.05647991833644 -94.35396969548285
-EPSG:7558
- ll -26.138942521045138 -94.65410776777445
- en -376349.0396656418 -7869688.00561864
- ll2 -26.138942520712824 -94.65410776843012
-EPSG:7559
- ll 9.858950299189498 -40.02205783329458
- en 6129835.7243060125 -2144110.1475188695
- ll2 9.858950299189518 -40.02205783329459
-EPSG:7560
- ll 29.993779882816725 -81.85870198085541
- en 803879.1878123898 -1616831.6091809464
- ll2 29.993779881506924 -81.85870197890033
-EPSG:7561
- ll 68.59563497566052 -92.36158768987902
- en -55184.196634081 2664109.68842948
- ll2 68.59563497548687 -92.3615876896949
-EPSG:7562
- ll 67.92216188180436 -136.25638560015344
- en -1822685.9518358982 3453607.7230087277
- ll2 67.92216188180436 -136.25638560015344
-EPSG:7563
- ll 52.79553988755126 -84.57006221969635
- en 408031.08636909496 939155.8853639535
- ll2 52.79553988741817 -84.57006221969229
-EPSG:7564
- ll 10.432353126058018 -119.09794793061283
- en -3675351.5681497203 -3388071.040969934
- ll2 10.432353126058032 -119.09794793061283
-EPSG:7565
- ll 73.01870865906155 -151.0181404608386
- en -1906946.1137330618 4195697.282544395
- ll2 73.01870865906156 -151.0181404608386
-EPSG:7566
- ll -66.36220107197984 -92.96966008875856
- en 126677.75305912396 -1.2311086986716531E7
- ll2 -66.36220107197983 -92.96966008875856
-EPSG:7567
- ll 74.06895304478039 -8.722587085325955
- en 2579049.1159802685 4902730.683366395
- ll2 74.06895304478039 -8.722587085325955
-EPSG:7568
- ll 81.98952134683248 -90.08470205551637
- en 234281.97991235345 4172040.7426826586
- ll2 81.98952134683248 -90.08470205551637
-EPSG:7569
- ll 74.2551551165121 -165.20701537863366
- en -2222384.114461295 4965914.45287373
- ll2 74.2551551165121 -165.20701537863366
-EPSG:7570
- ll 52.86263138145742 -86.51081204549227
- en 318805.8472439144 1216982.8233172952
- ll2 52.86263138143021 -86.51081204548731
-EPSG:7571
- ll 37.30602193609761 -95.07676327864007
- en -105059.00567546897 -726885.5023053639
- ll2 37.306021935858055 -95.07676327886684
-EPSG:7572
- ll -78.53878520424092 -93.68371551614837
- en 101711.6439679849 -1.3467869942926763E7
- ll2 -78.53878520421297 -93.68371551600325
-EPSG:7573
- ll 44.61042219406929 -100.29192260893502
- en -510231.76058713684 19228.818798912427
- ll2 44.610422194069315 -100.29192260893502
-EPSG:7574
- ll 78.37070472671704 -94.84565428428733
- en 122206.50111120191 3832997.7901709503
- ll2 78.37070472618971 -94.84565427103037
-EPSG:7575
- ll -16.798523317617295 -92.62303316803147
- en 166604.75898093177 -6736102.066888811
- ll2 -16.7985233176173 -92.62303316803147
-EPSG:7576
- ll 82.51023261169317 -63.67020630593983
- en 748701.330617257 4828334.7565560425
- ll2 82.51023261169314 -63.67020630593983
-EPSG:7577
- ll -32.82772713619646 -90.66253382871439
- en 322881.0476607494 -8414784.73559882
- ll2 -32.82772713619647 -90.66253382871436
-EPSG:7578
- ll 5.540058251587318 -116.80496334537929
- en -3235191.797620562 -3919721.086633021
- ll2 5.5400582515873324 -116.80496334537929
-EPSG:7579
- ll 30.89422787389001 -59.56866390570926
- en 3020929.9782300107 -1104693.2123824377
- ll2 30.894227873890028 -59.56866390570925
-EPSG:7580
- ll 15.799730950750359 -169.73159750549635
- en -7972348.818919333 1302140.190213476
- ll2 15.799730950750398 -169.73159750549635
-EPSG:7581
- ll 6.502161701264583 -31.246126287221216
- en 7728084.84639594 -1524970.6577228508
- ll2 6.50216170126461 -31.246126287221216
-EPSG:7582
- ll -23.31915181381551 -85.43252656039607
- en 389302.45656284835 -7336221.369089393
- ll2 -23.31915181380982 -85.43252656038702
-EPSG:7583
- ll 76.26809155461697 -85.28479880691464
- en 286701.94297606434 3755669.9252606807
- ll2 76.26809155460684 -85.28479880692929
-EPSG:7584
- ll 62.252783363424925 -90.16031489155073
- en 115194.47227054166 2096486.1216841955
- ll2 62.25278336342447 -90.16031489155078
-EPSG:7585
- ll -7.135403400209828 -144.96001840918245
- en -8039520.868221635 -3519461.6729700724
- ll2 -7.135403400209798 -144.96001840918245
-EPSG:7586
- ll 87.36921172781865 -19.97596712248884
- en 854327.4177247263 6105009.4232688295
- ll2 87.36921172781867 -19.975967122488854
-EPSG:7587
- ll -84.28577971321607 -88.56176279373784
- en 535470.5061627964 -4.648256948774497E7
- ll2 -84.28577971321609 -88.56176279373786
-EPSG:7588
- ll -38.63645444028414 -89.68900347949659
- en 833594.8267611859 -3.0650998217349842E7
- ll2 -38.63645444028409 -89.68900347949649
-EPSG:7589
- ll 54.95124968226537 -90.73513821067144
- en 539969.4923820519 3584846.120551151
- ll2 54.95124968226519 -90.73513821067135
-EPSG:7590
- ll 63.609141382476196 -85.30657345339262
- en 1750143.826959936 6812959.968435816
- ll2 63.60914138247615 -85.30657345339262
-EPSG:7591
- ll -31.556769630633134 -84.27503719238678
- en 1264389.538573011 -2.7089888806298234E7
- ll2 -31.556769630534305 -84.27503719221872
-EPSG:7592
- ll -55.981953612110715 -92.73622589177567
- en 382691.9761850093 -3.616651133238129E7
- ll2 -55.98195361211066 -92.7362258917757
-EPSG:7593
- ll 0.6134206709783978 -42.46601166354699
- en 2.275340620182208E7 -1.0632789156010117E7
- ll2 0.6134206709784278 -42.466011663547
-EPSG:7594
- ll -28.597601058252508 -85.35135075616199
- en 1813742.91381457 -2.5920237376232598E7
- ll2 -28.59760105822498 -85.35135075610485
-EPSG:7595
- ll 38.216901247935276 -164.90057701558416
- en -1.8286340057208408E7 6695768.5388199715
- ll2 38.216901247935354 -164.90057701558413
-EPSG:7596
- ll 68.66342598823263 -94.7915307764163
- en 112139.13497739776 9173657.435263507
- ll2 68.6634259880208 -94.7915307761646
-EPSG:7597
- ll 7.704172483687685 -47.54939458498201
- en 1.7854159627241127E7 -9005636.916269515
- ll2 7.704172483687713 -47.549394584982004
-EPSG:7598
- ll 67.63806494120234 -24.247079471233235
- en 9718202.742956785 1.336112071003414E7
- ll2 67.63806494120236 -24.24707947123322
-EPSG:7599
- ll 51.395322741703175 -11.727295785032396
- en 1.6294727846443592E7 1.1258465780365117E7
- ll2 51.395322741703175 -11.727295785032396
-EPSG:7600
- ll -50.980896559669176 -90.26354446426743
- en 521033.28800533706 -3.361012973015075E7
- ll2 -50.98089655966811 -90.26354446426795
-EPSG:7601
- ll 11.045061277264779 -88.26585393510496
- en 164760.00058316436 -1.212828050210853E7
- ll2 11.045061277264782 -88.26585393510473
-EPSG:7602
- ll 68.40851526842368 -88.47042751015421
- en 658321.4148616326 8242717.156336997
- ll2 68.40851526834486 -88.47042751020813
-EPSG:7603
- ll 24.06640265981531 -93.80756658698236
- en -468436.53185804863 -7399325.467659193
- ll2 24.066402659814432 -93.80756658698398
-EPSG:7604
- ll -10.789200445243516 -146.77414390192655
- en -2.771837676059198E7 -1.3179271248151181E7
- ll2 -10.789200445243491 -146.77414390192655
-EPSG:7605
- ll 43.184115671621726 -90.73348516837487
- en -253348.9265946518 -811342.320716858
- ll2 43.18411567159758 -90.73348516839178
-EPSG:7606
- ll 66.17004878858498 -82.37153685538007
- en 1830393.9248760324 8141864.398236752
- ll2 66.17004878523777 -82.371536866741
-EPSG:7607
- ll 72.32041190608442 -94.04439577543951
- en 434193.4698016496 1.13016207903155E7
- ll2 72.32041190604957 -94.04439577540572
-EPSG:7608
- ll 70.64327231940192 -18.44043303970409
- en 9540885.20541662 1.4926793241107525E7
- ll2 70.64327231940193 -18.44043303970409
-EPSG:7609
- ll 42.42357340267017 -22.816920002159947
- en 1.6571354115206229E7 6576353.335503491
- ll2 42.42357340267019 -22.816920002159947
-EPSG:7610
- ll 33.34110930781729 -87.2119457369441
- en 1271925.915334362 -3336837.6550907367
- ll2 33.341109307789075 -87.21194573689799
-EPSG:7611
- ll -30.005372197820428 -95.13001235510448
- en -818994.1050737075 -2.74422159415104E7
- ll2 -30.005372197383796 -95.13001235584947
-EPSG:7612
- ll 20.09926145542019 -86.67480075978368
- en 1520216.8572036093 -8688461.045412011
- ll2 20.099261455344998 -86.67480075974082
-EPSG:7613
- ll -66.33490001037535 -93.28897727222491
- en -182272.31720490183 -3.952296283886028E7
- ll2 -66.33490000900264 -93.28897726926215
-EPSG:7614
- ll -8.550428435937192 -80.91044020685935
- en 2665367.1495699026 -1.8846218725136496E7
- ll2 -8.550428435103386 -80.91044021482692
-EPSG:7615
- ll 63.134966427447694 -88.17990355747645
- en 946938.1914330107 7199871.2807925865
- ll2 63.134966427380164 -88.17990355749421
-EPSG:7616
- ll 4.844498769384288 -52.90655623955264
- en 1.6503666818714952E7 -1.1871021700518819E7
- ll2 4.844498769384323 -52.90655623955265
-EPSG:7617
- ll -60.19413802252572 -84.93299493218397
- en 1254181.2562744508 -3.823397894903357E7
- ll2 -60.19413802152935 -84.93299493302555
-EPSG:7618
- ll 63.86459160559269 -5.335904866574907
- en 1.2289726716857335E7 1.4148512687422996E7
- ll2 63.86459160559268 -5.335904866574907
-EPSG:7619
- ll -10.558579789414694 -86.00056309164752
- en 1397318.8818204643 -2.0075336731297806E7
- ll2 -10.558579789414528 -86.00056309165122
-EPSG:7620
- ll -20.492341885897204 -94.20653396588908
- en -1638218.3411433105 -2.3724738981083985E7
- ll2 -20.492341885280243 -94.20653396638886
-EPSG:7621
- ll 44.69377701195553 -85.78499912687603
- en 1933430.5420351631 690106.2862502786
- ll2 44.69377701195555 -85.78499912687603
-EPSG:7622
- ll -41.147647629725654 -87.9476615923902
- en 589168.093050481 -3.1086406606671646E7
- ll2 -41.147647629725654 -87.9476615923902
-EPSG:7623
- ll 11.178792214927473 -4.7323248538928055
- en 2.9648896588232763E7 4136313.169420256
- ll2 11.178792214927496 -4.7323248538928055
-EPSG:7624
- ll 55.34789157361472 -142.67701939788515
- en -9480345.144102499 7420985.939148987
- ll2 55.34789157361482 -142.67701939788515
-EPSG:7625
- ll -87.03419276284025 -89.2246829553944
- en 529592.6008746441 -4.7963189182645634E7
- ll2 -87.03419276284001 -89.22468295545403
-EPSG:7626
- ll 32.713329840592905 -55.263879818195235
- en 1.061520384203071E7 -1913624.0617559592
- ll2 32.713329840593154 -55.26387981819524
-EPSG:7627
- ll -60.270789788028864 -95.00712628377433
- en -72007.85442890946 -3.8153192381037466E7
- ll2 -60.27078978733682 -95.00712628329323
-EPSG:7628
- ll 46.665844892220086 -157.0606108928926
- en -1.4372577889584634E7 7998841.099121918
- ll2 46.66584489222009 -157.0606108928926
-EPSG:7629
- ll 85.64417832287674 -91.55458855571784
- en 410931.38571887696 1.5979656502731118E7
- ll2 85.6441783228766 -91.55458855571443
-EPSG:7630
- ll 20.4771820155093 -85.38831431802654
- en 2768123.7353827874 -8495718.987541279
- ll2 20.477182014964903 -85.3883143175811
-EPSG:7631
- ll -70.08945727978843 -85.72526630617806
- en 1129448.940240485 -4.110072976662551E7
- ll2 -70.08945727958076 -85.72526630649398
-EPSG:7632
- ll 50.80843118639431 -124.76897247194466
- en -6871559.641843897 3812356.6500826916
- ll2 50.80843118639432 -124.76897247194466
-EPSG:7633
- ll 42.505038615029406 -93.03497015768862
- en -333577.43683728727 -526853.6197647889
- ll2 42.505038614449184 -93.03497015789229
-EPSG:7634
- ll -26.436610025687038 -93.70423392811772
- en 192526.4623860687 -2.5602915851544198E7
- ll2 -26.436610025686985 -93.70423392811783
-EPSG:7635
- ll 62.14501962796801 -152.34923929949446
- en -9461424.669572802 1.0709235025091274E7
- ll2 62.145019627967976 -152.34923929949446
-EPSG:7636
- ll 6.9424065160840485 -88.29518279317747
- en 1957161.208995549 -1.3162615650748214E7
- ll2 6.942406516079699 -88.29518279327716
-EPSG:7637
- ll -10.455317868557895 -155.40801959794626
- en -3.057755413933061E7 -9622485.038463347
- ll2 -10.455317868557849 -155.40801959794626
-EPSG:7638
- ll 20.386479301150835 -169.69403915884521
- en -2.4796667892707326E7 4443237.305412621
- ll2 20.386479301150857 -169.69403915884521
-EPSG:7639
- ll 32.98201241359907 -87.07728552993888
- en 1218232.3141641996 -3175675.7211392997
- ll2 32.98201241359928 -87.07728552993888
-EPSG:7640
- ll 26.35164984994111 -53.503437906911856
- en 1.3493411354405835E7 -3537251.051743432
- ll2 26.3516498499411 -53.50343790691185
-EPSG:7641
- ll -2.110492863101939 -93.37278127707162
- en -1546473.1508484555 -1.6365392202794658E7
- ll2 -2.1104928630517166 -93.37278127440597
-EPSG:7642
- ll 77.51026572995937 -91.68441942938726
- en 411025.51788383856 1.2778405046625402E7
- ll2 77.51026572993858 -91.68441942932314
-EPSG:7643
- ll 72.4297064307805 -82.42793837865275
- en 1312343.6297915094 1.0637173839694396E7
- ll2 72.42970642889291 -82.42793839389287
-EPSG:7644
- ll 53.519458535237185 -153.45034029530356
- en -1.2386286952342767E7 8849693.49171953
- ll2 53.5194585352372 -153.4503402953036
-EPSG:7645
- ll 74.61273823049682 -172.00114028240444
- en -7479308.587239638 1.6640290829933831E7
- ll2 74.61273823049683 -172.00114028240444
-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
diff --git a/data_nodist/trans/ast.lang b/data_nodist/trans/ast.lang
index a24b77f..d909503 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 c622b75..85b1964 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 a6351f6..f2f87ea 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 eefcef8..d0f842c 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 6493744..b0dfbf7 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 7ccc3b3..a7c6f1c 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 abe1b8d..782a4d0 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 b0639f4..096821f 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 8888d63..819fe8a 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 595f298..0abd5ce 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 c746898..b17a3cd 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 ba79ed3..13be7db 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 7257fff..4447597 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 bcce76d..1a03fb2 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 3e76a96..fe302f3 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 1561538..163467e 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 960ce36..1e1c625 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 3f7df27..7544fd0 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 6eb7fa9..dfe6324 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 4f65e0a..89848bb 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 cc07640..644ef00 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 2195ca2..b348e38 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 18b11ac..1cd8f83 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 be9a897..a3f17a0 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 1011427..ee91142 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 3139387..8d7a92d 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 f655a72..fdacd24 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 de702f6..373ffe8 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 8e29013..3806d6b 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 9dc9420..932a6e1 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 4249c09..bdc6805 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 ca6585f..d9c6369 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 7bb992b..605813c 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 2e2afd0..7e1df73 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 748ea74..6e915d9 100644
Binary files a/data_nodist/trans/zh_TW.lang and b/data_nodist/trans/zh_TW.lang differ
diff --git a/geticons.pl b/geticons.pl
index e5b3faf..566e2b6 100755
--- a/geticons.pl
+++ b/geticons.pl
@@ -29,7 +29,7 @@ for my $arg (@ARGV ? @ARGV : @default)
while(my $l = <FILE>)
{
next if $l =~ /NO-ICON/;
- if($l =~ /icon\s*[:=]\s*["']([^+]+?)["']/)
+ if($l =~ /icon\s*[:=]\s*["']([^"'+]+?)["']/)
{
++$icons{$1};
}
@@ -45,7 +45,7 @@ for my $arg (@ARGV ? @ARGV : @default)
if($l =~ /ImageProvider(?:\.get)?\(\"([^\"]*?)\"\)/)
{
my $i = $1;
- $i = "styles/standard/$i" if $i eq "misc/no_icon.png";
+ $i = "styles/standard/$i" if $i eq "misc/no_icon";
++$icons{$i};
}
while($l =~ /\/\*\s*ICON\s*\*\/\s*\"(.*?)\"/g)
@@ -68,7 +68,17 @@ for my $arg (@ARGV ? @ARGV : @default)
my $i = "preferences/$1";
++$icons{$i};
}
- if($l =~ /ImageProvider\.get\(\"(.*?)\",\s*\"(.*?)\"\s*\)/)
+ if($l =~ /setIcon\(\"(.*?)\"/)
+ {
+ my $i = "statusline/$1";
+ ++$icons{$i};
+ }
+ if($l =~ /ImageProvider\.get(?:IfAvailable)?\(\"(.*?)\",\s*\"(.*?)\"\s*\)/)
+ {
+ my $i = "$1/$2";
+ ++$icons{$i};
+ }
+ if($l =~ /new ImageProvider\(\"(.*?)\",\s*\"(.*?)\"\s*\)/)
{
my $i = "$1/$2";
++$icons{$i};
@@ -115,7 +125,7 @@ for my $arg (@ARGV ? @ARGV : @default)
my $i = "markers/$1";
++$icons{$i};
}
- if($l =~ /\.setButtonIcons.*\{(.*)\}/)
+ if($l =~ /setButtonIcons.*\{(.*)\}/)
{
my $t = $1;
while($t =~ /\"(.*?)\"/g)
@@ -132,6 +142,10 @@ for my $arg (@ARGV ? @ARGV : @default)
{
$extends = "dialogs/";
}
+ elsif($l =~ /extends JosmAction/)
+ {
+ $extends = "";
+ }
}
close FILE;
}
diff --git a/i18n/po/af.po b/i18n/po/af.po
index e260556..8f30ab3 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:31+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:31+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr "Tuisblad"
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 685db40..511e02e 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:32+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:32+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 0663f38..3e21445 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:32+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:32+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -149,9 +149,6 @@ msgstr "إصدارجافا {0}"
msgid "Homepage"
msgstr "الصفحة الرئيسية"
-msgid "Bug Reports"
-msgstr "تقارير الأخطاء"
-
msgid "Info"
msgstr "معلومات"
@@ -173,6 +170,12 @@ msgstr "إضافات"
msgid "About JOSM..."
msgstr "حول JOSM..."
+msgid "OK"
+msgstr "مُوافق"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -584,9 +587,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "مُوافق"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1180,9 +1180,6 @@ msgstr "و غير إسم الملف"
msgid "Could not rename file ''{0}''"
msgstr "لم أتمكن من إعادة تسمية الوثيقة ''{0}''"
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1796,6 +1793,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "تقدّم بطيء"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1945,9 +1966,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2263,8 +2281,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3046,9 +3064,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr "طبّق ؟"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3068,27 +3083,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "العلاقة"
-
-msgid "Old role"
-msgstr "الدور السابق"
-
-msgid "New role"
-msgstr "الدور الجديد"
-
-msgid "Old key"
-msgstr "المفتاح السابق"
-
-msgid "Old value"
-msgstr "القيمة السابقة"
-
-msgid "New key"
-msgstr "المفتاح الجديد"
-
-msgid "New value"
-msgstr "القيمة الجديدة"
-
msgid "Apply selected changes"
msgstr "طبق التغييرات المختارة"
@@ -4158,6 +4152,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4807,6 +4804,12 @@ msgstr ""
msgid "Initializing"
msgstr "جاري التهيئة"
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
+
msgid "Updating plugins"
msgstr ""
@@ -4816,12 +4819,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
-
msgid "Loading plugins"
msgstr ""
@@ -5796,6 +5793,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "طبّق ؟"
+
+msgid "Relation"
+msgstr "العلاقة"
+
+msgid "Old role"
+msgstr "الدور السابق"
+
+msgid "New role"
+msgstr "الدور الجديد"
+
+msgid "Old key"
+msgstr "المفتاح السابق"
+
+msgid "Old value"
+msgstr "القيمة السابقة"
+
+msgid "New key"
+msgstr "المفتاح الجديد"
+
+msgid "New value"
+msgstr "القيمة الجديدة"
+
msgid "For selected objects only"
msgstr ""
@@ -6283,51 +6304,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "إفتح لائحة بكلّ التبقات المحملة."
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6350,12 +6326,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
-
-msgid "Move the selected layer one row down."
-msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
-
msgid "Information about layer"
msgstr ""
@@ -6778,15 +6748,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6892,9 +6853,6 @@ msgstr ""
msgid "Date"
msgstr "التاريخ"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7046,14 +7004,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7138,15 +7088,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7164,6 +7105,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
+
+msgid "Move the selected layer one row up."
+msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7479,10 +7489,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9139,9 +9149,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9948,12 +9955,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11963,6 +11964,12 @@ msgstr "إعدادات الاتصال"
msgid "Connection Settings for the OSM server."
msgstr "تعيينات الإتصال للخادم أو.أس.أم."
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr "الفعل"
@@ -12477,6 +12484,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13720,62 +13735,6 @@ msgstr ""
msgid "Error playing sound"
msgstr "خطأ تشغيل صوت"
-msgid "Do nothing"
-msgstr "لا تفعل أي شيء"
-
-msgid "Report Bug"
-msgstr "بلّغ عن علّة"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "الشذوذ غيرال متوقع"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14027,9 +13986,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14214,6 +14170,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "لا تفعل أي شيء"
+
+msgid "Report Bug"
+msgstr "بلّغ عن علّة"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "الشذوذ غيرال متوقع"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14548,13 +14564,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14563,7 +14579,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14575,15 +14597,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14680,6 +14699,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14704,13 +14726,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14857,10 +14879,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14913,29 +14935,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14983,6 +15004,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15043,6 +15067,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15079,10 +15106,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15184,6 +15208,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15193,6 +15220,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15848,6 +15878,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17205,6 +17240,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17781,9 +17822,6 @@ msgstr "تقاطع طرقات سريعة"
msgid "Number"
msgstr "الرقم"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "الخدمات"
@@ -18262,6 +18300,15 @@ msgstr ""
msgid "mangrove"
msgstr "شجر إستوائي"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "وحل"
@@ -19410,6 +19457,9 @@ msgstr ""
msgid "Fishing"
msgstr "صيد السمك"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20678,6 +20728,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22265,8 +22319,8 @@ msgstr ""
msgid "food"
msgstr "مأكولات"
-msgid "news_papers"
-msgstr "جرائد"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "تذاكر_موقف_سيارات"
@@ -22280,8 +22334,8 @@ msgstr "خرائط_النقل_العام"
msgid "public_transport_tickets"
msgstr "تذاكر_النقل_العام"
-msgid "SIM-cards"
-msgstr "رقائق SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "طوابع"
@@ -23535,6 +23589,21 @@ msgstr "طبيعي"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23559,9 +23628,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23721,7 +23787,13 @@ msgstr "مخيم"
msgid "Test"
msgstr "إختبار"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23805,6 +23877,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23903,6 +23980,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23912,6 +23992,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27011,6 +27099,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29332,6 +29480,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30116,9 +30273,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 5e9ee2a..53ba303 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2016-01-23 20:31+0000\n"
"Last-Translator: Xuacu Saturio <xuacusk8 at gmail.com>\n"
"Language-Team: Asturian <ast at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:34+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:34+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -151,9 +151,6 @@ msgstr "Versión de Java {0}"
msgid "Homepage"
msgstr "Páxina d''aniciu"
-msgid "Bug Reports"
-msgstr "Informes de fallos"
-
msgid "Info"
msgstr "Info"
@@ -175,6 +172,12 @@ msgstr "Complementos"
msgid "About JOSM..."
msgstr "Tocante a JOSM..."
+msgid "OK"
+msgstr "Aceutar"
+
+msgid "Report bug"
+msgstr "Reportar error"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Nun pudo llocalizase''l recursu ''{0}''."
@@ -602,9 +605,6 @@ msgstr "Axusta la posición d''esta capa d''imaxes"
msgid "Adjust imagery offset"
msgstr "Axusta la posición de les imaxes"
-msgid "OK"
-msgstr "Aceutar"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1269,9 +1269,6 @@ msgstr "Tamién renomar el ficheru"
msgid "Could not rename file ''{0}''"
msgstr "Nun se pudo renomar el ficheru ''{0}''"
-msgid "Report bug"
-msgstr "Reportar error"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Mandar una solicitú al siguimientu de fallos de JOSM"
@@ -1922,6 +1919,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Alantre más adulces"
+msgid "Downloading changeset content"
+msgstr "Descargando el conteníu del cambéu"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Descargando cambéu {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Descargando´l conteníu pal conxuntu de cambeos {2}..."
+
+msgid "Download changesets"
+msgstr "Descargar modificaciones"
+
+msgid "Querying and downloading changesets"
+msgstr "Consultando y descargando cambeos"
+
+msgid "Determine user id for current user..."
+msgstr "Determinar l''ID d''usuariu pal usuariu actual..."
+
+msgid "Query and download changesets ..."
+msgstr "Consultar y descargar cambeos..."
+
+msgid "Errors during download"
+msgstr "Fallos na descarga"
+
msgid "Download GPS"
msgstr "Descargar GPS"
@@ -2087,9 +2108,6 @@ msgstr "Oxetos movíos o esaniciaos"
msgid "The following errors occurred during mass download: {0}"
msgstr "Los siguientes errores produxéronse mientres la descarga masiva: {0}"
-msgid "Errors during download"
-msgstr "Fallos na descarga"
-
msgid "Error during download"
msgstr "Fallu na descarga"
@@ -2441,8 +2459,8 @@ msgid "Add selection to relation"
msgstr "Añedir la selección a la relación"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3285,9 +3303,6 @@ msgstr "Resolver conflictos na llista de nudos de la vía {0}"
msgid "Main dataset does not include node {0}"
msgstr "El conxuntu de datos principal nun incluye’l nudu {0}"
-msgid "Apply?"
-msgstr "¿Aplicar?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3317,27 +3332,6 @@ msgstr ""
"Al invertir esta vía suxurense los vinientes cambeos col fin de caltener la "
"coherencia de los datos."
-msgid "Relation"
-msgstr "Rellación"
-
-msgid "Old role"
-msgstr "Rol antiguu"
-
-msgid "New role"
-msgstr "Rol nuevu"
-
-msgid "Old key"
-msgstr "Clave antigua"
-
-msgid "Old value"
-msgstr "Valor antiguu"
-
-msgid "New key"
-msgstr "Clave nueva"
-
-msgid "New value"
-msgstr "Valor nuevu"
-
msgid "Apply selected changes"
msgstr "Aplicar los cambios seleicionaos"
@@ -4492,6 +4486,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problema de verificación de rol"
@@ -5172,6 +5169,12 @@ msgstr "Activáu nivel de depuración detallada (traces)"
msgid "Initializing"
msgstr "Anicializando"
+msgid "Setting defaults"
+msgstr "Axuste de predefiníos"
+
+msgid "Creating main GUI"
+msgstr "Creando la interfaz gráfica principal"
+
msgid "Updating plugins"
msgstr "Actualizando componentes"
@@ -5181,12 +5184,6 @@ msgstr "Instalando complementos actualizaos"
msgid "Loading early plugins"
msgstr "Cargando los primeros complementos"
-msgid "Setting defaults"
-msgstr "Axuste de predefiníos"
-
-msgid "Creating main GUI"
-msgstr "Creando la interfaz gráfica principal"
-
msgid "Loading plugins"
msgstr "Cargando los complementos"
@@ -6269,6 +6266,30 @@ msgstr "Amosar namá etiquetes con conflictos"
msgid "Show tags with multiple values only"
msgstr "Amosar namá los atributos con valores múltiples"
+msgid "Apply?"
+msgstr "¿Aplicar?"
+
+msgid "Relation"
+msgstr "Rellación"
+
+msgid "Old role"
+msgstr "Rol antiguu"
+
+msgid "New role"
+msgstr "Rol nuevu"
+
+msgid "Old key"
+msgstr "Clave antigua"
+
+msgid "Old value"
+msgstr "Valor antiguu"
+
+msgid "New key"
+msgstr "Clave nueva"
+
+msgid "New value"
+msgstr "Valor nuevu"
+
msgid "For selected objects only"
msgstr "Namá pa oxetos escoyíos"
@@ -6788,51 +6809,6 @@ msgstr "Conmutar visibilidá de la capa: {0}"
msgid "Open a list of all loaded layers."
msgstr "Abre una llista de toles capes cargaes."
-msgid "Delete the selected layers."
-msgstr "Esanicia les capes escoyíes."
-
-msgid "Show/hide"
-msgstr "Amosar/Despintar"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Camuda la visibilidá de la capa escoyía"
-
-msgid "Show/hide layer"
-msgstr "Amosar/despintar capa"
-
-msgid "Opacity"
-msgstr "Opacidá"
-
-msgid "Adjust opacity of the layer."
-msgstr "Axustar opacidá de la capa"
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Activar"
-
-msgid "Activate the selected layer"
-msgstr "Activa la capa escoyía"
-
-msgid "Activate layer"
-msgstr "Activar capa"
-
-msgid "Merge this layer into another layer"
-msgstr "Combina esta capa con otra"
-
-msgid "Duplicate this layer"
-msgstr "Doblar esta capa"
-
-msgid "Copy of {0}"
-msgstr "Copia de {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copia {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "la capa ta anguaño visible (fai clic pa despintar la capa)"
@@ -6855,12 +6831,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Mueve la capa seleicionada una filera arriba"
-
-msgid "Move the selected layer one row down."
-msgstr "Mueve la capa seleicionada una filera abaxo"
-
msgid "Information about layer"
msgstr "Información de capa"
@@ -7300,15 +7270,6 @@ msgstr "Peslláu el"
msgid "Discussions"
msgstr "Alderiques"
-msgid "Downloading changeset content"
-msgstr "Descargando el conteníu del cambéu"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Descargando cambéu {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Descargando´l conteníu pal conxuntu de cambeos {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7424,9 +7385,6 @@ msgstr "Anovar l''alderique del conxuntu de cambios dende''l sirvidor d''OSM"
msgid "Date"
msgstr "Fecha"
-msgid "Download changesets"
-msgstr "Descargar modificaciones"
-
msgid "{0} [incomplete]"
msgstr "{0} [incompleta]"
@@ -7599,16 +7557,6 @@ msgid "Please enter an integer value > 0"
msgstr "Por favor, introduza un valor enteru > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>El valor actual nun ye un nome d''usuariu válidu.<br>Introduza un nome "
-"d''usuariu non valeru.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Por favor, introduza un nome d''usuariu non valeru"
-
-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 ""
@@ -7714,15 +7662,6 @@ msgstr "URL de consulta de cambeos incorreuta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Pesllar el cuadru de diálogu y albortar la consulta de cambeos"
-msgid "Querying and downloading changesets"
-msgstr "Consultando y descargando cambeos"
-
-msgid "Determine user id for current user..."
-msgstr "Determinar l''ID d''usuariu pal usuariu actual..."
-
-msgid "Query and download changesets ..."
-msgstr "Consultar y descargar cambeos..."
-
msgid "URL: "
msgstr "URL: "
@@ -7742,6 +7681,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "La URL de consulta de cambeos non ye válida"
+msgid "Activate"
+msgstr "Activar"
+
+msgid "Activate the selected layer"
+msgstr "Activa la capa escoyía"
+
+msgid "Activate layer"
+msgstr "Activar capa"
+
+msgid "Delete the selected layers."
+msgstr "Esanicia les capes escoyíes."
+
+msgid "Duplicate this layer"
+msgstr "Doblar esta capa"
+
+msgid "Copy of {0}"
+msgstr "Copia de {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copia {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Axustar opacidá de la capa"
+
+msgid "Opacity"
+msgstr "Opacidá"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Combina esta capa con otra"
+
+msgid "Move the selected layer one row down."
+msgstr "Mueve la capa seleicionada una filera abaxo"
+
+msgid "Move the selected layer one row up."
+msgstr "Mueve la capa seleicionada una filera arriba"
+
+msgid "Show/hide"
+msgstr "Amosar/Despintar"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Camuda la visibilidá de la capa escoyía"
+
+msgid "Show/hide layer"
+msgstr "Amosar/despintar capa"
+
msgid "Discardable key: selection Foreground"
msgstr "Clave descartable: escoyeta de primer planu"
@@ -8066,13 +8074,13 @@ msgstr "Rellaciones padre"
msgid "Child Relations"
msgstr "Rellaciones fíes"
-msgid "Apply Role:"
-msgstr "Aplicar función:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
"Introducir una función y aplicala a los miembros de la relación escoyíos."
+msgid "Apply Role:"
+msgstr "Aplicar función:"
+
msgid "New Relation"
msgstr "Nueva rellación"
@@ -9960,9 +9968,6 @@ msgstr "Tresparencia d''imaxes"
msgid "Unsupported imagery type: {0}"
msgstr "Tipu d’imaxes sin sofitu: {0}"
-msgid "ERROR"
-msgstr "ERRU"
-
msgid "Next marker"
msgstr "Siguiente marcador"
@@ -10858,14 +10863,6 @@ msgstr "Volver executar los pasos automáticos d''autorización"
msgid "Test Access Token"
msgstr "Probar llave d''Accesu"
-msgid "Please enter your OSM user name"
-msgstr "Por favor, introduza''l so nome d''usuariu de OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"El nome d''usuariu nun puede tar vacíu. Por favor, introduza''l so nome "
-"d''usuariu de OSM"
-
msgid "Please enter your OSM password"
msgstr "Por favor, introduza la so contraseña de OSM"
@@ -13120,6 +13117,14 @@ msgstr "Axustes de la conexón"
msgid "Connection Settings for the OSM server."
msgstr "Configuración de conexón del servidor OSM."
+msgid "Please enter your OSM user name"
+msgstr "Por favor, introduza''l so nome d''usuariu de OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"El nome d''usuariu nun puede tar vacíu. Por favor, introduza''l so nome "
+"d''usuariu de OSM"
+
msgid "Action"
msgstr "Acción"
@@ -13682,6 +13687,14 @@ msgstr ""
"El valor d´atributu ''{0}'' del elementu ''{1}'' nun ta dexáu pa les "
"posibilidaes del servidor. Llogróse''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Fallu al verificar la fecha ''{0}'' respondida pol servidor."
@@ -15080,80 +15093,6 @@ msgstr "Razón ensin especificar"
msgid "Error playing sound"
msgstr "Error reproduciendo soníu"
-msgid "Do nothing"
-msgstr "Nun facer na"
-
-msgid "Report Bug"
-msgstr "Informar de fallu"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Asocedió una esceición inesperada.<br> Esto siempres ye un erru de "
-"codificación. Si ta executando la postrera <br>versión de JOSM, por favor "
-"sía tan atenta de presentar un informe d''erru."
-
-msgid "Update JOSM"
-msgstr "Actualizar JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Un erru inesperáu asocedió. Esto ye debíu siempres a un erru de "
-"programación. <br><br> Sicasí, si tas utilizando una versión antigua de JOSM "
-"({0}), <br> en cuenta de usar la versión probada actual "
-"(<b>{1}</b>).<br><br><b>Por favor actualiza JOSM</br> antes d''unviar un "
-"informe d''erru."
-
-msgid "Unexpected Exception"
-msgstr "Esceición inesperada"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Suprimir otros mensaxes d''erru mientres esta sesión."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Atopó un erru en JOSM. Antes d''informar d''un fallu asegúrese d''actualizar "
-"a la última versión de JOSM equí:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Tamién tendría d''actualizar los sos complementos. Si nenguna opción ayuda, "
-"por favor, presente un informe de erroren el nuesu sistema de siguimientu de "
-"fallos na siguiente dirección:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Ellí la información del erru yá tendrá de ser rellenada por usté. Por favor "
-"incluya información de cómo reproducir l''erru ya intente ufiertar tanto "
-"detalle como-y sía posible."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Per otra parte, si nun funcionar, puede rellenar manualmente la información "
-"nesta URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(El testu yá foi copiáu al to portapapeles.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Atopó un erru en JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15523,9 +15462,6 @@ msgstr "Descarga redirixida a ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Demasiaes redirecciones detectaes a la URL de descarga. Albortando."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Non puede atopase la traducción pal idioma {0}. Revertiendo a {1}."
@@ -15745,6 +15681,84 @@ msgstr "Ignorando xeometría mal formada: {0}"
msgid "Failed to load XML schema."
msgstr "Erru al cargar l''esquema XML."
+msgid "Do nothing"
+msgstr "Nun facer na"
+
+msgid "Report Bug"
+msgstr "Informar de fallu"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Asocedió una esceición inesperada.<br> Esto siempres ye un erru de "
+"codificación. Si ta executando la postrera <br>versión de JOSM, por favor "
+"sía tan atenta de presentar un informe d''erru."
+
+msgid "Update JOSM"
+msgstr "Actualizar JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Un erru inesperáu asocedió. Esto ye debíu siempres a un erru de "
+"programación. <br><br> Sicasí, si tas utilizando una versión antigua de JOSM "
+"({0}), <br> en cuenta de usar la versión probada actual "
+"(<b>{1}</b>).<br><br><b>Por favor actualiza JOSM</br> antes d''unviar un "
+"informe d''erru."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Suprimir otros mensaxes d''erru mientres esta sesión."
+
+msgid "Unexpected Exception"
+msgstr "Esceición inesperada"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Atopó un erru en JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Atopó un erru en JOSM. Antes d''informar d''un fallu asegúrese d''actualizar "
+"a la última versión de JOSM equí:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Tamién tendría d''actualizar los sos complementos. Si nenguna opción ayuda, "
+"por favor, presente un informe de erroren el nuesu sistema de siguimientu de "
+"fallos na siguiente dirección:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Ellí la información del erru yá tendrá de ser rellenada por usté. Por favor "
+"incluya información de cómo reproducir l''erru ya intente ufiertar tanto "
+"detalle como-y sía posible."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Per otra parte, si nun funcionar, puede rellenar manualmente la información "
+"nesta URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(El testu yá foi copiáu al to portapapeles.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16092,14 +16106,14 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
@@ -16107,8 +16121,14 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Estilu Alemán)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS Traces"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16119,15 +16139,12 @@ msgstr "Tresporte Públicu (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Estilu Alemán)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Camboya, Laos, Tailandia, Vietnam bilingüe"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (superposición)"
@@ -16224,6 +16241,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mapa base)"
@@ -16248,14 +16268,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Modelu del Terrén)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Modelu de Superficie)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr ""
@@ -16401,10 +16421,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16459,6 +16479,15 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr ""
@@ -16475,16 +16504,6 @@ msgstr ""
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Mapa vieyu de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr ""
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr ""
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16530,6 +16549,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16590,6 +16612,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16626,10 +16651,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -16731,6 +16753,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -16740,6 +16765,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -17439,6 +17467,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18870,6 +18903,12 @@ msgstr "Cais"
msgid "Motorway"
msgstr "Autopista"
+msgid "Destination"
+msgstr "Destín"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -19462,9 +19501,6 @@ msgstr "Salida d''autopista"
msgid "Number"
msgstr "Númberu"
-msgid "Exit to"
-msgstr "Salida pa"
-
msgid "Services"
msgstr "Servicios"
@@ -19949,6 +19985,15 @@ msgstr "superficie mareal"
msgid "mangrove"
msgstr "manglar"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Agüeriu"
@@ -21100,6 +21145,9 @@ msgstr ""
msgid "Fishing"
msgstr "Pesca"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Club nocherniegu"
@@ -22370,6 +22418,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -23959,8 +24011,8 @@ msgstr "Bolses pa escrementos"
msgid "food"
msgstr "Alimentación"
-msgid "news_papers"
-msgstr "Periódicos"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "billetes d''aparcamientu"
@@ -23974,8 +24026,8 @@ msgstr "abonos de tresporte públicu"
msgid "public_transport_tickets"
msgstr "billetes de de tresporte públicu"
-msgid "SIM-cards"
-msgstr "Tarxetes SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "sellos"
@@ -25253,6 +25305,21 @@ msgstr "espaciu natural"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Ruta de pista"
@@ -25277,9 +25344,6 @@ msgstr "alpín"
msgid "Detour Route"
msgstr "Ruta de desvíu"
-msgid "Destination"
-msgstr "Destín"
-
msgid "Ref of the way this is a detour to"
msgstr "Referencia de la vía en qu''esta ye una esviadura escontra"
@@ -25439,8 +25503,14 @@ msgstr "Camping"
msgid "Test"
msgstr "Prueba"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Decrementando númberos de portal na interpolación de portales"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} ensin {1}"
@@ -25527,6 +25597,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -25625,6 +25700,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -25634,6 +25712,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nome de cai embrivíu"
@@ -29038,6 +29124,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -31484,6 +31630,15 @@ msgstr "Tresporte públicu: activar puntos de ruta"
msgid "Public Transport: Edit waypoint name"
msgstr "Tresporte públicu: editar nome del puntu de ruta"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Escoyeta non válida"
+
msgid "Public transport routes"
msgstr ""
@@ -32314,9 +32469,6 @@ msgstr "Adosar un edificiu"
msgid "Creates individual buildings from a long building."
msgstr "Crear edificios individuales a partir d''un gran edificiu."
-msgid "Invalid selection"
-msgstr "Escoyeta non válida"
-
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 "
@@ -34258,18 +34410,3 @@ msgstr "Dir a conducir"
msgid "Drive a race car on this layer"
msgstr "Conduz un coche de carreres nesta capa"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Patrón de guiones illegal, los valores tienen de ser positivos"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Patrón de guiones illegal, a lo menos un valor tien de ser > 0"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Erru al analizar los estilos Mappaint dende ''{0}''. L´erru foi: [{1}:{2}] "
-#~ "{3}"
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 27cebae..f3d3c96 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: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2013-01-12 17:56+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: 2016-03-13 04:34+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:34+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -147,9 +147,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -171,6 +168,12 @@ msgstr "Qoşmalar"
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -573,9 +576,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1165,9 +1165,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1777,6 +1774,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1926,9 +1947,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2244,8 +2262,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3026,9 +3044,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3048,27 +3063,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4126,6 +4120,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4771,19 +4768,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5756,6 +5753,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6243,51 +6264,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6310,12 +6286,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6738,15 +6708,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6852,9 +6813,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7006,14 +6964,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7098,15 +7048,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7124,6 +7065,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7439,10 +7449,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9098,9 +9108,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9903,12 +9910,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11916,6 +11917,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12426,6 +12433,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13667,62 +13682,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13974,9 +13933,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14161,6 +14117,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14495,13 +14511,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14510,7 +14526,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14522,15 +14544,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14627,6 +14646,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14651,13 +14673,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14804,10 +14826,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14860,29 +14882,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14930,6 +14951,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14990,6 +15014,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15026,10 +15053,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15131,6 +15155,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15140,6 +15167,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15795,6 +15825,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17152,6 +17187,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17728,9 +17769,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18209,6 +18247,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19357,6 +19404,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20625,6 +20675,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22212,7 +22266,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22227,7 +22281,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23482,6 +23536,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23506,9 +23575,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23668,7 +23734,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23752,6 +23824,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23850,6 +23927,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23859,6 +23939,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26958,6 +27046,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29279,6 +29427,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30063,9 +30220,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/be.po b/i18n/po/be.po
index e137391..bccdb8a 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-01-24 13:57+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-25 16:08+0000\n"
"Last-Translator: Viktar Palstsiuk <Unknown>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
"MIME-Version: 1.0\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: 2016-03-13 04:35+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:35+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -102,7 +102,7 @@ msgid "Updating user interface"
msgstr "Абнаўленне інтэрфейсу карыстальніка"
msgid "Failed to save default preferences."
-msgstr ""
+msgstr "Не атрымалася захаваць налады па змаўчанні."
msgid "Ignoring malformed URL: \"{0}\""
msgstr "Неадпаведны URL - ігнаруецца: \"{0}\""
@@ -156,9 +156,6 @@ msgstr "Версія Java: {0}"
msgid "Homepage"
msgstr "Хатняя старонка"
-msgid "Bug Reports"
-msgstr "Звесткі пра памылкі"
-
msgid "Info"
msgstr "Звесткі"
@@ -180,6 +177,12 @@ msgstr "Плагіны"
msgid "About JOSM..."
msgstr "Пра JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Паведаміць пра памылку"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Не атрымалася знайсці рэсурс ''{0}''"
@@ -218,13 +221,13 @@ msgid "Click to abort launching external browsers"
msgstr "Клікніце каб спыніць запуск знешніх браузэраў"
msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Выберыце як-меней 1 ужо адасланую кропку, лінію альбо адносіны"
+msgstr "Выберыце як-меней адзін ужо адасланы пункт, лінію альбо дачыненне."
msgid "Please select the target layer."
-msgstr "Выберыце слой прызначэння"
+msgstr "Выберыце пласт прызначэння"
msgid "Select target layer"
-msgstr "Выберыце слой прызначэння"
+msgstr "Выберыце пласт прызначэння"
msgid "Merge"
msgstr "З’яднанне"
@@ -233,10 +236,10 @@ msgid ""
"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
"to.</html>"
msgstr ""
-"<html>Няма слаёў з якімі можа быць з/яднаны слой<br>''{0}''<br></html>"
+"<html>Няма пластоў, з якімі можа быць з''яднаны пласт<br>''{0}''<br></html>"
msgid "No target layers"
-msgstr "Няма канчатковых слаёў"
+msgstr "Няма канчатковых пластоў"
msgid "Select"
msgstr "Выбар"
@@ -246,16 +249,16 @@ msgid ""
msgstr "Вылучыць на карце аб’екты, абраныя ў спісе уверсе."
msgid "Add imagery layer {0}"
-msgstr "Дадаць слой здымка {0}"
+msgstr "Дадаць пласт здымка {0}"
msgid "Select image format for WMS layer"
msgstr "Выберыце фармат малюнка для WMS пласта"
msgid "Select WMS layers"
-msgstr "Выбраць WMS слой"
+msgstr "Выбраць WMS пласт"
msgid "Add layers"
-msgstr "Дадаць слой"
+msgstr "Дадаць пласт"
msgid "Invalid service URL."
msgstr "Няправільная спасылка сэрвісу WMS"
@@ -264,54 +267,53 @@ msgid "WMS Error"
msgstr "Памылка WMS"
msgid "Could not retrieve WMS layer list."
-msgstr "Немагчыма атрымаць спіс слаёў WMS"
+msgstr "Немагчыма атрымаць спіс пластоў WMS"
msgid "Could not parse WMS layer list."
-msgstr "Немагчыма разабраць спіс слаёў WMS."
+msgstr "Немагчыма разабраць спіс пластоў WMS."
msgid "Add Node..."
msgstr "Дадаць ноду..."
msgid "Add a node by entering latitude / longitude or easting / northing."
msgstr ""
-"Дадаць кропку, вызначыўшы шырату / даўгату або ўсходняе / паўночнае "
-"скланенне."
+"Дадаць пункт, вызначыўшы шырату / даўгату або ўсходні / паўночны зрух."
msgid "Edit: {0}"
msgstr "Змяніць: {0}"
msgid "Align Nodes in Circle"
-msgstr "Размеркаваць кропкі па крузе"
+msgstr "Размеркаваць пункты па крузе"
msgid "Move the selected nodes into a circle."
-msgstr "Зрушыць кропкі ўкруг"
+msgstr "Зрушыць пункты ўкруг"
msgid "Tool: {0}"
msgstr "Інструмент: {0}"
msgid "Not enough nodes in selected ways."
-msgstr "Недастаткова кропак у выдзеленых лініях."
+msgstr "Недастаткова пунктаў у выдзеленых лініях."
msgid "Please select at least four nodes."
-msgstr "Выбераце як-меней чатыры кропкі."
+msgstr "Выбераце як-меней чатыры пункты."
msgid "Cannot determine center of selected nodes."
-msgstr "Немагчыма вызначыць цэнтр для выбраных кропак."
+msgstr "Немагчыма вызначыць цэнтр для выбраных пунктаў."
msgid ""
"One or more nodes involved in this action is outside of the downloaded area."
msgstr ""
-"Адна ці некалькі з задзейнічаных кропак знаходзяцца за межамі загружанай "
+"Адзін ці некалькі з задзейнічаных пунктаў знаходзяцца за межамі загружанай "
"вобласці."
msgid "Align Nodes in Line"
-msgstr "Размеркаваць кропкі ўздоуж лініі"
+msgstr "Размеркаваць пункты ўздоуж лініі"
msgid "Move the selected nodes in to a line."
-msgstr "Зрушыць абраныя кропкі у лінію"
+msgstr "Зрушыць абраныя пункты ў лінію"
msgid "Please select at least three nodes."
-msgstr "Выбераце як-меней тры кропкі."
+msgstr "Выбераце як-меней тры пункты."
msgid "Can not align a polygon. Abort."
msgstr "Немагчыма з палігона стварыць лінію. Адмена."
@@ -326,7 +328,7 @@ msgid "data"
msgstr "дадзеныя"
msgid "layer"
-msgstr "слой"
+msgstr "пласт"
msgid "selection"
msgstr "выбранае"
@@ -410,7 +412,7 @@ msgid ""
"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Немагчыма аб’яднаць лініі<br>(Іх нельга злучыць у адзін шэраг кропак)"
+"Немагчыма аб’яднаць лініі<br>(Іх нельга злучыць у адзін шэраг пунктаў)"
msgid "Reverse Ways"
msgstr "Змяніць накірунак лініі"
@@ -437,7 +439,7 @@ msgid "Copy Coordinates"
msgstr "Капіяваць каардынаты"
msgid "Copy coordinates of selected nodes to clipboard."
-msgstr "Скапіяваць каардынаты выдзеленых кропак у буфер абмену"
+msgstr "Скапіяваць каардынаты выдзеленых пунктаў у буфер абмену"
msgid "Create Circle"
msgstr "Стварыць акружнасць"
@@ -449,7 +451,7 @@ msgid ""
"Please select exactly two or three nodes or one way with exactly two or "
"three nodes."
msgstr ""
-"Выберыце дакладна 2 ці 3 кропкі альбо адну лінію з дакладна 2 ці 3 кропкамі."
+"Выберыце дакладна 2 ці 3 пункты альбо адну лінію з дакладна 2 ці 3 пунктамі."
msgid "Those nodes are not in a circle. Aborting."
msgstr "Ноды не утвараюць акружнасць. Спыняюся."
@@ -473,10 +475,10 @@ msgid "Delete selected objects."
msgstr "Выдаліць выбраныя аб’екты."
msgid "Delete Layer"
-msgstr "Выдаліць слой"
+msgstr "Выдаліць пласт"
msgid "Delete the active layer. Does not delete the associated file."
-msgstr ""
+msgstr "Выдаліць актыўны пласт. Не выдаляе злучаны з ім файл."
msgid "Toggle dialogs panel"
msgstr "Пераключыць панэлі дыялогаў"
@@ -485,13 +487,13 @@ msgid "Toggle dialogs panel, maximize mapview"
msgstr "Хавае панэль дыялогаў, для павелічэння плошчы для рэдагавання"
msgid "Distribute Nodes"
-msgstr "Размеркаваць кропкі"
+msgstr "Размеркаваць пункты"
msgid "Distribute the selected nodes to equal distances along a line."
-msgstr "Размеркаваць кропкі з раўнамерным крокам па лініі."
+msgstr "Размеркаваць пункты з раўнамерным крокам па лініі."
msgid "Ignoring {0} nodes with null coordinates"
-msgstr "Прапушчана {0} кропак з нулявымі каардынатамі"
+msgstr "Прапушчана {0} пунктаў з нулявымі каардынатамі"
msgid ""
"Please select :\n"
@@ -499,8 +501,8 @@ msgid ""
"* Three nodes."
msgstr ""
"Вылучыце:\n"
-"* Адну лінію без самаперасячэнняў з не больш чым дзвюма яе кропкамі;\n"
-"* Тры кропкі."
+"* Адну лінію без самаперасячэнняў з не больш чым дзвюма яе пунктамі;\n"
+"* Тры пункты."
msgid "Download from OSM..."
msgstr "Запампоўка з OSM..."
@@ -528,7 +530,7 @@ msgid "Download OSM object by ID."
msgstr "Запампаваць аб’ект па ID."
msgid "Download parent ways/relations..."
-msgstr "Запампаваць звязаныя лініі/суадносіны"
+msgstr "Запампаваць звязаныя лініі/дачыненні"
msgid "Download objects referring to one of the selected objects"
msgstr ""
@@ -556,7 +558,7 @@ msgid "Follow line"
msgstr "Ісці за лініяй"
msgid "Continues drawing a line that shares nodes with another line."
-msgstr "Працягвае маляваць лінію, якая мае агульныя кропкі з іншай лініяй."
+msgstr "Працягвае маляваць лінію, якая мае агульныя пункты з іншай лініяй."
msgid "Follow"
msgstr "Сачыць"
@@ -583,7 +585,8 @@ msgid "History"
msgstr "Гісторыя"
msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Паказаць гістарычную інфармацыю аб лініях, нодах ці суадносінах OSM."
+msgstr ""
+"Паказаць гістарычную інфармацыю аб лініях, пунктах ці дачыненнях OSM."
msgid "Show history"
msgstr "Паказаць гісторыю"
@@ -594,7 +597,7 @@ msgstr "Гісторыя (на сайце OSM)"
msgid ""
"Display history information about OSM ways, nodes, or relations in web "
"browser."
-msgstr "Паказаць гісторыю змяненняў ліній, кропак ці адносін у браўзэры."
+msgstr "Паказаць гісторыю змяненняў ліній, пунктаў ці дачыненняў у браўзэры."
msgid "New offset"
msgstr "Новае змяшчэнне"
@@ -605,19 +608,16 @@ msgstr "Наладзіць становішча дадзенага пласта
msgid "Adjust imagery offset"
msgstr "Наладзіць зрушэнне дадзенага слою са здымкамі"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
"You can also enter east and north offset in the {0} coordinates.\n"
"If you want to save the offset as bookmark, enter the bookmark name below"
msgstr ""
-"Выкарыстоўвайце стрэлкі на клавіятуры або перацягвайце слой з выявай мышшу, "
+"Выкарыстоўвайце стрэлкі на клавіятуры або перацягвайце пласт з выявай мышшу, "
"каб змяніць змяшчэнне.\n"
-"Можна таксама ўвесці змяшчэнне на Усход і Поўнач ў каардынатах {0}.\n"
-"Каб захаваць змяшчэнне ў закладках, увядзіце імя закладкі ніжэй."
+"Можна таксама ўвесці зрух на Усход і Поўнач ў каардынатах {0}.\n"
+"Каб захаваць зрух ў закладках, увядзіце назву закладкі ніжэй."
msgid "Offset: "
msgstr "Змяшчэнне: "
@@ -636,7 +636,7 @@ msgstr "Пашыраная інфармацыя"
msgid ""
"Display advanced object information about OSM nodes, ways, or relations."
-msgstr "Паказаць падрабязную інфармацыю аб кропках, лініях альбо адносінах"
+msgstr "Паказаць падрабязную інфармацыю аб пунктах, лініях альбо дачыненнях"
msgid "Advanced info (web)"
msgstr "Пашыраная інфармацыя (на сайце OSM)"
@@ -645,7 +645,7 @@ msgid ""
"Display object information about OSM nodes, ways, or relations in web "
"browser."
msgstr ""
-"Паказаць падрабязную інфармацыю аб кропках, лініях ці адносінах у браўзэры."
+"Паказаць падрабязную інфармацыю аб пунктах, лініях ці дачыненнях у браўзэры."
msgid "Join overlapping Areas"
msgstr "З’яднаць плошчы з перакрывам"
@@ -667,12 +667,12 @@ msgstr "Запыт на аб’яднанне палігонаў"
msgid "The selected way has nodes outside of the downloaded data region."
msgid_plural ""
"The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "Выбраныя лініі маюць кропкі паза-межамі запампаванага рэгіёну."
-msgstr[1] "Вылучаныя лініі змяшчаюць кропкі за межамі запампаванай вобласці."
-msgstr[2] "Вылучаныя лініі змяшчаюць кропкі за межамі запампаванай вобласці."
+msgstr[0] "Выбраныя лініі маюць пункты паза-межамі запампаванага рэгіёну."
+msgstr[1] "Вылучаныя лініі змяшчаюць пункты за межамі запампаванай вобласці."
+msgstr[2] "Вылучаныя лініі змяшчаюць пункты за межамі запампаванай вобласці."
msgid "This can lead to nodes being deleted accidentally."
-msgstr "З-за гэтага некаторыя кропкі могуць быць выпадкова выдалены."
+msgstr "З-за гэтага некаторыя пункты могуць быць выпадкова выдалены."
msgid "Are you really sure to continue?"
msgstr "Вы сапраўды упэўнены?"
@@ -687,13 +687,13 @@ msgid "No intersection found. Nothing was changed."
msgstr "Перасячэнні не знойдзены. Зменаў няма."
msgid "Move tags from ways to relations"
-msgstr "Перанесці тэгі з ліній на адносіны"
+msgstr "Перанесці тэгі з ліній на дачыненні"
msgid "Reverting changes"
msgstr "Адмена змяненняў"
msgid "Removed duplicate nodes"
-msgstr "Выдаляе дублюючыя кропкі"
+msgstr "Выдаляе дублюючыя пункты"
msgid "Added node on all intersections"
msgstr "Ноды даданыя да кожнага перасячэння."
@@ -714,7 +714,7 @@ msgid ""
"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Некаторыя з ліній з’яўляліся часткай адносін, якія былі зменены.<br>Калі "
+"Некаторыя з ліній з’яўляліся часткай дачыненняў, якія былі зменены.<br>Калі "
"ласка, праверце, ці не паўсталі памылкі."
msgid "Fix tag conflicts"
@@ -725,13 +725,13 @@ msgstr "Падзяліць лініі на фрагменты"
msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
msgstr ""
-"Выбачайце. Не атрымліваецца апрацаваць адносіны мультыпалігона, які "
+"Выбачайце. Не атрымліваецца апрацаваць дачыненні мультыпалігона, які "
"складаецца з некалькіх знешніх ліній."
msgid ""
"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
msgstr ""
-"Выбачайце. Немагчыма апрацаваць знешнюю лінію ў некалькіх адносінах "
+"Выбачайце. Немагчыма апрацаваць знешнюю лінію ў некалькіх дачыненнях "
"мультыпалігона."
msgid ""
@@ -739,16 +739,16 @@ msgid ""
"relations."
msgstr ""
"Выбачайце. Немагчыма апрацаваць лінію, якая адначасова з’яўляецца знешняй і "
-"ўнутранай ў адносінах мультыпалігона."
+"ўнутранай ў дачыненнях мультыпалігона."
msgid ""
"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
msgstr ""
-"Выбачайце. Немагчыма апрацаваць ўнутраную лінію ў некалькіх адносінах "
+"Выбачайце. Немагчыма апрацаваць ўнутраную лінію ў некалькіх дачыненнях "
"мультыпалігона."
msgid "Removed Element from Relations"
-msgstr "Выдалены з адносін элемент"
+msgstr "Выдалены з дачыненняў элемент"
msgid "Remove tags from inner ways"
msgstr "Выдаліць меткі з нутраных ліній"
@@ -757,16 +757,16 @@ msgid "Join Areas Function"
msgstr "Функцыя аб’яднання палігонаў"
msgid "Join Node to Way"
-msgstr "Уключыць кропку ў лінію"
+msgstr "Уключыць пункт ў лінію"
msgid "Include a node into the nearest way segments"
-msgstr "Уключыць кропку ў сегменты бліжэйшых ліній"
+msgstr "Уключыць пункт ў сегменты бліжэйшых ліній"
msgid "Move Node onto Way"
-msgstr "Перамясціць кропку на лінію"
+msgstr "Перамясціць пункт на лінію"
msgid "Move the node onto the nearest way segments and include it"
-msgstr "Перамяшчае кропку на бліжэйшую лінію і ўключае кропку ў яе склад"
+msgstr "Перамяшчае пункт на бліжэйшую лінію і ўключае пункт ў яе склад"
msgid "No Shortcut"
msgstr "Няма гарачай клавішы"
@@ -853,13 +853,13 @@ msgid "No valid WMS URL or id"
msgstr "Няма верных WMS URL або ID"
msgid "Merge layer"
-msgstr "Зліць слой"
+msgstr "Зліць пласт"
msgid "Merge the current layer into another layer"
-msgstr "Зліць гэты слой у другі"
+msgstr "Зліць гэты пласт у другі"
msgid "Merging layers with different upload policies"
-msgstr "Аб’яднанне слаёў з рознымі палітыкамі перадачы на сервер"
+msgstr "Аб’яднанне пластоў з рознымі палітыкамі перадачы на сервер"
msgid ""
"You are about to merge data between layers ''{0}'' and ''{1}''.<br /><br "
@@ -882,41 +882,41 @@ msgid "Ignore this hint and merge anyway"
msgstr "Ігнараваць раду і працягнуць аб’яднанне"
msgid "Merge Nodes"
-msgstr "Аб’яднаць кропкі"
+msgstr "Аб’яднаць пункты"
msgid "Merge nodes into the oldest one."
-msgstr "Аб’яднаць кропкі ў адну (больш старую)"
+msgstr "Аб’яднаць пункты ў адзін (больш стары)"
msgid ""
"Please select at least two nodes to merge or one node that is close to "
"another node."
msgstr ""
-"Абярыце сама меней дзве кропкі для аб’яднання ці адну кропку, размешчаную "
-"побач з іншай кропкай."
+"Абярыце сама меней два пункты для аб’яднання ці адзін пункт, размешчаны "
+"побач з іншым пунктам."
msgid "Abort Merging"
msgstr "Перапыніць аб’яднанне"
msgid "Click to abort merging nodes"
-msgstr "Націсніце, каб перапыніць працэс аб’яднання кропак"
+msgstr "Націсніце, каб перапыніць працэс аб’яднання пунктаў"
msgid ""
"Cannot merge nodes: Would have to delete way {0} which is still used by {1}"
msgstr ""
-"Немагчыма аб’яднаць кропкі: давялося б выдаліць лінію {0}, якая усё яшчэ "
+"Немагчыма аб’яднаць пункты: давялося б выдаліць лінію {0}, якая усё яшчэ "
"выкарыстоўваецца {1}"
msgid "Merge {0} node"
msgid_plural "Merge {0} nodes"
-msgstr[0] "Аб’яднаць {0} кропку"
-msgstr[1] "Аб’яднаць {0} кропкі"
-msgstr[2] "Аб’яднаць {0} кропак"
+msgstr[0] "Аб’яднаць {0} пункт"
+msgstr[1] "Аб’яднаць {0} пункты"
+msgstr[2] "Аб’яднаць {0} пунктаў"
msgid "Merge selection"
msgstr "Аб’яднаць вылучанае"
msgid "Merge the currently selected objects into another layer"
-msgstr "Аб’яднаць вылучаныя аб’екты ў іншы слой"
+msgstr "Аб’яднаць вылучаныя аб’екты ў іншы пласт"
msgid "Merging too many objects with different upload policies"
msgstr ""
@@ -937,7 +937,7 @@ msgid "Mirror"
msgstr "Адлюстраваць"
msgid "Mirror selected nodes and ways."
-msgstr "Адлюстраваць выбраны кропкі й лініі"
+msgstr "Адлюстраваць выбраны пункты й лініі"
msgid "Please select at least one node or way."
msgstr "Выберыце як-меней 1 ноду ці лінію"
@@ -970,13 +970,13 @@ msgid "Move Node..."
msgstr "Перанесьці ноду"
msgid "Edit latitude and longitude of a node."
-msgstr "Правіць даўгату і шырату кропкі"
+msgstr "Правіць даўгату і шырату пункту"
msgid "New Layer"
-msgstr "Новы слой"
+msgstr "Новы пласт"
msgid "Create a new map layer."
-msgstr "Стварыць новы слой мапы"
+msgstr "Стварыць новы пласт карты"
msgid "URL Files"
msgstr "URL Файлы"
@@ -1042,10 +1042,10 @@ msgid "Open an URL."
msgstr "Адкрыць URL."
msgid "Separate Layer"
-msgstr "Асобны слой"
+msgstr "Асобны пласт"
msgid "Select if the data should be downloaded into a new layer"
-msgstr "Ці трэба каб дадзеныя былі запампаваны на асобны слой"
+msgstr "Ці трэба каб дадзеныя былі запампаваны на асобны пласт"
msgid "Enter URL to download:"
msgstr "Пазначце URL для запампоўкі:"
@@ -1089,16 +1089,16 @@ msgid ""
"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
msgstr ""
"<h3>Калі выбрана адна або некалькі ліній, фігура роўніцца так што застаюцца "
-"толькі вуглы 90 або 180 градусаў</h3>Магчыма дадаць 2 кропкі да выбраных. "
-"Тады накірунак раўнання задаецца гэтымі дзвюмя кропкамі. (Затым, магчыма "
-"адмяніць раўнанне некаторых кропкак:<br>Выберыце іх і выкарыстайце "
+"толькі вуглы 90 або 180 градусаў</h3>Магчыма дадаць 2 пункты да выбраных. "
+"Тады накірунак раўнання задаецца гэтымі двума пунктамі. (Затым, магчыма "
+"адмяніць раўнанне некаторых пунктаў:<br>Выберыце іх і выкарыстайце "
"Артаганалізацыя / Адмяніць. Звычайна гэта Shift-Q.)"
msgid "Orthogonalize Shape"
msgstr "Артаганалізаваць фігуру"
msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr "Выраўняць кропкі так, каб усе вуглы былі 90 або 180 градусаў"
+msgstr "Выраўняць пункты так, каб усе вуглы былі 90 або 180 градусаў"
msgid "Orthogonalize Shape / Undo"
msgstr "Артаганалізацыя фігуры / Адмяніць"
@@ -1113,7 +1113,7 @@ msgid ""
"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
"previous Orthogonalize Shape action!"
msgstr ""
-"Зрабіць куты прамымі / Адмяніць<br>Абярыце кропкі, перамешчаныя папярэднім "
+"Зрабіць куты прамымі / Адмяніць<br>Абярыце пункты, перамешчаныя папярэднім "
"дзеяннем «Зрабіць куты прамымі»!"
msgid ""
@@ -1132,7 +1132,7 @@ msgid "Usage"
msgstr "Выкарыстанне"
msgid "Selection must consist only of ways and nodes."
-msgstr "Выбірайце толькi лініі альбо кропкі"
+msgstr "Выбірайце толькi лініі альбо пункты"
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
@@ -1276,9 +1276,6 @@ msgstr "Таксама змяніць імя файлу"
msgid "Could not rename file ''{0}''"
msgstr "Немагчама змяніць імя файла ''{0}''"
-msgid "Report bug"
-msgstr "Паведаміць пра памылку"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Стварыць картку ў сістэме адсочвання памылак JOSM"
@@ -1435,7 +1432,7 @@ msgid "Simplify Way"
msgstr "Спрасціць лінію"
msgid "Delete unnecessary nodes from a way."
-msgstr "Выдаліць лішнія кропкі з лініі"
+msgstr "Выдаліць лішнія пункты з лініі"
msgid "Please select at least one way to simplify."
msgstr "Выберыце як-меней 1 лінію для спрашчэння"
@@ -1464,9 +1461,9 @@ msgstr[2] "Спрасціць {0} ліній"
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Спрасціць лінію (выдаліць {0} кропку)"
-msgstr[1] "Спрасціць лінію (выдаліць {0} кропкі)"
-msgstr[2] "Спрасціць лінію (выдаліць {0} кропак)"
+msgstr[0] "Спрасціць лінію (выдаліць {0} пункт)"
+msgstr[1] "Спрасціць лінію (выдаліць {0} пункты)"
+msgstr[2] "Спрасціць лінію (выдаліць {0} пунктаў)"
msgid "Split Way"
msgstr "Падзяліць лінію"
@@ -1476,19 +1473,20 @@ msgstr "Падзяліць лінію ў вылучанай кропцы."
msgid "Cannot split since another split operation is already in progress"
msgstr ""
+"Немагчыма выканаць падзел, пакуль іншая аперацыя падзелу не завершана"
msgid ""
"The current selection cannot be used for splitting - no node is selected."
-msgstr "Цяперашнее вылучэнне немагчыма падзяліць - ня вылучана кропка."
+msgstr "Цяперашнее вылучэнне немагчыма падзяліць - ня вылучаны пункт."
msgid "The selected nodes do not share the same way."
-msgstr "Выбраныя кропкі не належаць адной лініі."
+msgstr "Выбраныя пункты не належаць адной лініі."
msgid "The selected node is not in the middle of any way."
msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "Вылучаная кропка не знаходзіцца ў сярэдзіне якой-небудзь лініі."
-msgstr[1] "Вылучаныя кропкі не знаходзяцца ў сярэдзіне якой-небудзь лініі."
-msgstr[2] "Вылучаныя кропкі не знаходзяцца ў сярэдзіне якой-небудзь лініі."
+msgstr[0] "Вылучаны пункт не знаходзіцца ў сярэдзіне якой-небудзь лініі."
+msgstr[1] "Вылучаныя пункты не знаходзяцца ў сярэдзіне якой-небудзь лініі."
+msgstr[2] "Вылучаныя пункты не знаходзяцца ў сярэдзіне якой-небудзь лініі."
msgid ""
"There is more than one way using the node you selected. Please select the "
@@ -1497,13 +1495,13 @@ msgid_plural ""
"There is more than one way using the nodes you selected. Please select the "
"way also."
msgstr[0] ""
-"Ёсць некалькі ліній, якія выкарыстоўваюць кропку, якую вы вылучылі. Калі "
+"Ёсць некалькі ліній, якія выкарыстоўваюць пункт, які вы вылучылі. Калі "
"ласка, вылучыце лінію таксама."
msgstr[1] ""
-"Ёсць некалькі ліній, якія выкарыстоўваюць кропкі, якія вы вылучылі. Калі "
+"Ёсць некалькі ліній, якія выкарыстоўваюць пункты, якія вы вылучылі. Калі "
"ласка, вылучыце лінію таксама."
msgstr[2] ""
-"Ёсць некалькі ліній, якія выкарыстоўваюць кропкі, якія вы вылучылі. Калі "
+"Ёсць некалькі ліній, якія выкарыстоўваюць пункты, якія вы вылучылі. Калі "
"ласка, вылучыце лінію таксама."
msgid "Which way segment should reuse the history of {0}?"
@@ -1516,27 +1514,27 @@ msgid "Segment {0}: {1}"
msgstr "Сегмент {0}: {1}"
msgid "You must select two or more nodes to split a circular way."
-msgstr "Выберыце як-меней 2 кропкі каб падзяліць кругавую лінію"
+msgstr "Выберыце як-меней 2 пункты каб падзяліць кругавую лінію"
msgid ""
"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
"middle of the way.)"
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>Праверце яго і, пры неабходнасці, выправіце."
msgid ""
"A relation membership was copied to all new ways.<br>You should verify this "
"and correct it when necessary."
msgstr ""
-"Удзел у адносінах скапіяваны ва ўсе новыя лініі.<br>Праверце яго і, пры "
+"Удзел у дачыненні скапіяваны ва ўсе новыя лініі.<br>Праверце яго і, пры "
"неабходнасці, выправіце."
msgid "Split way {0} into {1} part"
@@ -1549,7 +1547,7 @@ msgid "Toggle GPX Lines"
msgstr "Пераключыць лініі GPX"
msgid "Draw lines between raw gps points."
-msgstr "Правесці лініі паміж кропкамі gps"
+msgstr "Правесці лініі паміж пунктамі gps"
msgid "Toggles the global setting ''{0}''."
msgstr "Змяніць глабальню настройку ''{0}''."
@@ -1561,7 +1559,7 @@ msgid "UnGlue Ways"
msgstr "Расклеіць лініі"
msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Дубліраваць кропкі, праз якія праходзяць некалькі ліній"
+msgstr "Дубліраваць пункты, праз якія праходзяць некалькі ліній"
msgid "This node is not glued to anything else."
msgstr "Гэтая нода нікуды не прывязаная."
@@ -1591,7 +1589,7 @@ msgstr ""
msgid ""
"* One way that has one or more nodes that are used by more than one way, or"
-msgstr "* Адну лінію, у якой ёсць агульныя з другімі лініямі кропкі альбо"
+msgstr "* Адну лінію, у якой ёсць агульныя з другімі лініямі пункты альбо"
msgid ""
"* One way and one or more of its nodes that are used by more than one way."
@@ -1605,19 +1603,19 @@ msgid ""
"their\n"
"own copy and all nodes will be selected."
msgstr ""
-"Заўвага: Калі выбрана лінія, яна атрымае новыя кропкі скапіраваныя з "
+"Заўвага: Калі выбрана лінія, яна атрымае новыя пункты скапіраваныя з "
"расклееных і яны будуць выбраныя. Інакш, усе лініі атрымаюць асабістыя "
"копіі\n"
-"і усе кропкі будуць выбраны"
+"і усе пункты будуць выбраны"
msgid "Existing node"
-msgstr "Існуючая кропка"
+msgstr "Існуючы пункт"
msgid "Both nodes"
-msgstr "Абедзьве кропкі"
+msgstr "Абодва пункты"
msgid "New node"
-msgstr "Новая кропка"
+msgstr "Новы пункт"
msgid "Tags / Memberships"
msgstr "Тэгі / Удзел"
@@ -1626,25 +1624,25 @@ msgid "Unglue"
msgstr "Раз''яднаць"
msgid "Where should the tags of the node be put?"
-msgstr ""
+msgstr "Куды перанесці тэгі пункту?"
msgid "Where should the memberships of this node be put?"
-msgstr ""
+msgstr "Куды перанесці ўдзел гэтага пункта ў дачыненнях?"
msgid "Unglued Node"
msgstr "Расклееная нода"
msgid "Dupe into {0} node"
msgid_plural "Dupe into {0} nodes"
-msgstr[0] "Падзяліць на {0} кропку"
-msgstr[1] "Падзяліць на {0} кропкі"
-msgstr[2] "Падзяліць на {0} кропак"
+msgstr[0] "Падзяліць на {0} пункт"
+msgstr[1] "Падзяліць на {0} пункты"
+msgstr[2] "Падзяліць на {0} пунктаў"
msgid "Dupe {0} node into {1} nodes"
msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Стварыць {1} копій кропкі {0}"
-msgstr[1] "Стварыць {1} копій кропкі {0}"
-msgstr[2] "Стварыць {1} копій кропкі {0}"
+msgstr[0] "Стварыць {1} копій {0} пункта"
+msgstr[1] "Стварыць {1} копій {0} пунктаў"
+msgstr[2] "Стварыць {1} копій {0} пунктаў"
msgid "Unglue confirmation"
msgstr "Запыт на раз’яднанне"
@@ -1656,7 +1654,7 @@ msgid ""
msgstr ""
"Вы збіраецеся раз’яднаць пункту па-за запампаванай зоны. <br> Гэта можа "
"прывесці да памылак, паколькі нябачныя для Вас аб’екты могуць выкарыстоўваць "
-"гэтыя кропкі. <br> Вы сапраўды хочаце раз’яднаць іх?"
+"гэтыя пункты. <br> Вы сапраўды хочаце раз’яднаць іх?"
msgid ""
"You are about to unglue incomplete objects.<br>This will cause problems "
@@ -1667,39 +1665,41 @@ msgstr ""
msgid "Unglueing affected {0} relation: {1}"
msgid_plural "Unglueing affected {0} relations: {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Раз''яднанне закранула {0} дачыненне: {1}"
+msgstr[1] "Раз''яднанне закранула {0} дачыненні: {1}"
+msgstr[2] "Раз''яднанне закранула {0} дачыненняў: {1}"
msgid "Ensure that the relation has not been broken!"
msgid_plural "Ensure that the relations have not been broken!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Пераканаецеся, што дачыненне не парушана!"
+msgstr[1] "Пераканаецеся, што дачыненні не парушаны!"
+msgstr[2] "Пераканаецеся, што дачыненні не парушаны!"
msgid "Disconnect Node from Way"
-msgstr "Адлучыць кропку ад лініі"
+msgstr "Адлучыць пункт ад лініі"
msgid "Disconnect nodes from a way they currently belong to"
-msgstr "Адлучыць кропкі ад лініі, да якой яны прыналежаць"
+msgstr "Адлучыць пункты ад лініі, да якой яны прыналежаць"
msgid "Select at least one node to be disconnected."
-msgstr "Абярыце хоць бы адну кропку для адлучэння"
+msgstr "Абярыце хоць бы адзін пункт для адлучэння"
msgid "Selected node cannot be disconnected from anything."
msgid_plural "Selected nodes cannot be disconnected from anything."
-msgstr[0] "Вылучаную кропку нельга ад чаго-небудзь адлучыць."
-msgstr[1] "Вылучаныя кропкі нельга ад чаго-небудзь адлучыць."
-msgstr[2] "Вылучаныя кропкі нельга ад чаго-небудзь адлучыць."
+msgstr[0] "Вылучаны пункт нельга ад чаго-небудзь адлучыць."
+msgstr[1] "Вылучаныя пункты нельга ад чаго-небудзь адлучыць."
+msgstr[2] "Вылучаныя пункты нельга ад чаго-небудзь адлучыць."
msgid ""
"The affected way would disappear after disconnecting the selected node."
msgid_plural ""
"The affected way would disappear after disconnecting the selected nodes."
-msgstr[0] "Закранутая лінія знікне пасля адлучэння вылучанай кропкі."
-msgstr[1] "Закранутая лінія знікне пасля адлучэння вылучаных кропак."
-msgstr[2] "Закранутая лінія знікне пасля адлучэння вылучаных кропак."
+msgstr[0] "Закранутая лінія знікне пасля адлучэння вылучанага пункта."
+msgstr[1] "Закранутая лінія знікне пасля адлучэння вылучаных пунктаў."
+msgstr[2] "Закранутая лінія знікне пасля адлучэння вылучаных пунктаў."
msgid "Some irrelevant nodes have been removed from the selection"
-msgstr "Некаторыя непадыходныя кропкі былі выдалены з вылучэння"
+msgstr "Некаторыя непадыходныя пункты былі выдалены з вылучэння"
msgid "Undo"
msgstr "Вярнуць"
@@ -1723,7 +1723,7 @@ msgid "Update data"
msgstr "Абнавіць дадзеныя"
msgid "Updates the objects in the active data layer from the server."
-msgstr "Абновіць аб’екты на бягучым слаі з сервера"
+msgstr "Абновіць аб’екты на бягучым пласце з сервера"
msgid "Update modified"
msgstr "Абнавіць праўленае"
@@ -1755,14 +1755,14 @@ msgid "Upload data"
msgstr "Адаслаць на сервер"
msgid "Upload all changes in the active data layer to the OSM server"
-msgstr "Адаслаць на OSM сервер усе змены на бягучым слаі"
+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>Дадзеныя на запампоўку на сервер OSM прысутныя ў нявырашаных "
-"канфліктах на слаі ''{0}''.<br>Спачатку трэба вырашыць канфлікты.</html>"
+"<html>Звесткі для адсылкі на сервер OSM удзельнічаюць ў нявырашаных "
+"канфліктах на пласце ''{0}''.<br>Спачатку трэба вырашыць канфлікты.</html>"
msgid "Upload discouraged"
msgstr "Перадача не рэкамендавана"
@@ -1832,8 +1832,8 @@ msgstr "Рэжым прытрымлівання"
msgid "Enable/disable automatic moving of the map view to last placed node"
msgstr ""
-"Уключыць / адключыць аўтаперамяшчэнне бачнай вобласці карты да апошняй "
-"размешчанай кропкі"
+"Уключыць / адключыць аўтаперамяшчэнне бачнай вобласці карты да апошняга "
+"размешчанага пункта"
msgid "Toggle Viewport Following"
msgstr "Пераключыць рэжым прытрымлівання"
@@ -1866,19 +1866,19 @@ 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 "Маштабаванне блакаванае, таму што вы не абралі ўдзельніка"
msgid "Zoom to the first selected node"
-msgstr "Наблізіцца да першай выдзеленай кропкі"
+msgstr "Наблізіцца да першага выдзеленага пункта"
msgid "Zooming disabled because layer of this way is not active"
-msgstr "Маштабаванне адключана бо слой з гэтай лініяй ня актыўны"
+msgstr "Маштабаванне адключана бо пласт з гэтай лініяй ня актыўны"
msgid "Zooming disabled because there is no selected node"
-msgstr "Маштабаванне адключана бо кропка не абрана"
+msgstr "Маштабаванне адключана бо пункт не абраны"
msgctxt "audio"
msgid "Back"
@@ -1938,6 +1938,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Граць павольней"
+msgid "Downloading changeset content"
+msgstr "Спампоўка з сервера змесціва пакета правак"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Спампоўка з сервера пакета правак {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Спампоўка з сервера змесціва для пакета правак {2}..."
+
+msgid "Download changesets"
+msgstr "Запампаваць з сервера пакеты правак"
+
+msgid "Querying and downloading changesets"
+msgstr "Запыт і спампоўка пакетаў правак з сервера"
+
+msgid "Determine user id for current user..."
+msgstr "Вызначэнне ID карыстальніка для бягучага карыстальніка..."
+
+msgid "Query and download changesets ..."
+msgstr "Запытаць і запампаваць з сервера пакеты правак ..."
+
+msgid "Errors during download"
+msgstr "Памылкі пры запампоўцы з сервера"
+
msgid "Download GPS"
msgstr "Спампаваць GPS дадзеныя"
@@ -2033,13 +2057,13 @@ msgstr[1] "Канфлікта падчас запампоўкі з сервер
msgstr[2] "Канфліктаў падчас запампоўкі з сервера"
msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Загрузка бацькоў кропкі {2}"
+msgstr "({0}/{1}) Загрузка бацькоў пункта {2}"
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 "Загрузіць сеанс"
@@ -2107,9 +2131,6 @@ msgstr "Выдаленыя або перамешчаныя аб’екты"
msgid "The following errors occurred during mass download: {0}"
msgstr "Падчас масавай запампоўкі адбыліся наступныя памылкі: {0}"
-msgid "Errors during download"
-msgstr "Памылкі пры запампоўцы з сервера"
-
msgid "Error during download"
msgstr "Памылка падчас запампоўкі з сервера"
@@ -2139,7 +2160,7 @@ msgstr "Рэжым выдалення"
msgid "Delete nodes or ways."
msgstr ""
-"Выдаліць вылучаныя кропкі і лініі (Увага! Пры націску на гэтую кнопку, "
+"Выдаліць вылучаныя пункты і лініі (Увага! Пры націску на гэты пункт, "
"вылучаныя аб’екты будзе выдалены без дыялогу)."
msgid "Mode: {0}"
@@ -2150,14 +2171,14 @@ msgid ""
"when deleting a way. Ctrl: delete referring objects."
msgstr ""
"Клікніце для выдалення. Shift: выдаліць сегмент. Alt: не выдаляць "
-"невыкарыстоўваемыя кропкі пры выдаленні лініі. Ctrl: выдаліць спасылаючыя "
+"невыкарыстоўваемыя пункты пры выдаленні лініі. Ctrl: выдаліць спасылаючыя "
"аб’екты."
msgid "Draw"
msgstr "Маляваць"
msgid "Draw nodes"
-msgstr "Маляваць кропкі"
+msgstr "Маляваць пункты"
msgid "Mode: Draw Angle snapping"
msgstr "Рэжым: Маляванне з прывязкай да кутоў"
@@ -2172,37 +2193,37 @@ msgid "Cannot add a node outside of the world."
msgstr "Кропка не можа быць дададзеная за межамі свету."
msgid "Add node"
-msgstr "Дадаць кропку"
+msgstr "Дадаць пункт"
msgid "Add node into way"
-msgstr "Уставіць кропку ў лінію"
+msgstr "Уставіць пункт ў лінію"
msgid "Connect existing way to node"
-msgstr "Далучыць лінію да кропкі"
+msgstr "Далучыць лінію да пункта"
msgid "Add a new node to an existing way"
-msgstr "Дадаць новую кропку да лініі"
+msgstr "Дадаць новы пункт да лініі"
msgid "Add node into way and connect"
-msgstr "Дадаць кропку да лініі і далучыць"
+msgstr "Дадаць пункт да лініі і далучыць"
msgid "Create new node."
-msgstr "Стварыць новую кропку."
+msgstr "Стварыць новы пункт."
msgid "Select node under cursor."
-msgstr "Вылучыць кропку пад курсорам."
+msgstr "Вылучыць пункт пад курсорам."
msgid "Insert new node into way."
msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Уставіць новую кропку ў {0} лінію"
-msgstr[1] "Уставіць новую кропку ў {0} лініі"
-msgstr[2] "Уставіць новую кропку ў {0} ліній"
+msgstr[0] "Уставіць новы пункт ў {0} лінію"
+msgstr[1] "Уставіць новы пункт ў {0} лініі"
+msgstr[2] "Уставіць новы пункт ў {0} ліній"
msgid "Start new way from last node."
-msgstr "Пачаць новую лінію з апошняй кропкі."
+msgstr "Пачаць новую лінію з апошняга пункта."
msgid "Continue way from last node."
-msgstr "Працягнуць лінію з апошняй кропкі."
+msgstr "Працягнуць лінію з апошняга пункта."
msgid "Angle snapping active."
msgstr "Уключана прывязка да кутоў."
@@ -2217,7 +2238,7 @@ msgid "Show helper geometry"
msgstr "Паказваць дапаможную лінію"
msgid "Snap to node projections"
-msgstr "Прывязка да праекцый кропак"
+msgstr "Прывязка да праекцый пунктаў"
msgid "Disable"
msgstr "Адключыць"
@@ -2268,7 +2289,7 @@ msgid ""
msgstr ""
"Цягнуць сегмент лініі - стварыць прастакутнік. Цягнуць з Ctrl - перамясціць "
"сегмент уздоўж яго нармалі. Цягнуць з Alt - стварыць новы прастакутнік. "
-"Двойчы пстрыкнуць - дадаць новую кропку."
+"Двойчы пстрыкнуць - дадаць новы пункт."
msgid "Dual alignment active."
msgstr "Падвойнае выраўноўванне ўключана."
@@ -2283,7 +2304,7 @@ msgstr ""
msgid ""
"Move the node along one of the segments, then release the mouse button."
msgstr ""
-"Перамясціце кропку ўздоўж аднаго з сегментаў, затым адпусціце кнопку мышы."
+"Перамясціце пункт ўздоўж аднаго з сегментаў, затым адпусціце кнопку мышы."
msgid "Draw a rectangle of the desired size, then release the mouse button."
msgstr "Намалюйце прастакутнік жаданых памераў, і адпусціце кнопку мышы."
@@ -2316,31 +2337,31 @@ msgid ""
"Click to add a new node. Release Ctrl to move existing nodes or hold Alt to "
"delete."
msgstr ""
-"Клікніце, каб дадаць новую кропку. Адпусціце Ctrl для перамяшчэння існуючых "
-"кропак ці ўтрымлівайце націснутай Alt для выдалення."
+"Клікніце, каб дадаць новы пункт. Адпусціце Ctrl для перамяшчэння існуючых "
+"пунктаў ці ўтрымлівайце націснутай Alt для выдалення."
msgid ""
"Click to delete the highlighted node. Release Alt to move existing nodes or "
"hold Ctrl to add new nodes."
msgstr ""
-"Клікніце, каб выдаліць выдзеленую кропку. Адпусціце Alt для перамяшчэння "
-"існуючых кропак ці ўтрымлівайце націснутай Ctrl для дадання новых кропак."
+"Клікніце, каб выдаліць выдзелены пункт. Адпусціце Alt для перамяшчэння "
+"існуючых пунктаў ці ўтрымлівайце націснутай Ctrl для дадання новых пунктаў."
msgid ""
"Click to move the highlighted node. Hold Ctrl to add new nodes, or Alt to "
"delete."
msgstr ""
-"Клікніце, каб перамясціць вылучаную кропку. Ўтрымлівайце націснутай Ctrl для "
-"дадання новых кропак ці Alt для выдалення."
+"Клікніце, каб перамясціць вылучаны пункт. Ўтрымлівайце націснутай Ctrl для "
+"дадання новых пунктаў ці Alt для выдалення."
msgid "Add a new node to way"
msgid_plural "Add a new node to {0} ways"
-msgstr[0] "Дадаць новую кропку да {0} лініі"
-msgstr[1] "Дадаць новую кропку да {0} ліній"
-msgstr[2] "Дадаць новую кропку да {0} ліній"
+msgstr[0] "Дадаць новы пункт да {0} лініі"
+msgstr[1] "Дадаць новы пункт да {0} ліній"
+msgstr[2] "Дадаць новы пункт да {0} ліній"
msgid "Cannot delete node that has tags"
-msgstr "Нельга выдаліць кропку, якая мае тэгі"
+msgstr "Нельга выдаліць пункт, якая мае тэгі"
msgid "Parallel"
msgstr "Паралельна"
@@ -2423,7 +2444,7 @@ msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Адпусціце кнопку мышы, каб вылучыць аб’екты ў прамавугольніку."
msgid "Ctrl to merge with nearest node."
-msgstr "Ctrl для аб’яднання з бліжэйшай кропкай."
+msgstr "Ctrl для аб’яднання з бліжэйшым пунктам."
msgid "Release the mouse button to stop moving."
msgstr "Адпусціце кнопку мышы, каб спыніць перамяшчэнне."
@@ -2445,9 +2466,9 @@ msgstr ""
msgid "Add and move a virtual new node to way"
msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Дадайце або перамясціце новую віртуальную кропку на {0} лінію"
-msgstr[1] "Дадайце або перамясціце новую віртуальную кропку на {0} лініі"
-msgstr[2] "Дадайце або перамясціце новую віртуальную кропку на {0} ліній"
+msgstr[0] "Дадайце або перамясціце новую віртуальны пункт на {0} лінію"
+msgstr[1] "Дадайце або перамясціце новую віртуальны пункт на {0} лініі"
+msgstr[2] "Дадайце або перамясціце новую віртуальны пункт на {0} ліній"
msgid "Zoom"
msgstr "Маштабаванне"
@@ -2471,39 +2492,41 @@ msgid "Add selection to relation"
msgstr "Дадаць вылучэнне да стаўлення"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
+"{0}Даданне вылучанага ў дачыненне{1}: для пазбягання паломак праверце кожнае "
+"асобнае дачыненне!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] "Дадаць вылучанае да {0} адносіны"
-msgstr[1] "Дадаць вылучанае да {0} адносін"
-msgstr[2] "Дадаць вылучанае да {0} адносін"
+msgstr[0] "Дадаць вылучанае да {0} дачынення"
+msgstr[1] "Дадаць вылучанае да {0} дачыненняў"
+msgstr[2] "Дадаць вылучанае да {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 "
@@ -2512,37 +2535,38 @@ msgid_plural ""
"You are about to open <b>{0}</b> different relation editors "
"simultaneously.<br/>Do you want to continue?"
msgstr[0] ""
-"Вы збіраецеся адкрыць <b>{0}</b> рэдактар адносін адначасова.<br/>Працягнуць?"
+"Вы збіраецеся адкрыць <b>{0}</b> рэдактар дачынення "
+"адначасова.<br/>Працягнуць?"
msgstr[1] ""
-"Вы збіраецеся адкрыць <b>{0}</b> рэдактара адносін "
+"Вы збіраецеся адкрыць <b>{0}</b> рэдактара дачынення "
"адначасова.<br/>Працягнуць?"
msgstr[2] ""
-"Вы збіраецеся адкрыць <b>{0}</b> рэдактараў адносін "
+"Вы збіраецеся адкрыць <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 "Выбраць удзельнікаў (дадаць)"
@@ -2551,16 +2575,16 @@ msgid "Select members"
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 "<not>"
@@ -2738,7 +2762,7 @@ msgid "all ways"
msgstr "усе лініі"
msgid "all relations"
-msgstr "усе адносіны"
+msgstr "усе дачыненні"
msgid "all closed ways"
msgstr "усе замкнёныя лініі"
@@ -2770,19 +2794,19 @@ msgstr "уласцівасці"
msgid ""
"ways with at least 20 nodes, or relations containing at least 20 nodes"
msgstr ""
-"лініі прынамсі з 20 кропак ці адносіны, якія змяшчаюць не меней 20 кропак"
+"лініі прынамсі з 20 пунктаў ці дачыненні, якія змяшчаюць не меней 20 пунктаў"
msgid ""
"nodes with at least 3 referring ways, or relations containing at least 3 ways"
msgstr ""
-"кропкі, якія ўваходзяць у 3 ці больш лініі, ці адносіны, што змяшчаюць не "
+"пункты, якія ўваходзяць у 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 м²"
@@ -2815,16 +2839,16 @@ msgid "all parents of objects matching the expression"
msgstr "усе бацькоўскія аб’екты адпаведныя выразу"
msgid "relation containing a member of role <i>stop</i>"
-msgstr "адносіны, што змяшчаюць ўдзельніка з роляй <i>stop</i>"
+msgstr "дачыненне, што змяшчае ўдзельніка з роляй <i>stop</i>"
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr "аб''екты, якія з''яўляюцца часткай адносін з роляй <i>stop</i>"
+msgstr "аб''екты, якія з''яўляюцца часткай дачынення з роляй <i>stop</i>"
msgid "n-th member of relation and/or n-th node of way"
-msgstr "n-ы ўдзельнік адносін і/або n-ая кропка лініі"
+msgstr "n-ы ўдзельнік дачынення і/або n-ы пункт лініі"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr "кожны n-ы ўдзельнік адносін і/або кожная n-ая кропка лініі"
+msgstr "кожны n-ы ўдзельнік дачынення і/або кожная n-ы пункт лініі"
msgid "view"
msgstr "прагляд"
@@ -2834,14 +2858,15 @@ msgstr "аб’екты ў бягучым полі бачнасці"
msgid "objects (and all its way nodes / relation members) in current view"
msgstr ""
-"аб’екты (і ўсе ўваходныя ў іх кропкі/ўдзельнікі адносін) у бягучым поле "
+"аб’екты (і ўсе ўваходныя ў іх пункты/ўдзельнікі дачынення) у бягучым поле "
"бачнасці"
msgid "objects in downloaded area"
msgstr "аб’екты ў запампаванай вобласці"
msgid "objects (and all its way nodes / relation members) in downloaded area"
-msgstr "аб’екты (і ўсе іх кропкі/ўдзельнікі адносін) у запампаванай вобласці"
+msgstr ""
+"аб’екты (і ўсе іх пункты/ўдзельнікі дачынення) у запампаванай вобласці"
msgid "Searching"
msgstr "Пошук"
@@ -2905,10 +2930,10 @@ msgstr ""
"{1}"
msgid "Cannot parse timestamp ''{0}''"
-msgstr ""
+msgstr "Не атрымалася выканаць разбор пазнакі часу ''{0}''"
msgid "Expecting {0} after {1}"
-msgstr ""
+msgstr "Чакалася {0} пасля {1}"
msgid "Range of primitive ids expected"
msgstr "Чакаецца дыяпазон ID аб’ектаў"
@@ -2926,7 +2951,7 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
-"Невядомы тып элемента: {0}. Дазволеныя значэнні: кропка, лінія або адносіны"
+"Невядомы тып элемента: {0}. Дазволеныя значэнні: пункт, лінія або дачыненне"
msgid "Positive integer expected"
msgstr "Чакаўся дадатны цэлы лік"
@@ -2967,14 +2992,14 @@ msgstr "Парушэнне прадумовы"
msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
msgstr ""
-"кропак у лініі {1}: {0} шт. Гэта перавышае максімальна дапушчальную "
-"колькасць кропак {2}"
+"пунктаў у лініі {1}: {0} шт. Гэта перавышае максімальна дапушчальную "
+"колькасць пунктаў {2}"
msgid "API Capabilities Violation"
msgstr "Парушэнне магчымасцяў API"
msgid "Cyclic dependency between relations:"
-msgstr "Цыклічныя залежнасці паміж адносінамі:"
+msgstr "Цыклічныя залежнасці паміж дачыненнямі:"
msgid "Removed obsolete tags"
msgstr "Выдалены састарэлыя тэгі"
@@ -2987,15 +3012,15 @@ 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 "Цыклічныя залежнасці"
@@ -3046,13 +3071,13 @@ msgid "Continue upload"
msgstr "Працягнуць перадачу"
msgid "Add node {0}"
-msgstr "Дадаць кропку {0}"
+msgstr "Дадаць пункт {0}"
msgid "Add way {0}"
msgstr "Дадаць лінію {0}"
msgid "Add relation {0}"
-msgstr "Дадаць адносіны {0}"
+msgstr "Дадаць дачыненне {0}"
msgid "Added {0} object"
msgid_plural "Added {0} objects"
@@ -3061,37 +3086,37 @@ msgstr[1] "Дададзена {0} аб’екта"
msgstr[2] "Дададзена {0} аб’ектаў"
msgid "New way {0} has 0 nodes"
-msgstr "Новая лінія {0} утрымоўвае 0 кропак"
+msgstr "Новая лінія {0} утрымоўвае 0 пунктаў"
msgid "Change node {0}"
-msgstr "Змяніць кропку {0}"
+msgstr "Змяніць пункт {0}"
msgid "Change way {0}"
msgstr "Змяніць лінію {0}"
msgid "Change relation {0}"
-msgstr "Змяніць адносіны {0}"
+msgstr "Змяніць дачыненне {0}"
msgid "Changed nodes of {0}"
-msgstr "Змененыя кропкі для {0}"
+msgstr "Змененыя пункты для {0}"
msgid "Remove \"{0}\" for node ''{1}''"
-msgstr "Выдаліць \"{0}\" для кропкі ''{1}''"
+msgstr "Выдаліць \"{0}\" для пункта ''{1}''"
msgid "Remove \"{0}\" for way ''{1}''"
msgstr "Выдаліць \"{0}\" для лініі ''{1}''"
msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr "Выдаліць \"{0}\" для адносін ''{1}''"
+msgstr "Выдаліць \"{0}\" для дачынення ''{1}''"
msgid "Set {0}={1} for node ''{2}''"
-msgstr "Задаць {0}={1} для кропкі ''{2}''"
+msgstr "Задаць {0}={1} для пункта ''{2}''"
msgid "Set {0}={1} for way ''{2}''"
msgstr "Задаць {0}={1} для лініі ''{2}''"
msgid "Set {0}={1} for relation ''{2}''"
-msgstr "Усталяваць {0}={1} для адносін ''{2}''"
+msgstr "Усталяваць {0}={1} для дачынення ''{2}''"
msgid "Remove \"{0}\" for {1} object"
msgid_plural "Remove \"{0}\" for {1} objects"
@@ -3127,7 +3152,7 @@ msgstr[1] "аб’екта"
msgstr[2] "аб’ектаў"
msgid "Change relation member role for {0} {1}"
-msgstr "Змяніць ролю ўдзельніка адносін для {0} {1}"
+msgstr "Змяніць ролю ўдзельніка дачынення для {0} {1}"
msgid "At least one object to delete required, got empty collection"
msgstr ""
@@ -3135,13 +3160,13 @@ msgstr ""
"пустая калекцыя"
msgid "Delete node {0}"
-msgstr "Выдаліць кропку {0}"
+msgstr "Выдаліць пункт {0}"
msgid "Delete way {0}"
msgstr "Выдаліць лінію {0}"
msgid "Delete relation {0}"
-msgstr "Выдаліць адносіны {0}"
+msgstr "Выдаліць дачыненне {0}"
msgid "Delete {0} object"
msgid_plural "Delete {0} objects"
@@ -3151,9 +3176,9 @@ msgstr[2] "Выдаліць {0} аб’ектаў"
msgid "Delete {0} node"
msgid_plural "Delete {0} nodes"
-msgstr[0] "Выдаліць {0} кропку"
-msgstr[1] "Выдаліць {0} кропкі"
-msgstr[2] "Выдаліць {0} кропак"
+msgstr[0] "Выдаліць {0} пункт"
+msgstr[1] "Выдаліць {0} пункты"
+msgstr[2] "Выдаліць {0} пунктаў"
msgid "Delete {0} way"
msgid_plural "Delete {0} ways"
@@ -3163,9 +3188,9 @@ msgstr[2] "Выдаліць {0} ліній"
msgid "Delete {0} relation"
msgid_plural "Delete {0} relations"
-msgstr[0] "Выдаліць {0} адносіны"
-msgstr[1] "Выдаліць {0} адносін"
-msgstr[2] "Выдаліць {0} адносін"
+msgstr[0] "Выдаліць {0} дачыненне"
+msgstr[1] "Выдаліць {0} дачыненні"
+msgstr[2] "Выдаліць {0} дачыненняў"
msgid "Deleted ''{0}''"
msgstr "Выдалена {0}"
@@ -3178,10 +3203,10 @@ msgid ""
"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> Вы сапраўды жадаеце выдаліць гэтыя "
-"кропкі?"
+"пункты?"
msgid ""
"You are about to delete incomplete objects.<br>This will cause problems "
@@ -3199,26 +3224,26 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
-"Вы хочаце выдаліць {0} адносіны: {1}<br/>Патрэба ў гэтым узнікае вельмі "
+"Вы хочаце выдаліць {0} дачыненне: {1}<br/>Патрэба ў гэтым узнікае вельмі "
"рэдка і адмяніць выдаленне пасля загрузкі дадзеных на сервер можа быць не "
-"лёгка. <br/> Вы сапраўды жадаеце выдаліць адносіны?"
+"лёгка. <br/> Вы сапраўды жадаеце выдаліць дачыненне?"
msgstr[1] ""
-"Вы хочаце выдаліць {0} адносін: {1}<br/>Патрэба ў гэтым узнікае вельмі рэдка "
-"і адмяніць выдаленне пасля загрузкі дадзеных на сервер можа быць не лёгка. "
-"<br/> Вы сапраўды жадаеце выдаліць адносіны?"
+"Вы хочаце выдаліць {0} дачыненняў: {1}<br/>Патрэба ў гэтым узнікае вельмі "
+"рэдка і адмяніць выдаленне пасля загрузкі дадзеных на сервер можа быць не "
+"лёгка. <br/> Вы сапраўды жадаеце выдаліць дачыненні?"
msgstr[2] ""
-"Вы хочаце выдаліць {0} адносін: {1}<br/>Патрэба ў гэтым узнікае вельмі рэдка "
-"і адмяніць выдаленне пасля загрузкі дадзеных на сервер можа быць не лёгка. "
-"<br/> Вы сапраўды жадаеце выдаліць адносіны?"
+"Вы хочаце выдаліць {0} дачыненняў: {1}<br/>Патрэба ў гэтым узнікае вельмі "
+"рэдка і адмяніць выдаленне пасля загрузкі дадзеных на сервер можа быць не "
+"лёгка. <br/> Вы сапраўды жадаеце выдаліць дачыненні?"
msgid "Delete relation?"
-msgstr "Выдаліць адносіны?"
+msgstr "Выдаліць дачыненне?"
msgid "Move {0} node"
msgid_plural "Move {0} nodes"
-msgstr[0] "Перамясціць {0} кропку"
-msgstr[1] "Перамясціць {0} кропкі"
-msgstr[2] "Перамясціць {0} кропак"
+msgstr[0] "Перамясціць {0} пункт"
+msgstr[1] "Перамясціць {0} пункты"
+msgstr[2] "Перамясціць {0} пунктаў"
msgid "Purged {0} object"
msgid_plural "Purged {0} objects"
@@ -3227,19 +3252,19 @@ msgstr[1] "Вычышчана {0} аб’екта"
msgstr[2] "Вычышчана {0} аб’ектаў"
msgid "Removed nodes from {0}"
-msgstr "Выдалены кропкі з {0}"
+msgstr "Выдалены пункты з {0}"
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
-msgstr[0] "Павярнуць {0} кропку"
-msgstr[1] "Павярнуць {0} кропкі"
-msgstr[2] "Павярнуць {0} кропак"
+msgstr[0] "Павярнуць {0} пункт"
+msgstr[1] "Павярнуць {0} пункты"
+msgstr[2] "Павярнуць {0} пунктаў"
msgid "Scale {0} node"
msgid_plural "Scale {0} nodes"
-msgstr[0] "Маштабаваць {0} кропку"
-msgstr[1] "Маштабаваць {0} кропкі"
-msgstr[2] "Маштабаваць {0} кропак"
+msgstr[0] "Маштабаваць {0} пункт"
+msgstr[1] "Маштабаваць {0} пункты"
+msgstr[2] "Маштабаваць {0} пунктаў"
msgid "Selected {0} object"
msgid_plural "Selected {0} objects"
@@ -3252,9 +3277,9 @@ msgstr "Паслядоўнасць: {0}"
msgid "Transform {0} node"
msgid_plural "Transform {0} nodes"
-msgstr[0] "Трансфармаваць {0} кропку"
-msgstr[1] "Трансфармаваць {0} кропкі"
-msgstr[2] "Трансфармаваць {0} кропак"
+msgstr[0] "Трансфармаваць {0} пункт"
+msgstr[1] "Трансфармаваць {0} пункты"
+msgstr[2] "Трансфармаваць {0} пунктаў"
msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>This "
@@ -3290,16 +3315,16 @@ msgid "Resolve conflicts in deleted state in {0}"
msgstr "Вырашыць канфлікт у выдаленым стане ў {0}"
msgid "Set the ''modified'' flag for node {0}"
-msgstr "Усталяваць сцяг ''modified'' для кропкі {0}"
+msgstr "Усталяваць сцяг ''modified'' для пункта {0}"
msgid "Set the ''modified'' flag for way {0}"
msgstr "Усталяваць сцяг ''modified'' для лініі {0}"
msgid "Set the ''modified'' flag for relation {0}"
-msgstr "Усталяваць сцяг ''modified'' для адносін {0}"
+msgstr "Усталяваць сцяг ''modified'' для дачынення {0}"
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}"
@@ -3315,27 +3340,24 @@ msgstr[2] "Вырашыць {0} канфліктаў тэгаў ў лініі {1
msgid "Resolve {0} tag conflict in relation {1}"
msgid_plural "Resolve {0} tag conflicts in relation {1}"
-msgstr[0] "Вырашыць {0} канфлікт тэгаў у адносінах {1}"
-msgstr[1] "Вырашыць {0} канфлікта тэгаў у адносінах {1}"
-msgstr[2] "Вырашыць {0} канфліктаў тэгаў у адносінах {1}"
+msgstr[0] "Вырашыць {0} канфлікт тэгаў у дачыненні {1}"
+msgstr[1] "Вырашыць {0} канфлікта тэгаў у дачыненні {1}"
+msgstr[2] "Вырашыць {0} канфліктаў тэгаў у дачыненні {1}"
msgid "Resolve version conflict for node {0}"
-msgstr "Уладзіць канфлікт версіі для кропкі {0}"
+msgstr "Уладзіць канфлікт версіі для пункта {0}"
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}"
+msgstr "Уладзіць канфлікты ў спісе пунктаў лініі {0}"
msgid "Main dataset does not include node {0}"
-msgstr "Асноўны набор дадзеных не ўтрымоўвае кропку {0}"
-
-msgid "Apply?"
-msgstr "Ужыць?"
+msgstr "Асноўны набор дадзеных не ўтрымоўвае пункт {0}"
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
@@ -3368,27 +3390,6 @@ msgstr ""
"Пры змене напрамка лініі прапануюцца наступныя змены для забеспячэння "
"ўзгодненасці дадзеных."
-msgid "Relation"
-msgstr "Адносіны"
-
-msgid "Old role"
-msgstr "Старая роля"
-
-msgid "New role"
-msgstr "Новая роля"
-
-msgid "Old key"
-msgstr "Стары ключ"
-
-msgid "Old value"
-msgstr "Старое значэнне"
-
-msgid "New key"
-msgstr "Новы ключ"
-
-msgid "New value"
-msgstr "Новае значэнне"
-
msgid "Apply selected changes"
msgstr "Ужыць абраныя змены"
@@ -3402,7 +3403,7 @@ msgid "Tags of "
msgstr "Тэгі "
msgid "Roles in relations referring to"
-msgstr "Ролі ў адносінах, якія адносяцца да"
+msgstr "Ролі ў дачыненнях, якія адносяцца да"
msgid "Automatic tag correction"
msgstr "Аўтаматычна выпраўляць тэгі"
@@ -3427,13 +3428,13 @@ 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}''"
@@ -3543,10 +3544,10 @@ msgstr ""
"налад па змаўчанні: {0}"
msgid "Failed to load defaults cache file: {0}"
-msgstr ""
+msgstr "Не атрымалася загрузіць файл кэша налад па змаўчанні: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
-msgstr ""
+msgstr "Не атрымалася выдаліць пашкоджаны файл кэша налад па змаўчанні: {0}"
msgid "Paint style {0}: {1}"
msgstr "Стыль малявання {0}:{1}"
@@ -3624,7 +3625,7 @@ msgid "E"
msgstr "У"
msgid "Update default entries"
-msgstr ""
+msgstr "Абнавіць даступныя па змаўчанні падкладкі"
msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr ""
@@ -3667,6 +3668,8 @@ msgstr "Пласт не абраны"
msgid ""
"WMTS Parser error - start element {0} has different name than end element {2}"
msgstr ""
+"Памылка парсера WMTS — імя пачатковага элемента {0} адрозніваецца ад імя "
+"канчатковага элемента {2}"
msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
@@ -3719,10 +3722,10 @@ msgstr ""
"зыходным наборы дадзеных."
msgid "Missing merge target for node with id {0}"
-msgstr "Адсутнічае вынік аб’яднання для кропкі з 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 "Адсутнічае вынік аб’яднання тыпу {0} з id {1}"
@@ -3737,10 +3740,10 @@ msgid "Test ''{0}'' completed in {1}"
msgstr "Тэст ''{0}'' завершаны за {1}"
msgid "Cannot add a way with only {0} nodes."
-msgstr "Немагчыма дадаць лінію ў якой толькі {0} кропка."
+msgstr "Немагчыма дадаць лінію ў якой толькі {0} пункт."
msgid "Each node must connect exactly 2 ways"
-msgstr "КОЖНАЯ кропка павінна злучаць роўна дзве лініі"
+msgstr "Кожны пункт павінна злучаць роўна дзве лініі"
msgid "There is an intersection between ways."
msgstr "Існуе скрыжаванне паміж лініямі."
@@ -3756,9 +3759,9 @@ msgstr "Зліццё элементаў з рознымі id немагчыма.
msgid "node"
msgid_plural "nodes"
-msgstr[0] "кропка"
-msgstr[1] "кропкі"
-msgstr[2] "кропак"
+msgstr[0] "пункт"
+msgstr[1] "пункты"
+msgstr[2] "пунктаў"
msgid "way"
msgid_plural "ways"
@@ -3768,9 +3771,9 @@ msgstr[2] "ліній"
msgid "relation"
msgid_plural "relations"
-msgstr[0] "адносіны"
-msgstr[1] "адносін"
-msgstr[2] "адносін"
+msgstr[0] "дачыненне"
+msgstr[1] "дачыненні"
+msgstr[2] "дачыненняў"
msgid "closedway"
msgstr "замкнёная лінія"
@@ -3789,16 +3792,16 @@ msgid "<anonymous>"
msgstr "<ананімны>"
msgid "Cannot add node {0} to incomplete way {1}."
-msgstr "немагчыма дадаць кропку {0} да незавершанай лініі {1}"
+msgstr "немагчыма дадаць пункт {0} да незавершанай лініі {1}"
msgid "Nodes in way must be in the same dataset"
msgstr "Кропкі лініі павінны быць у тым жа наборы дадзеных"
msgid "Deleted node referenced by {0}"
-msgstr "На выдаленую кропку спасылаецца {0}"
+msgstr "На выдалены пункт спасылаецца {0}"
msgid "Complete node {0} with null coordinates in way {1}"
-msgstr "Выправіце кропку {0} з пустымі каардынатамі ў лініі {1}"
+msgstr "Выправіце пункт {0} з пустымі каардынатамі ў лініі {1}"
msgid ""
"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
@@ -3851,7 +3854,7 @@ msgid "selected"
msgstr "вылучана"
msgid "Relation: selected"
-msgstr "Адносіны: вылучаныя"
+msgstr "Дачыненне: вылучаныя"
msgid "Node: standard"
msgstr "Кропка: стандартная"
@@ -3884,10 +3887,10 @@ msgid "areatext"
msgstr "для_тэксту"
msgid "Expected element ''{0}'', but got ''{1}''"
-msgstr ""
+msgstr "Чакаўся элемент ''{0}'', а атрыманы ''{1}''"
msgid "value expected"
-msgstr ""
+msgstr "чакалася значэнне"
msgid " (at line {0}, column {1})"
msgstr " (у радку {0}, слупок {1})"
@@ -3899,7 +3902,7 @@ msgid "Expected integer value in range 1-60 for ''+zone=...'' parameter."
msgstr "Чакаўся цэлы лік у дыяпазоне 1-60 для параметру ''+zone=…''"
msgid "No unit found for: {0}"
-msgstr ""
+msgstr "Не знойдзена адзінка вымярэння для: {0}"
msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
msgstr "Параметр павінен пачынацца са знака «+» (знойдзены: «{0}»)"
@@ -3976,22 +3979,22 @@ msgid "WGS84"
msgstr "WGS84"
msgid "Albers Equal Area"
-msgstr ""
+msgstr "Роўнавялікая праекцыя Альберса"
msgid "Parameter ''{0}'' required."
msgstr "Патрабуецца параметр «{0}»."
msgid "standard parallels are opposite"
-msgstr ""
+msgstr "стандартныя паралелі насупраць адзін аднаго"
msgid "Cassini-Soldner"
-msgstr ""
+msgstr "Праекцыя Касіні-Зольднера"
msgid "Double Stereographic"
-msgstr ""
+msgstr "Падвойная стэрэаграфічная"
msgid "Lambert Azimuthal Equal Area"
-msgstr ""
+msgstr "Роўнавялікая азімутальная праекцыя Ламберта"
msgid "Lambert Conformal Conic"
msgstr "Раўнакутная канічная праекцыя Ламберта"
@@ -4003,25 +4006,26 @@ msgid "Mercator"
msgstr "Меркатар"
msgid "Oblique Mercator"
-msgstr ""
+msgstr "Касая праекцыя Меркатара"
msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
-msgstr ""
+msgstr "Непадыходныя параметры ''{0}'' і ''{1}'' для метаду двух пунктаў."
msgid "Illegal value for parameter ''{0}'': {1}"
-msgstr ""
+msgstr "недапушчальнае значэнне для параметру ''{0}'': {1}"
msgid "error in initialization"
-msgstr ""
+msgstr "памылка пры ініцыялізацыі"
msgid "Polar Stereographic"
-msgstr ""
+msgstr "Палярная стэрэаграфічная"
msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
msgstr ""
+"Палярная стэрэаграфічная: параметр ''{0}'' павінен быць роўны 90 ці -90."
msgid "Sinusoidal"
-msgstr ""
+msgstr "Сінусаідальная"
msgid "Swiss Oblique Mercator"
msgstr "Швейцарская праекцыя Меркатара"
@@ -4058,7 +4062,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "Адрас эл. пошты ўтрымоўвае недапушчальны дамен: {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Праверка карэктнасці Email адрасоў"
msgid "URL is invalid"
msgstr "Няслушны URL"
@@ -4079,16 +4083,16 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "URL утрымоўвае недапушчальны фрагмент: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "Праверка карэктнасці адрасоў ў Інтэрнэт"
msgid "Addresses"
msgstr "Адрасы"
msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr "Правярае памылкі ў адрасах і адносінах associatedStreet."
+msgstr "Правярае памылкі ў адрасах і дачыненнях associatedStreet."
msgid "Multiple associatedStreet relations"
-msgstr "Некалькі адносін associatedStreet"
+msgstr "Некалькі дачыненняў associatedStreet"
msgid "House number without street"
msgstr "Нумар хаты без указання вуліцы"
@@ -4100,7 +4104,7 @@ msgid "Duplicate house numbers"
msgstr "Дубляваць нумары дамоў"
msgid "Multiple street names in relation"
-msgstr "Некалькі назваў вуліц у адносінах"
+msgstr "Некалькі назваў вуліц у дачыненні"
msgid "House number too far from street"
msgstr "Нумар дома занадта далёка ад вуліцы"
@@ -4114,10 +4118,10 @@ msgstr "Праверка на памылкі, злучаныя з магчыма
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
msgstr ""
-"Лінія змяшчае больш за {0} кропак. Яе варта замяніць на мультыпалігон"
+"Лінія змяшчае больш за {0} пунктаў. Яе варта замяніць на мультыпалігон"
msgid "Way contains more than {0} nodes. It should be split or simplified"
-msgstr "Лінія ўтрымоўвае больш {0} кропак. Яе варта разбіць ці спрасціць"
+msgstr "Лінія ўтрымоўвае больш {0} пунктаў. Яе варта разбіць ці спрасціць"
msgid "Barriers and entrances"
msgstr "Перашкоды і праходы"
@@ -4188,59 +4192,59 @@ msgstr ""
"адным і тым жа пласце."
msgid "Duplicated nodes"
-msgstr "Дубляваныя кропкі"
+msgstr "Дубляваныя пункты"
msgid "This test checks that there are no nodes at the very same location."
-msgstr "Гэты тэст правярае, каб не было накладзеных кропак."
+msgstr "Гэты тэст правярае, каб не было накладзеных пунктаў."
msgid "Mixed type duplicated nodes"
-msgstr "Прадубляваныя кропкі змяшанага тыпу"
+msgstr "Прадубляваныя пункты змяшанага тыпу"
msgid "Highway duplicated nodes"
-msgstr "Прадубляваныя кропкі дарог"
+msgstr "Прадубляваныя пункты дарог"
msgid "Railway duplicated nodes"
-msgstr "Прадубляваныя кропкі чыгунак"
+msgstr "Прадубляваныя пункты чыгунак"
msgid "Waterway duplicated nodes"
-msgstr "Прадубляваныя кропкі водных шляхоў"
+msgstr "Прадубляваныя пункты водных шляхоў"
msgid "Boundary duplicated nodes"
-msgstr "Прадубляваныя кропкі меж"
+msgstr "Прадубляваныя пункты меж"
msgid "Power duplicated nodes"
-msgstr "Прадубляваныя кропкі аб’ектаў энергетыкі"
+msgstr "Прадубляваныя пункты аб’ектаў энергетыкі"
msgid "Natural duplicated nodes"
-msgstr "Дублікаты кропак прыроды"
+msgstr "Дублікаты пунктаў прыроды"
msgid "Building duplicated nodes"
-msgstr "Дублікаты кропак будынкаў"
+msgstr "Дублікаты пунктаў будынкаў"
msgid "Landuse duplicated nodes"
-msgstr "Дублікаты кропак землекарыстання"
+msgstr "Дублікаты пунктаў землекарыстання"
msgid "Other duplicated nodes"
-msgstr "Іншыя дублікаты кропак"
+msgstr "Іншыя дублікаты пунктаў"
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 ""
-"Правярае на наяўнасць адносін 1) з аднолькавымі тэгамі 2) з аднолькавымі "
+"Правярае на наяўнасць дачыненняў 1) з аднолькавымі тэгамі 2) з аднолькавымі "
"удзельнікамі з аднолькавымі ролямі."
msgid "Relations with same members"
-msgstr "Адносіны з аднолькавымі ўдзельнікамі"
+msgstr "Дачыненні з аднолькавымі ўдзельнікамі"
msgid "Delete duplicate relations"
-msgstr "Выдаліць дубляваныя адносіны"
+msgstr "Выдаліць дубляваныя дачыненні"
msgid "Duplicated ways"
msgstr "Дубляваныя лініі"
@@ -4249,7 +4253,7 @@ msgid ""
"This test checks that there are no ways with same node coordinates and "
"optionally also same tags."
msgstr ""
-"Правярае на наяўнасць ліній з аднолькавымі каардынатамі кропак і "
+"Правярае на наяўнасць ліній з аднолькавымі каардынатамі пунктаў і "
"(апцыянальна) з аднолькавымі тэгамі."
msgid "Ways with same position"
@@ -4259,10 +4263,10 @@ msgid "Delete duplicate ways"
msgstr "Выдаліць дублікаты ліній"
msgid "Duplicated way nodes"
-msgstr "Дубляваныя кропкі на лініі"
+msgstr "Дубляваныя пункты на лініі"
msgid "Checks for ways with identical consecutive nodes."
-msgstr "Правярае лініі на наяўнасць аднолькавых паслядоўных кропак"
+msgstr "Правярае лініі на наяўнасць аднолькавых паслядоўных пунктаў"
msgid "Highways"
msgstr "Дарогі"
@@ -4377,13 +4381,13 @@ msgid ""
msgid_plural ""
"Multipolygon relation should be tagged with area tags and not the outer ways"
msgstr[0] ""
-"Адносінам тыпу \"мультыпалігон\" варта прызначаць тэгі вобласці, а не "
+"Дачыненню тыпу \"мультыпалігон\" варта прызначаць тэгі вобласці, а не "
"знешняй лініі"
msgstr[1] ""
-"Адносінам тыпу \"мультыпалігон\" варта прызначаць тэгі вобласці, а не "
+"Дачыненню тыпу \"мультыпалігон\" варта прызначаць тэгі вобласці, а не "
"знешнім лініям"
msgstr[2] ""
-"Адносінам тыпу \"мультыпалігон\" варта прызначаць тэгі вобласці, а не "
+"Дачыненню тыпу \"мультыпалігон\" варта прызначаць тэгі вобласці, а не "
"знешнім лініям"
msgid ""
@@ -4400,6 +4404,8 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"the area style"
msgstr ""
+"З бягучым выкарыстоўваным стылем(ямі) mappaint стыль вонкавай лініі не "
+"адпавядае стылю вобласці"
msgid "Area style on outer way"
msgstr "Стыль вобласці на вонкавай лініі"
@@ -4476,7 +4482,7 @@ msgstr "Перакрыцце ліній"
msgid ""
"This test checks that a connection between two nodes is not used by more "
"than one way."
-msgstr "Гэты тэст правярае, каб дзве кропкі злучаліся толькі адной лініяй."
+msgstr "Гэты тэст правярае, каб два пункты злучаліся толькі адной лініяй."
msgid "Areas share segment"
msgstr "Агульны сегмент абласцей"
@@ -4505,28 +4511,31 @@ msgstr "Лініі электраперадачы"
msgid ""
"Checks for nodes in power lines that do not have a power=tower/pole tag."
msgstr ""
-"Тэст шукае кропкі на лініях электраперадачы без тэга power=tower/pole."
+"Тэст шукае пункты на лініях электраперадачы без тэга power=tower/pole."
msgid "Missing power tower/pole within power line"
-msgstr "Адсутнічае тэг power=tower/pole на кропках ліній электраперадачы"
+msgstr "Адсутнічае тэг power=tower/pole на пунктах ліній электраперадачы"
msgid "Public Transport Route"
msgstr "Маршрут грамадскага транспарта"
msgid "Route relation contains a ''{0}'' role"
-msgstr ""
+msgstr "Дачыненне-маршрут утрымоўвае ролю ''{0}''"
msgid "Route relation contains a gap"
-msgstr ""
+msgstr "У дачыненні-маршруце маецца парыў"
+
+msgid "Stop position not part of route"
+msgstr "Месца прыпынку не ўваходзіць у склад маршруту"
msgid "Role verification problem"
msgstr "Праблема праверкі ролі"
msgid "Relation checker"
-msgstr "Праверка адносін"
+msgstr "Праверка дачынення"
msgid "Checks for errors in relations."
-msgstr "Праверка на памылкі ў адносінах."
+msgstr "Праверка на памылкі ў дачыненнях."
msgid ""
"Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
@@ -4534,10 +4543,10 @@ msgstr ""
"Не паказана схема маршруту. Дадайце {0} ({1}=public_transport; {2}=legacy)"
msgid "Relation type is unknown"
-msgstr "Тып адносін невядомы"
+msgstr "Тып дачынення невядомы"
msgid "Relation is empty"
-msgstr "Адносіны парожнія"
+msgstr "Дачыненне парожняе"
msgid "Role member does not match expression {0} in template {1}"
msgstr "Удзельнік ролі не адпавядае выразу {0} ў шаблоне {1}"
@@ -4572,7 +4581,7 @@ msgstr "Лініі, якія перасякаюць самі сябе"
msgid ""
"This test checks for ways that contain some of their nodes more than once."
msgstr ""
-"Гэты тэст шукае лініі, якія праходзяць праз адну кропку больш аднаго разу."
+"Гэты тэст шукае лініі, якія праходзяць праз адзін пункт больш аднаго разу."
msgid "Similarly named ways"
msgstr "Падобныя назвы ліній"
@@ -4633,7 +4642,7 @@ msgid "Property values start or end with white space"
msgstr "Значэнне пачынаецца ці сканчаецца прабелам"
msgid "Property values contain multiple white spaces"
-msgstr ""
+msgstr "Значэнні ўтрымоўваюць некалькі прабелаў запар"
msgid "Property values contain HTML entity"
msgstr "Значэнні ўтрымоўваюць HTML разметку"
@@ -4694,7 +4703,7 @@ msgid "Check for FIXMES."
msgstr "Праверыць на наяўнасць тэгаў FIXME"
msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr "Шукае кропкі ці лініі з FIXME у любым значэнні ўласцівасці."
+msgstr "Шукае пункты ці лініі з FIXME у любым значэнні ўласцівасці."
msgid "Fix tags"
msgstr "Выправіць тэгі"
@@ -4733,10 +4742,10 @@ msgid "More than one \"to\" way found"
msgstr "Выяўлены больш чым адзін шлях \"куды\""
msgid "More than one \"via\" node found"
-msgstr "Знойдзена больш за адна кропка \"via\""
+msgstr "Знойдзена больш за адзін пункт \"via\""
msgid "Cannot mix node and way for role \"via\""
-msgstr "Нельга выкарыстоўваць кропку і лінію сумесна ў якасці \"via\"."
+msgstr "Нельга выкарыстоўваць пункт і лінію сумесна ў якасці \"via\"."
msgid "No \"from\" way found"
msgstr "Не паказаны шлях \"адкуль\""
@@ -4745,10 +4754,10 @@ msgid "No \"to\" way found"
msgstr "Не паказаны шлях \"куды\""
msgid "\"from\" way equals \"to\" way"
-msgstr ""
+msgstr "лінія \"from\" ідэнтычная лініі \"to\""
msgid "No \"via\" node or way found"
-msgstr "Няма кропкі або лініі \"праз\""
+msgstr "Няма пункта або лініі \"праз\""
msgid "The \"from\" way does not start or end at a \"via\" node."
msgstr "Лінія \"from\" не пачынаецца ці не сканчаецца на кропцы \"via\"."
@@ -4830,7 +4839,7 @@ msgstr ""
"Гэты тэст шукае лініі, канец якіх размешчаны вельмі блізка да іншай лініі."
msgid "Way end node near other highway"
-msgstr "Апошняя кропка лініі размешчана каля іншай дарогі"
+msgstr "Апошні пункт лініі размешчаны каля іншай дарогі"
msgid "Way end node near other way"
msgstr "Канец лініі размешчаны каля іншай лініі"
@@ -4839,17 +4848,17 @@ msgid "Way node near other way"
msgstr "Кропка лініі размешчана каля іншай лініі"
msgid "Connected way end node near other way"
-msgstr "Канчатковая кропка далучанай лініі размешчана каля іншай лініі"
+msgstr "Канчатковы пункт далучанай лініі размешчаны каля іншай лініі"
msgid "Unconnected nodes without physical tags"
-msgstr "Нязлучаныя кропкі без тэгаў"
+msgstr "Нязлучаныя пункты без тэгаў"
msgid "Untagged and unconnected nodes"
-msgstr "Нязлучаныя кропкі без тэгаў"
+msgstr "Нязлучаныя пункты без тэгаў"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-"Гэты тэст шукае кропкі, якія не маюць тэгаў, і якія не з''яўляюцца часткай "
+"Гэты тэст шукае пункты, якія не маюць тэгаў, і якія не з''яўляюцца часткай "
"ліній."
msgid "No tags"
@@ -4871,12 +4880,12 @@ msgid "Has key ''source''"
msgstr "Маецца ключ ''source''"
msgid "Untagged, empty and one node ways"
-msgstr "Пустыя, без тэгаў і якія складаюцца з адной кропкі лініі"
+msgstr "Пустыя, без тэгаў і якія складаюцца з аднаго пункта лініі"
msgid "This test checks for untagged, empty and one node ways."
msgstr ""
"Дадзены тэст шукае лініі без тэгаў, пустыя, а таксама лініі, якія складаюцца "
-"з адной кропкі"
+"з аднаго пункта"
msgid "Unnamed ways"
msgstr "Безназоўныя лініі"
@@ -4894,7 +4903,7 @@ msgid "Empty ways"
msgstr "Пустыя лініі"
msgid "One node ways"
-msgstr "Лініі, якія складаюцца з адной кропкі"
+msgstr "Лініі, якія складаюцца з аднаго пункта"
msgid "Way connected to Area"
msgstr "Лінія злучана з палігонам"
@@ -4955,9 +4964,9 @@ msgstr "землекарыстанне"
msgid "{0} node"
msgid_plural "{0} nodes"
-msgstr[0] "{0} кропка"
-msgstr[1] "{0} кропкі"
-msgstr[2] "{0} кропак"
+msgstr[0] "{0} пункт"
+msgstr[1] "{0} пункты"
+msgstr[2] "{0} пунктаў"
msgid "{0} member"
msgid_plural "{0} members"
@@ -5195,6 +5204,12 @@ msgstr "Уключаны пашыраны ўзровень адладкі (тр
msgid "Initializing"
msgstr "Ініцыялізацыя"
+msgid "Setting defaults"
+msgstr "Налады па змаўчанні"
+
+msgid "Creating main GUI"
+msgstr "Стварэнне графічнага інтэрфейсу"
+
msgid "Updating plugins"
msgstr "Абнаўленне модуляў"
@@ -5204,12 +5219,6 @@ msgstr "Усталёўка абноўленых модуляў"
msgid "Loading early plugins"
msgstr "Загрузка ранніх модуляў"
-msgid "Setting defaults"
-msgstr "Налады па змаўчанні"
-
-msgid "Creating main GUI"
-msgstr "Стварэнне графічнага інтэрфейсу"
-
msgid "Loading plugins"
msgstr "Загрузка модуляў"
@@ -5462,10 +5471,10 @@ msgid "Do not hide status bar"
msgstr "Не хаваць радок стану"
msgid "The northing at the mouse pointer."
-msgstr ""
+msgstr "Адхіленне на поўнач паказальніка мышы."
msgid "The easting at the mouse pointer."
-msgstr ""
+msgstr "Адхіленне на ўсход паказальніка мышы."
msgid "The geographic latitude at the mouse pointer."
msgstr "Геаграфічная шырата становішча курсора"
@@ -5540,6 +5549,9 @@ msgid ""
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
+"<html>Ці можна ўвесці <strong>адрас</strong> для асобнага квадрата ў фармаце "
+"<i>zoomlevel/x/y</i>, напрыклад, <i>15/256/223</i>. Адрасы квадратаў у "
+"фармаце <i>zoom,x,y</i> or <i>zoom;x;y</i> таксама дапушчальныя.</html>"
msgid "Tile address:"
msgstr "Адрас квадрата:"
@@ -5699,14 +5711,14 @@ msgstr "Кропкі (без канфліктаў)"
msgid ""
"Merged node list frozen. No pending conflicts in the node list of this way"
msgstr ""
-"Спіс аб’яднаных кропак замарожаны. Няма няўладжаных канфліктаў у спісе "
-"кропак гэтай лініі."
+"Спіс аб’яднаных пунктаў замарожаны. Няма няўладжаных канфліктаў у спісе "
+"пунктаў гэтай лініі."
msgid "Nodes(with conflicts)"
msgstr "Кропкі (з канфліктамі)"
msgid "Pending conflicts in the node list of this way"
-msgstr "Няўладжаныя канфлікты ў спісе кропак гэтай лініі"
+msgstr "Няўладжаныя канфлікты ў спісе пунктаў гэтай лініі"
msgid "Members(resolved)"
msgstr "Чальцы (без канфліктаў)"
@@ -5715,14 +5727,14 @@ msgid ""
"Merged member list frozen. No pending conflicts in the member list of this "
"relation"
msgstr ""
-"Аб’яднаны спіс удзельнікаў адносін замарожаны. Няма нявырашаных канфліктаў у "
-"спісе ўдзельнікаў гэтых адносін."
+"Аб’яднаны спіс удзельнікаў дачынення замарожаны. Няма нявырашаных канфліктаў "
+"у спісе ўдзельнікаў гэтага дачынення."
msgid "Members(with conflicts)"
-msgstr "Удзельнікі адносін (з канфліктамі)"
+msgstr "Удзельнікі дачынення (з канфліктамі)"
msgid "Pending conflicts in the member list of this relation"
-msgstr "Нявырашаныя канфлікты ў спісе ўдзельнікаў гэтых адносін"
+msgstr "Нявырашаныя канфлікты ў спісе ўдзельнікаў гэтага дачынення"
msgid "No pending property conflicts"
msgstr "Няма актуальных канфліктаў уласцівасцяў"
@@ -5791,7 +5803,7 @@ msgid "> top"
msgstr "> наверх"
msgid "Copy my selected nodes to the start of the merged node list"
-msgstr "Скапіяваць вылучаныя кропкі ў пачатак спісу аб’яднаных кропак"
+msgstr "Скапіяваць вылучаныя пункты ў пачатак спісу аб’яднаных пунктаў"
msgid "> bottom"
msgstr "> уніз"
@@ -5927,7 +5939,7 @@ msgstr "Кропка"
msgid "Merged nodes not frozen yet. Cannot build resolution command."
msgstr ""
-"Аб’яднаныя кропкі яшчэ не заблакаваныя. Немагчыма пабудаваць каманду "
+"Аб’яднаныя пункты яшчэ не заблакаваныя. Немагчыма пабудаваць каманду "
"ліквідацыі канфліктаў."
msgid "Properties in my dataset, i.e. the local dataset"
@@ -5989,7 +6001,7 @@ msgstr "Элемент"
msgid "Merged nodes not frozen yet. Cannot build resolution command"
msgstr ""
-"Аб’яднаныя кропкі яшчэ не заблакаваныя. Немагчыма пабудаваць каманду "
+"Аб’яднаныя пункты яшчэ не заблакаваныя. Немагчыма пабудаваць каманду "
"ліквідацыі канфліктаў"
msgid "<undefined>"
@@ -6039,7 +6051,7 @@ msgid "Conflicts when combining ways - combined way is ''{0}''"
msgstr "Паўсталі канфлікты пры аб’яднанні ліній - атрыманая лінія: ''{0}''"
msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Паўсталі канфлікты пры аб’яднанні кропак - атрыманая кропка ''{0}''"
+msgstr "Паўсталі канфлікты пры аб’яднанні пунктаў - атрыманы пункт ''{0}''"
msgid "No conflicts to resolve"
msgstr "Канфліктаў не выяўлена"
@@ -6067,22 +6079,22 @@ msgid_plural ""
"want to continue?"
msgstr[0] ""
"Вы збіраецеся аб''яднаць {1} аб''ект, які з''яўляецца часткай {0} "
-"адносін:<br/>{2}Аб''яднанне гэтых аб''ектаў можа паламаць адносіны. Калі вы "
-"не ўпэўненыя, адмяніце гэта дзеянне.<br/>Калі хочаце працягнуць, будзе "
+"дачынення:<br/>{2}Аб''яднанне гэтых аб''ектаў можа паламаць дачыненне. Калі "
+"вы не ўпэўненыя, адмяніце гэта дзеянне.<br/>Калі хочаце працягнуць, будзе "
"паказаны дыялог, які дазваляе вырашыць, як змяніць "
-"адносіны.<br/><br/>Працягнуць?"
+"дачыненне.<br/><br/>Працягнуць?"
msgstr[1] ""
"Вы збіраецеся аб''яднаць {1} аб''екты, якія з''яўляюцца часткай {0} "
-"адносін:<br/>{2}Аб''яднанне гэтых аб''ектаў можа паламаць адносіны. Калі вы "
-"не ўпэўненыя, адмяніце гэта дзеянне.<br/>Калі хочаце працягнуць, будзе "
+"дачыненняў:<br/>{2}Аб''яднанне гэтых аб''ектаў можа паламаць дачыненні. Калі "
+"вы не ўпэўненыя, адмяніце гэта дзеянне.<br/>Калі хочаце працягнуць, будзе "
"паказаны дыялог, які дазваляе вырашыць, як змяніць "
-"адносіны.<br/><br/>Працягнуць?"
+"дачыненні.<br/><br/>Працягнуць?"
msgstr[2] ""
"Вы збіраецеся аб''яднаць {1} аб''ектаў, якія з''яўляюцца часткай {0} "
-"адносін:<br/>{2}Аб''яднанне гэтых аб''ектаў можа паламаць адносіны. Калі вы "
-"не ўпэўненыя, адмяніце гэта дзеянне.<br/>Калі хочаце працягнуць, будзе "
+"дачыненняў:<br/>{2}Аб''яднанне гэтых аб''ектаў можа паламаць дачыненні. Калі "
+"вы не ўпэўненыя, адмяніце гэта дзеянне.<br/>Калі хочаце працягнуць, будзе "
"паказаны дыялог, які дазваляе вырашыць, як змяніць "
-"адносіны.<br/><br/>Працягнуць?"
+"дачыненні.<br/><br/>Працягнуць?"
msgid "Combine confirmation"
msgstr "Пацверджанне аб’яднання"
@@ -6155,13 +6167,13 @@ msgid "Not decided yet."
msgstr "Яшчэ не вырашана"
msgid "Tags from nodes"
-msgstr "Тэгі кропак"
+msgstr "Тэгі пунктаў"
msgid "Tags from ways"
msgstr "Тэгі ліній"
msgid "Tags from relations"
-msgstr "Тэгі адносін"
+msgstr "Тэгі дачыненняў"
msgid "Conflicts in pasted tags"
msgstr "Канфлікты ва ўстаўленых тэгах"
@@ -6189,22 +6201,22 @@ msgstr[2] "{0} ліній"
msgid "{0} relation"
msgid_plural "{0} relations"
-msgstr[0] "{0} адносіны"
-msgstr[1] "{0} адносін"
-msgstr[2] "{0} адносін"
+msgstr[0] "{0} дачыненне"
+msgstr[1] "{0} дачыненні"
+msgstr[2] "{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 "Нявырашаны"
@@ -6216,16 +6228,17 @@ 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>"
+"<html>Адзначце, які тэг будзе прызначаны <br>на ўсе змененыя "
+"дачыненні.</html>"
msgctxt "tag"
msgid "Key:"
@@ -6252,12 +6265,13 @@ msgid ""
"ways that are members of the same relation: the combined way will take the "
"place of the original way in the relation.</html>"
msgstr ""
-"<html>Аб’яднаныя лініі з’яўляюцца членамі адных або некалькіх адносін. Калі "
-"ласка, вырашыце, ці вы хочаце <strong>пакінуць</strong> аб’яднаную лінію "
-"членам адносін, або <strong>выдаліць</strong> яе з адносін.<br>Тыпова першая "
-"лінія <strong>застаецца</strong> членам адносін, а іншыя лініі "
-"<strong>прыбіраюцца</ strong> з адных і тых жа адносін: аб’яднаная лінія "
-"займае месца арыгінальнай лініі ў адносінах.</html>"
+"<html>Аб’яднаныя лініі з’яўляюцца членамі адных або некалькіх дачыненняў. "
+"Калі ласка, вырашыце, ці вы хочаце <strong>пакінуць</strong> аб’яднаную "
+"лінію членам дачыненняў, або <strong>выдаліць</strong> яе з "
+"дачыненняў.<br>Тыпова першая лінія <strong>застаецца</strong> членам "
+"дачынення, а іншыя лініі <strong>прыбіраюцца</ strong> з адных і тых жа "
+"дачыненняў: аб’яднаная лінія займае месца арыгінальнай лініі ў "
+"дачыненні.</html>"
msgid ""
"<html>The merged nodes are members in one or more relations. Please decide "
@@ -6267,12 +6281,12 @@ msgid ""
"other nodes that are members of the same relation: the target node will take "
"the place of the original node in the relation.</html>"
msgstr ""
-"<html>Аб''ядноўваемыя кропкі ўдзельнічаюць у адных або некалькіх адносінах. "
+"<html>Аб''ядноўваемыя пункты ўдзельнічаюць у адных або некалькіх дачыненнях. "
"Вырашыце, ці трэба <strong>пакінуць</strong> гэты ўдзел у выніковай кропцы "
"або <strong>прыбраць</strong> яго.<br>Па змаўчанні "
-"<strong>пакідаецца</strong> першая кропка і <strong>прыбіраюцца</strong> ўсе "
-"астатнія, якія ўдзельнічаюць у тых жа адносінах: атрыманая кропка зойме "
-"месца зыходнай кропкі ў адносінах.</html>"
+"<strong>пакідаецца</strong> першы пункт і <strong>прыбіраюцца</strong> ўсе "
+"астатнія, якія ўдзельнічаюць у тых жа дачыненнях: атрыманы пункт зойме месца "
+"зыходнага пункта ў дачыненні.</html>"
msgid "Apply this role to all members"
msgstr "Прызначыць гэту ролю ўсім удзельнікам"
@@ -6296,6 +6310,30 @@ msgstr "Паказаць толькі тэгі з канфліктамі"
msgid "Show tags with multiple values only"
msgstr "Паказаць толькі тэгі з некалькімі значэннямі"
+msgid "Apply?"
+msgstr "Ужыць?"
+
+msgid "Relation"
+msgstr "Дачыненне"
+
+msgid "Old role"
+msgstr "Старая роля"
+
+msgid "New role"
+msgstr "Новая роля"
+
+msgid "Old key"
+msgstr "Стары ключ"
+
+msgid "Old value"
+msgstr "Старое значэнне"
+
+msgid "New key"
+msgstr "Новы ключ"
+
+msgid "New value"
+msgstr "Новае значэнне"
+
msgid "For selected objects only"
msgstr "Толькі для абраных аб’ектаў"
@@ -6392,16 +6430,16 @@ msgstr ""
"аб’ектаў."
msgid "Resolve to my versions"
-msgstr ""
+msgstr "Уладзіць да маіх версій"
msgid "Resolves all unresolved conflicts to ''my'' version"
-msgstr ""
+msgstr "Абраць для ўсіх няўладжаных канфліктаў \"маю\" версію"
msgid "Resolve to their versions"
-msgstr ""
+msgstr "Уладзіць да іх версій"
msgid "Resolves all unresolved conflicts to ''their'' version"
-msgstr ""
+msgstr "Абраць для ўсіх няўладжаных канфліктаў \"іх\" версію"
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
@@ -6456,13 +6494,15 @@ msgstr "Уладзіць канфлікты для ''{0}''"
msgid "Please confirm to remove <strong>{0} object</strong>."
msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Пацвердзіце выдаленне <strong>{0} аб''екта</strong>."
+msgstr[1] "Пацвердзіце выдаленне <strong>{0} аб''ектаў</strong>."
+msgstr[2] "Пацвердзіце выдаленне <strong>{0} аб''ектаў</strong>."
msgid "{0} relation is affected."
msgid_plural "{0} relations are affected."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "змены закрануць {0} дачыненне."
+msgstr[1] "змены закрануць {0} дачынення."
+msgstr[2] "змены закрануць {0} дачыненняў."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6477,10 +6517,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 "Пстрыкніце, каб зачыніць дыялог і адмяніць выдаленне аб’ектаў"
@@ -6528,7 +6568,7 @@ msgid "Filter Hidden:{0} Disabled:{1}"
msgstr "Фільтрам схавана:{0}, адключана:{1}"
msgid "<html>Error in filter <code>{0}</code>:<br>{1}"
-msgstr ""
+msgstr "<html>Памылка ў фільтры <code>{0}</code>:<br>{1}"
msgid "Error in filter"
msgstr "Памылка ў фільтры"
@@ -6607,7 +6647,7 @@ msgid "Way: "
msgstr "Лінія: "
msgid "Relation: "
-msgstr "Адносіны: "
+msgstr "Дачыненне: "
msgid "deleted-on-server"
msgstr "выдалены-на-серверы"
@@ -6664,7 +6704,7 @@ msgid " as \"{0}\""
msgstr " у ролі \"{0}\""
msgid "{0} Nodes: "
-msgstr "{0} кропак: "
+msgstr "{0} пунктаў: "
msgid "Bounding box: "
msgstr "Абмяжоўваючы прастакутнік: "
@@ -6747,7 +6787,7 @@ msgid "unknown"
msgstr "невядома"
msgid "Enter the coordinates for the new node."
-msgstr "Увядзіце каардынаты новай кропкі"
+msgstr "Увядзіце каардынаты новага пункта"
msgid ""
"You can separate longitude and latitude with space, comma or semicolon."
@@ -6828,51 +6868,6 @@ msgstr "Пераключыць бачнасць пласта: {0}"
msgid "Open a list of all loaded layers."
msgstr "Паказаць спіс усіх загружаных пластоў."
-msgid "Delete the selected layers."
-msgstr "Выдаліць абраныя пласты."
-
-msgid "Show/hide"
-msgstr "Паказаць/схаваць"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Паказаць/схаваць вылучаны пласт"
-
-msgid "Show/hide layer"
-msgstr "Паказаць/схаваць пласт"
-
-msgid "Opacity"
-msgstr "Непразрыстасць"
-
-msgid "Adjust opacity of the layer."
-msgstr "Наладзіць непразрыстасць пласта"
-
-msgid "Gamma"
-msgstr "Ґама (Ступень кантраснасці)"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Падладжвае палітру пласта"
-
-msgid "Activate"
-msgstr "Актываваць"
-
-msgid "Activate the selected layer"
-msgstr "Актываваць вылучаны пласт"
-
-msgid "Activate layer"
-msgstr "Актываваць пласт"
-
-msgid "Merge this layer into another layer"
-msgstr "Аб’яднаць гэты пласт з іншым пластом"
-
-msgid "Duplicate this layer"
-msgstr "Дубляваць гэты пласт"
-
-msgid "Copy of {0}"
-msgstr "Копія {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Копія {1} з {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "пласт праглядаецца (пстрыкніце, каб яго схаваць)"
@@ -6886,20 +6881,16 @@ msgid "this layer is not currently active (click to activate)"
msgstr "гэты пласт не з’яўляецца актыўным (пстрыкніце, каб яго актываваць)"
msgid "scale follows native resolution of this layer"
-msgstr ""
+msgstr "маштаб адпавядае зыходнаму дазволу гэтага пласта"
msgid ""
"scale follows native resolution of another layer (click to set this layer)"
msgstr ""
+"маштаб адпавядае зыходнаму рэзалюцыі іншага пласта (націсніце, каб задаць "
+"гэты пласт)"
msgid "this layer has no native resolution"
-msgstr ""
-
-msgid "Move the selected layer one row up."
-msgstr "Перамясціць вылучаны пласт угару."
-
-msgid "Move the selected layer one row down."
-msgstr "Перамясціць вылучаны пласт уніз."
+msgstr "у гэтага пласта адсутнічае зыходная рэзалюцыя"
msgid "Information about layer"
msgstr "Інфармацыя пра пласт"
@@ -6995,7 +6986,7 @@ msgid "Search menu items"
msgstr "Пошук пунктаў меню"
msgid "Mini map"
-msgstr "Мінімапа"
+msgstr "Мінікарта"
msgid "Displays a small map of the current edit location"
msgstr "Паказвае невялікую карту бягучай вобласці рэдагавання"
@@ -7066,9 +7057,8 @@ msgid ""
"In mixed mode, specify objects like this: {0}<br/>({1} stands for "
"<i>node</i>, {2} for <i>way</i>, and {3} for <i>relation</i>)"
msgstr ""
-"У камбінаваным рэжыме, указвайце аб''екты так: {0}<br/>({1} азначае "
-"<i>кропку (node)</ i>, {2} - <i>лінію (way)</i>, а {3} - <i>адносіны "
-"(relation)</i>)"
+"У камбінаваным рэжыме, указвайце аб''екты так: {0}<br/>({1} азначае <i>пункт "
+"(node)</ i>, {2} - <i>лінію (way)</i>, а {3} - <i>дачыненне (relation)</i>)"
msgid "Ranges of object IDs are specified with a hyphen, for instance: {0}"
msgstr "Дыяпазоны ID аб''ектаў падаюцца праз злучок, напрыклад: {0}"
@@ -7081,25 +7071,25 @@ msgstr ""
"Працягнуць немагчыма."
msgid "Relations"
-msgstr "Адносіны"
+msgstr "Дачыненні"
msgid "Open a list of all relations."
-msgstr "Паказаць спіс усіх адносін."
+msgstr "Паказаць спіс усіх дачыненняў."
msgid "Relation list filter"
-msgstr "Фільтр спісу адносін"
+msgstr "Фільтр спісу дачынення"
msgid "Create a new relation"
-msgstr "Стварыць новыя адносіны"
+msgstr "Стварыць новае дачыненне"
msgid "New"
msgstr "Стварыць"
msgid "Relations: {0}/{1}"
-msgstr "Адносіны: {0}/{1}"
+msgstr "Дачыненні: {0}/{1}"
msgid "Relations: {0}"
-msgstr "Адносіны: {0}"
+msgstr "Дачыненні: {0}"
msgid "Selection"
msgstr "Вылучэнне"
@@ -7337,15 +7327,6 @@ msgstr "Зачынены"
msgid "Discussions"
msgstr "Абмеркаванні"
-msgid "Downloading changeset content"
-msgstr "Спампоўка з сервера змесціва пакета правак"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Спампоўка з сервера пакета правак {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Спампоўка з сервера змесціва для пакета правак {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7369,7 +7350,7 @@ msgid "Download objects"
msgstr "Загрузіць аб’екты"
msgid "Download the current version of the selected objects"
-msgstr ""
+msgstr "Запампаваць бягучую версію вылучаных аб''ектаў"
msgid "Select in layer"
msgstr "Вылучыць у пласце"
@@ -7465,9 +7446,6 @@ msgstr "Абнавіць абмеркаванне пакета правак з
msgid "Date"
msgstr "Дата"
-msgid "Download changesets"
-msgstr "Запампаваць з сервера пакеты правак"
-
msgid "{0} [incomplete]"
msgstr "{0} [няпоўны]"
@@ -7637,16 +7615,6 @@ msgid "Please enter an integer value > 0"
msgstr "Увядзіце цэлы лік > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Бягучае значэнне гэта няслушнае імя карыстальніка.<br>Калі ласка, "
-"увядзіце непустое імя карыстальніка.</html>"
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7749,15 +7717,6 @@ msgstr "Няслушны URL для запыту пакета правак"
msgid "Close the dialog and abort querying of changesets"
msgstr "Зачыніць дыялог і спыніць фармаванне запытаў пакетаў правак"
-msgid "Querying and downloading changesets"
-msgstr "Запыт і спампоўка пакетаў правак з сервера"
-
-msgid "Determine user id for current user..."
-msgstr "Вызначэнне ID карыстальніка для бягучага карыстальніка..."
-
-msgid "Query and download changesets ..."
-msgstr "Запытаць і запампаваць з сервера пакеты правак ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7779,6 +7738,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Няправільны URL запыту пакета правак"
+msgid "Activate"
+msgstr "Актываваць"
+
+msgid "Activate the selected layer"
+msgstr "Актываваць вылучаны пласт"
+
+msgid "Activate layer"
+msgstr "Актываваць пласт"
+
+msgid "Delete the selected layers."
+msgstr "Выдаліць абраныя пласты."
+
+msgid "Duplicate this layer"
+msgstr "Дубляваць гэты пласт"
+
+msgid "Copy of {0}"
+msgstr "Копія {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Копія {1} з {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Змяніць бачнасць абранага пласта"
+
+msgid "Show layer"
+msgstr "Паказаць пласт"
+
+msgid "Adjust opacity of the layer."
+msgstr "Наладзіць непразрыстасць пласта"
+
+msgid "Opacity"
+msgstr "Непразрыстасць"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Падладжвае палітру пласта"
+
+msgid "Gamma"
+msgstr "Ґама (Ступень кантраснасці)"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Наладзіць рэзкасць/размытасць пласта."
+
+msgid "Sharpness"
+msgstr "Рэзкасць"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Наладзіць колеравую насычанасць пласта."
+
+msgid "Colorfulness"
+msgstr "Насычанасць"
+
+msgid "Merge this layer into another layer"
+msgstr "Аб’яднаць гэты пласт з іншым пластом"
+
+msgid "Move the selected layer one row down."
+msgstr "Перамясціць вылучаны пласт уніз."
+
+msgid "Move the selected layer one row up."
+msgstr "Перамясціць вылучаны пласт угару."
+
+msgid "Show/hide"
+msgstr "Паказаць/схаваць"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Паказаць/схаваць вылучаны пласт"
+
+msgid "Show/hide layer"
+msgstr "Паказаць/схаваць пласт"
+
msgid "Discardable key: selection Foreground"
msgstr "Выдаляемы ключ: пярэдні план вылучэння"
@@ -7840,13 +7868,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 "Дадаць новую пару ключ/значэнне для ўсіх аб’ектаў"
@@ -7861,7 +7889,7 @@ msgid "Edit Tags"
msgstr "Рэдагаваць тэгі"
msgid "Go to OSM wiki for tag help"
-msgstr ""
+msgstr "Паглядзець даведку для тэга ў OSM wiki"
msgid "Launch browser with wiki help for selected object"
msgstr "Адкрыць браўзар з апісаннем wiki для абранага аб’екта"
@@ -7897,7 +7925,7 @@ msgid "Copy the key and value of all the tags to clipboard"
msgstr "Скапіяваць ключы і значэнні ўсіх тэгаў у буфер абмену"
msgid "Copy Tags"
-msgstr ""
+msgstr "Капіяваць тэгі"
msgid "Search Key/Value/Type"
msgstr "Шукаць ключ/значэнне/тып"
@@ -7906,8 +7934,8 @@ msgid ""
"Search with the key and value of the selected tag, restrict to type (i.e., "
"node/way/relation)"
msgstr ""
-"Пры пошуку ключа і значэння абранага тэга, абмежавацца тыпам (г.зн. кропка / "
-"лінія / адносіны)"
+"Пры пошуку ключа і значэння абранага тэга, абмежавацца тыпам (г.зн. пункт / "
+"лінія / дачыненне)"
msgid "Search Key/Value"
msgstr "Пошук ключа/значэнні"
@@ -7973,7 +8001,7 @@ msgid "Remember last used tags after a restart"
msgstr "Памятаць нядаўна дададзеныя тэгі пасля перазапуску"
msgid "Recent tags with existing key"
-msgstr ""
+msgstr "Апошнія тэгі з існым ключом"
msgid "Enable"
msgstr "Уключыць"
@@ -7982,16 +8010,16 @@ msgid "Hide"
msgstr "Утоеная"
msgid "Refresh recent tags list after applying tag"
-msgstr ""
+msgstr "Абнавіць спіс апошніх тэгаў пасля ўжывання тэга"
msgid "No refresh"
-msgstr ""
+msgstr "Не абнаўляць"
msgid "Refresh tag status only (enabled / disabled)"
-msgstr ""
+msgstr "Абнавіць толькі статус тэгаў (уключаны/адключаны)"
msgid "Refresh tag status and list of recently added tags"
-msgstr ""
+msgstr "Абнавіць статус тэгаў і спіс апошніх дададзеных тэгаў"
msgid "to apply first suggestion"
msgstr "для ўжывання першай прапановы"
@@ -8026,20 +8054,21 @@ msgid "The key ''{0}'' is already used"
msgstr "Ключ «{0}» ужо выкарыстоўваецца"
msgid "Ignore key ''{0}''"
-msgstr ""
+msgstr "Ігнараваць ключ ''{0}''"
msgid "Ignore tag ''{0}''"
-msgstr ""
+msgstr "Ігнараваць тэг ''{0}''"
msgid "Edit ignore list"
-msgstr ""
+msgstr "Змяніць спіс ігнаравання"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr "Вы змянілі значэнне ''{0}'' з ''{1}'' на ''{2}''."
msgid "Edit the relation the currently selected relation member refers to."
msgstr ""
-"Рэдагаваць адносіны, да якіх належыць выдзелены ў сапраўдны момант ўдзельнік."
+"Рэдагаваць дачыненне, да якога належыць выдзелены ў сапраўдны момант "
+"ўдзельнік."
msgid "Download all child relations (recursively)"
msgstr "Спампаваць ўсе даччыныя элементы (рэкурсіўна)"
@@ -8048,7 +8077,7 @@ msgid "Download All Children"
msgstr "Спампаваць ўсе даччыныя элементы"
msgid "Download selected relations"
-msgstr "Запампаваць абраныя адносіны"
+msgstr "Запампаваць абраныя дачыненні"
msgid "Download Selected Children"
msgstr "Спампаваць даччыныя элементы для абранага"
@@ -8060,20 +8089,20 @@ msgstr[1] "Канфлікты ў дадзеных"
msgstr[2] "Канфліктаў ў дадзеных"
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>Даччынае дачыненне<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 "Выключэнне ігнаруецца, бо задача была адменена. Выключэнне: {0}"
@@ -8086,70 +8115,70 @@ msgstr[2] "Загрузка {0} незавершаных аб’ектаў"
msgid "Downloading {0} incomplete child of relation ''{1}''"
msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "Загружаецца {0} няпоўны нашчадак адносін ''{1}''"
-msgstr[1] "Загружаецца {0} няпоўных нашчадка адносін ''{1}''"
-msgstr[2] "Загружаецца {0} няпоўных нашчадкаў адносін ''{1}''"
+msgstr[0] "Загружаецца {0} няпоўны нашчадак дачынення ''{1}''"
+msgstr[1] "Загружаецца {0} няпоўных нашчадка дачынення ''{1}''"
+msgstr[2] "Загружаецца {0} няпоўных нашчадкаў дачынення ''{1}''"
msgid "Downloading {0} incomplete child of {1} parent relations"
msgid_plural "Downloading {0} incomplete children of {1} parent relations"
-msgstr[0] "Спампоўваецца {0} няпоўны нашчадак {1} бацькоўскіх адносін"
-msgstr[1] "Спампоўваецца {0} няпоўных нашчадка {1} бацькоўскіх адносін"
-msgstr[2] "Спампоўваецца {0} няпоўных нашчадкаў {1} бацькоўскіх адносін"
+msgstr[0] "Спампоўваецца {0} няпоўны нашчадак {1} бацькоўскіх дачыненняў"
+msgstr[1] "Спампоўваецца {0} няпоўных нашчадка {1} бацькоўскіх дачыненняў"
+msgstr[2] "Спампоўваецца {0} няпоўных нашчадкаў {1} бацькоўскіх дачыненняў"
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 "Увесці ролю і прымяніць яе на выдзеленых удзельнікаў дачынення"
msgid "Apply Role:"
msgstr "Ужыць ролю:"
-msgid "Enter a role and apply it to the selected relation members"
-msgstr "Увесці ролю і прымяніць яе на выдзеленых удзельнікаў адносін"
-
msgid "New Relation"
-msgstr "Новыя адносіны"
+msgstr "Новае дачыненне"
msgid "Focus Relation Editor with relation ''{0}'' in layer ''{1}''"
-msgstr "Факусаваць рэдактар адносін на адносінах ''{0}'' ў пласце ''{1}''"
+msgstr "Факусаваць рэдактар дачынення на дачыненні ''{0}'' ў пласце ''{1}''"
msgid ""
"<html>There is at least one member in this relation referring<br>to the "
"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 ""
-"Выбачайце, гарачая клавіша \"{0}\" не даступная ў акне рэдактара адносін"
+"Выбачайце, гарачая клавіша \"{0}\" не даступная ў акне рэдактара дачынення"
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>"
+"<html>Гэтае дачыненне ўжо ўтрымлівае адзін ці больш членаў, якія спасылаюцца "
+"на<br>аб''ект ''{0}''<br><br>Вы сапраўды хочаце дадаць яшчэ адзін член у "
+"дачыненне?</html>"
msgid "Multiple members referring to same object."
msgstr "Некалькі ўдзельнікаў спасылаюцца на адзін аб’ект."
@@ -8159,8 +8188,8 @@ msgid ""
"circular references and is therefore discouraged.<br>Skipping relation "
"''{0}''.</html>"
msgstr ""
-"<html>Вы спрабуеце дадаць адносіны да саміх сябе.<br><br>Гэта створыць "
-"цыклічныя спасылкі і таму не рэкамендуецца.<br>Прапусціць адносіны "
+"<html>Вы спрабуеце дадаць дачыненне да самаго сябе.<br><br>Гэта створыць "
+"цыклічныя спасылкі і таму не рэкамендуецца.<br>Прапусціць дачыненне "
"''{0}''.</html>"
msgid "Select previous Gap"
@@ -8168,14 +8197,14 @@ msgstr "Выбраць папярэдні разрыў"
msgid "Select the previous relation member which gives rise to a gap"
msgstr ""
-"Выбраць папярэдняга ўдзельніка адносін, які вінен у разрыве паслядоўнасці"
+"Выбраць папярэдняга ўдзельніка дачынення, які вінен у разрыве паслядоўнасці"
msgid "Select next Gap"
msgstr "Выбраць наступны разрыў"
msgid "Select the next relation member which gives rise to a gap"
msgstr ""
-"Выбраць наступнага ўдзельніка адносін - вінаватага ў разрыве паслядоўнасці"
+"Выбраць наступнага ўдзельніка дачынення - вінаватага ў разрыве паслядоўнасці"
msgid "Zoom to Gap"
msgstr "Маштабаваць да разрыву"
@@ -8187,43 +8216,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 "Змяніць адносіны #{0} у пласце ''{1}''"
+msgstr "Змяніць дачыненне #{0} у пласце ''{1}''"
msgid "Load relation"
-msgstr "Чытанне адносін"
+msgstr "Чытанне дачынення"
msgid ""
"Add all objects selected in the current dataset after the last selected "
@@ -8254,34 +8283,35 @@ msgid "Yes, save the changes and close"
msgstr "Так, захаваць змены і зачыніць"
msgid "Click to save the changes and close this relation editor"
-msgstr "Націсніце, каб захаваць змены і зачыніць рэдактар адносін"
+msgstr "Націсніце, каб захаваць змены і зачыніць рэдактар дачынення"
msgid "No, discard the changes and close"
msgstr "Не, адмяніць змены і зачыніць"
msgid "Click to discard the changes and close this relation editor"
-msgstr "Націсніце, каб адмяніць змены і зачыніць рэдактар адносін"
+msgstr "Націсніце, каб адмяніць змены і зачыніць рэдактар дачынення"
msgid "Cancel, continue editing"
msgstr "Адмяніць, працягнуць рэдагаванне"
msgid "Click to return to the relation editor and to resume relation editing"
msgstr ""
-"Націсніце, каб вярнуцца да рэдактара адносін і працягнуць праўку адносін"
+"Націсніце, каб вярнуцца да рэдактара дачынення і працягнуць праўку дачынення"
msgid ""
"<html>The relation has been changed.<br><br>Do you want to save your "
"changes?</html>"
-msgstr "<html>Адносіны былі зменена.<br><br>Вы хочаце захаваць змены?</html>"
+msgstr ""
+"<html>Дачыненне было зменена.<br><br>Вы хочаце захаваць змены?</html>"
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 "Запампаваць усіх няпоўных удзельнікаў"
@@ -8293,19 +8323,19 @@ 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 "Перамясціць выдзеленых удзельнікаў адносін ўніз"
+msgstr "Перамясціць выдзеленых удзельнікаў дачынення ўніз"
msgid "Relation Editor: Move Up"
-msgstr "Рэдактар адносін: падняць"
+msgstr "Рэдактар дачынення: падняць"
msgid "Move the currently selected members up"
-msgstr "Перамясціць выдзеленых удзельнікаў адносін уверх"
+msgstr "Перамясціць выдзеленых удзельнікаў дачынення уверх"
msgid "Apply the updates and close the dialog"
msgstr "Ужыць абнаўленні і зачыніць дыялог"
@@ -8318,27 +8348,29 @@ msgstr ""
"да бягучага пласту"
msgid "Relation Editor: Refresh"
-msgstr ""
+msgstr "Рэдактар дачыненняў: Абнавіць"
msgid "Refresh relation from data layer"
-msgstr ""
+msgstr "Абнавіць дачыненне з пласта дадзеных"
msgid "Refresh"
msgstr "Абнавіць"
msgid "Yes, discard changes and reload"
-msgstr ""
+msgstr "Так, скасаваць змены і перазагрузіць дадзеныя"
msgid "Click to discard the changes and reload data from layer"
-msgstr ""
+msgstr "Націсніце, каб скасаваць змены і перазагрузіць дадзеныя з пласта"
msgid ""
"<html>You have unsaved changes in this editor window.<br><br>Do you want to "
"discard these changes and reload data from layer?</html>"
msgstr ""
+"<html>У гэтым акне рэдактара ёсць не захаваныя змены.<br><br>Скасаваць гэтыя "
+"змены і перазагрузіць дадзеныя з пласта?</html>"
msgid "Click to close window"
-msgstr ""
+msgstr "Націсніце, каб зачыніць акно"
msgid "No, continue editing"
msgstr "Не, працягнуць праўку"
@@ -8347,15 +8379,17 @@ msgid ""
"<html>Relation has been deleted outside editor.<br><br>Do you want to close "
"this window?</html>"
msgstr ""
+"<html>Дачыненне было выдалена па-за рэдактарам.<br><br>Зачыніць гэта "
+"акно?</html>"
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 ""
@@ -8363,7 +8397,7 @@ msgstr ""
"аб’ектаў"
msgid "Reverse the order of the relation members"
-msgstr "Памяняць парадак удзельнікаў адносін на зваротны"
+msgstr "Памяняць парадак удзельнікаў дачынення на зваротны"
msgid "Reverse"
msgstr "У зваротным парадку"
@@ -8373,22 +8407,22 @@ 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>Вы не можаце захаваць "
+"<html>Гэтае дачыненне было зменена па-за рэдактарам<br>Вы не можаце захаваць "
"свае змены і працягнуць рэдагаванне.<br><br>Хочаце пазначыць як канфлікт і "
"зачыніць рэдактар?</html>"
@@ -8400,7 +8434,7 @@ msgstr ""
"ласка, спачатку ўладзьце гэты канфлікт, затым паспрабуйце зноў.</html>"
msgid "Select objects for selected relation members"
-msgstr "Вылучыць аб’екты для выбраных удзельнікаў адносін"
+msgstr "Вылучыць аб’екты для выбраных удзельнікаў дачынення"
msgid ""
"Select relation members which refer to objects in the current selection"
@@ -8440,28 +8474,28 @@ msgid "Confirm empty role"
msgstr "Пацвердзіць пустую ролю"
msgid "Relation Editor: Sort"
-msgstr "Рэдактар адносін: сартаваць"
+msgstr "Рэдактар дачынення: сартаваць"
msgid "Sort the relation members"
-msgstr "Сартаваць удзельнікаў адносін"
+msgstr "Сартаваць удзельнікаў дачынення"
msgid "Sort below"
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 "{0} - {1} ({2})"
@@ -8621,7 +8655,7 @@ msgstr ""
"трэкаў, нататак ці ўсяго пералічанага.</html>"
msgid "Download referrers (parent relations)"
-msgstr "Спампаваць спасылаюшчых на аб’ект (бацькоўскія адносіны)"
+msgstr "Спампаваць спасылаюшчых на аб’ект (бацькоўскія дачыненні)"
msgid "Download object"
msgstr "Запампоўка аб’екта"
@@ -8634,13 +8668,13 @@ msgid ""
"i.e.,parent relations and for nodes, additionally, parent ways"
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 "Тып класа"
@@ -8787,13 +8821,13 @@ msgid "Coordinates"
msgstr "Каардынаты"
msgid "History for node {0}"
-msgstr "Гісторыя кропкі {0}"
+msgstr "Гісторыя пункта {0}"
msgid "History for way {0}"
msgstr "Гісторыя лініі {0}"
msgid "History for relation {0}"
-msgstr "Гісторыя адносін {0}"
+msgstr "Гісторыя дачынення {0}"
msgid "Reload the history from the server"
msgstr "Запампаваць гісторыю з сервера"
@@ -8828,13 +8862,13 @@ msgid "Load history"
msgstr "Запампаваць гісторыю"
msgid "Loading history for node {0}"
-msgstr "Спампоўка гісторыі для кропкі {0}"
+msgstr "Спампоўка гісторыі для пункта {0}"
msgid "Loading history for way {0}"
msgstr "Спампоўка гісторыі лініі {0}"
msgid "Loading history for relation {0}"
-msgstr "Чытанне гісторыі для адносін {0}"
+msgstr "Чытанне гісторыі для дачынення {0}"
msgid "Node {0}"
msgstr "Кропка {0}"
@@ -8843,19 +8877,19 @@ msgid "The nodes of this way are in reverse order"
msgstr "Кропкі на гэтай лініі ідуць у адваротным парадку"
msgid "Zoom to node"
-msgstr "Наблізіцца да кропкі"
+msgstr "Наблізіцца да пункта"
msgid "Zoom to this node in the current data layer"
-msgstr "Наблізіцца да гэтай кропкі ў бягучым пласце"
+msgstr "Наблізіцца да гэтага пункта ў бягучым пласце"
msgid "Open a history browser with the history of this node"
-msgstr "Адкрыць гісторыю гэтай кропкі з дапамогай браўзара"
+msgstr "Адкрыць гісторыю гэтага пункта з дапамогай браўзара"
msgid "Way {0}"
msgstr "Лінія {0}"
msgid "Relation {0}"
-msgstr "Адносіны {0}"
+msgstr "Дачыненне {0}"
msgid "Object"
msgstr "Аб’ект"
@@ -8888,8 +8922,9 @@ msgstr ""
msgid "This changeset has {0} comment"
msgid_plural "This changeset has {0} comments"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "У гэтага пакета змен {0} каментар"
+msgstr[1] "У гэтага пакета змен {0} каментара"
+msgstr[2] "У гэтага пакета змен {0} каментароў"
msgid "Changeset"
msgstr "Пакет правак"
@@ -8935,13 +8970,13 @@ msgstr ""
"не ўтрымоўвае такога элемента"
msgid "Synchronize node {0} only"
-msgstr "Сінхранізаваць толькі кропку {0}"
+msgstr "Сінхранізаваць толькі пункт {0}"
msgid "Synchronize way {0} only"
msgstr "Сінхранізаваць толькі лінію {0}"
msgid "Synchronize relation {0} only"
-msgstr "Сінхранізаваць толькі адносіны {0}"
+msgstr "Сінхранізаваць толькі дачыненне {0}"
msgid "Synchronize entire dataset"
msgstr "Сінхранізаваць увесь набор дадзеных"
@@ -8957,7 +8992,7 @@ msgid ""
"editing.<br></html>"
msgstr ""
"<html>Перадача на сервер <strong>перапынена</strong> бо на серверы ёсць "
-"навейшая версія адной<br>з вашых кропак, ліній ці адносін.<br>Чыннікам "
+"навейшая версія адной<br>з вашых пунктаў, ліній ці дачыненняў.<br>Чыннікам "
"канфлікту з’яўляецца <strong>{0}</strong> з id "
"<strong>{1}</strong>,<br>версія дадзеных на серверы {2}, ваша версія "
"{3}.<br><br>Націсніце <strong>{4}</strong>, каб сінхранізаваць толькі "
@@ -8973,7 +9008,7 @@ msgid ""
"editing.<br></html>"
msgstr ""
"<html><strong>Перадача на сервер </strong>не атрымалася, бо на серверы "
-"маецца навейшая версія адной <br> з вашых кропак, ліній ці адносін. "
+"маецца навейшая версія адной <br> з вашых пунктаў, ліній ці дачыненняў. "
"<br><br>. Націсніце на <strong>{0}</strong> для сінхранізацыі лакальных "
"дадзеных з серверам. <br> Націсніце <strong>{1}</strong> каб перапыніць "
"перадачу і працягнуць рэдагаванне.<br></html>"
@@ -9021,12 +9056,14 @@ msgid ""
"Select which actions to perform for this layer, if you click the leftmost "
"button."
msgstr ""
+"Абярыце, якое дзеянне выканаць для гэтага пласта па націску самай левай "
+"кнопкі."
msgid "Check \"Upload\" to upload the changes to the OSM server."
-msgstr ""
+msgstr "Уключыце \"Перадаць на сервер\" для адпраўкі змен на сервер OSM."
msgid "Check \"Save\" to save the layer to the file specified on the left."
-msgstr ""
+msgstr "Уключыце \"Захаваць\" для захавання пласта ў паказаны злева файл."
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Пракаментуйце дадзеныя, якія перадаюцца на сервер:"
@@ -9231,7 +9268,7 @@ msgstr ""
"{0}"
msgid "Initializing nodes to download ..."
-msgstr "Ініцыялізацыя кропак для загрузкі..."
+msgstr "Ініцыялізацыя пунктаў для загрузкі..."
msgid "Object could not be downloaded"
msgid_plural "Some objects could not be downloaded"
@@ -9349,8 +9386,9 @@ msgstr[1] ""
"абярыце файл для кожнага пласта, альбо адмяніце змены.<br>Пласты без "
"файла:</html>"
msgstr[2] ""
-"<html>{0} слаёў трэба захаваць, але няма адпаведнага файла.<br>Альбо абярыце "
-"файл для кожнага пласта, альбо адмяніце змены.<br>Пласты без файла:</html>"
+"<html>{0} пластоў трэба захаваць, але няма адпаведнага файла.<br>Альбо "
+"абярыце файл для кожнага пласта, альбо адмяніце змены.<br>Пласты без "
+"файла:</html>"
msgid "Unsaved data and missing associated file"
msgstr "Незахаваныя дадзеныя і адсутнасць адпаведнага файла"
@@ -9470,13 +9508,13 @@ msgid "Update objects"
msgstr "Абнавіць аб’екты"
msgid "Initializing nodes to update ..."
-msgstr "Ініцыялізацыя кропак для абнаўлення ..."
+msgstr "Ініцыялізацыя пунктаў для абнаўлення ..."
msgid "Initializing ways to update ..."
msgstr "Ініцыялізацыя ліній для абнаўлення ..."
msgid "Initializing relations to update ..."
-msgstr "Ініцыялізацыя адносін для абнаўлення ..."
+msgstr "Ініцыялізацыя дачыненняў для абнаўлення ..."
msgid "Settings"
msgstr "Налады"
@@ -9731,7 +9769,7 @@ msgid "Way ''{0}'' is already deleted. Skipping object in upload."
msgstr "Лінія «{0}» ужо выдалена. Аб’ект будзе прапушчаны пры перадачы."
msgid "Relation ''{0}'' is already deleted. Skipping object in upload."
-msgstr "Адносіны «{0}» ужо выдалены. Аб''ект будзе прапушчаны пры перадачы."
+msgstr "Дачыненне «{0}» ужо выдалена. Аб''ект будзе прапушчаны пры перадачы."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
@@ -9865,7 +9903,7 @@ msgstr[1] "Выдаліць {0} аб’екта:"
msgstr[2] "Выдаліць {0} аб’ектаў:"
msgid "Show tile info"
-msgstr ""
+msgstr "Паказаць інфармацыю пра квадрат"
msgid "Tile Info"
msgstr "Інфармацыя пра квадрат"
@@ -9874,22 +9912,22 @@ msgid "Metadata "
msgstr "Метададзеныя "
msgid "Load tile"
-msgstr ""
+msgstr "Запампаваць квадрат"
msgid "Auto zoom"
-msgstr ""
+msgstr "Аўтамаштабаванне"
msgid "Auto load tiles"
msgstr "Аўтазагрузка квадратаў"
msgid "Show errors"
-msgstr ""
+msgstr "Паказваць памылкі"
msgid "Load all tiles"
-msgstr ""
+msgstr "Запампаваць усе квадраты"
msgid "Load all error tiles"
-msgstr ""
+msgstr "Запампаваць усе квадраты з памылкамі"
msgid "Zoom to native resolution"
msgstr "Маштабаваць да зыходнага разрознення"
@@ -9904,7 +9942,7 @@ msgid "Decrease zoom"
msgstr "Паменшыць маштаб"
msgid "Flush tile cache"
-msgstr ""
+msgstr "Скінуць кэш квадратаў"
msgid "Failed to create tile source"
msgstr "Не атрымалася стварыць крыніцу тайлаў"
@@ -9955,6 +9993,8 @@ msgid ""
"Aerial imagery \"{0}\" might be misaligned. Please check its offset using "
"GPS tracks!"
msgstr ""
+"Спадарожнікавы здымак \"{0}\" можа быць зрушаны. Праверце зрушэнне па GPS-"
+"трэкам!"
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgstr "http://wiki.openstreetmap.org/wiki/Using_Imagery"
@@ -10009,9 +10049,9 @@ msgstr[2] "{0} маршрутаў, "
msgid "{0} waypoint"
msgid_plural "{0} waypoints"
-msgstr[0] "{0} шляхавая кропка"
-msgstr[1] "{0} шляхавыя кропкі"
-msgstr[2] "{0} шляхавых кропак"
+msgstr[0] "{0} шляхавы пункт"
+msgstr[1] "{0} шляхавыя пункты"
+msgstr[2] "{0} шляхавых пунктаў"
msgid "{0} track, "
msgid_plural "{0} tracks, "
@@ -10028,9 +10068,6 @@ msgstr "Падкладка: згасанне да"
msgid "Unsupported imagery type: {0}"
msgstr "Непадтрымоўваемы тып фонавага здымка: {0}"
-msgid "ERROR"
-msgstr "Памылка"
-
msgid "Next marker"
msgstr "Наступны маркер"
@@ -10058,16 +10095,16 @@ msgid "All projections are supported"
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 "Запісаць слой"
+msgstr "Захаваць пласт"
msgid "Notes layer"
msgstr "Пласт нататак"
@@ -10569,10 +10606,10 @@ msgid "track only"
msgstr "толькі трэк"
msgid "waypoints only"
-msgstr "толькі шляхавыя кропкі"
+msgstr "толькі шляхавыя пункты"
msgid "track and waypoints"
-msgstr "трэкі і шляхавыя кропкі"
+msgstr "трэкі і шляхавыя пункты"
msgid "Click to download"
msgstr "Пстрыкніце для загрузкі"
@@ -10617,7 +10654,7 @@ msgid "Direction"
msgstr "Кірунак"
msgid "gps point"
-msgstr "кропка GPS"
+msgstr "пункт GPS"
msgid "Import Audio"
msgstr "Імпартаваць аўдыёфайлы"
@@ -10628,7 +10665,7 @@ msgid ""
"correlate them with audio data.</html>"
msgstr ""
"<html>Дадзеныя ў пласце GPX ''{0}'' былі папярэдне загружаныя з "
-"сервера.<br>Паколькі шляхавыя кропкі не ўтрымліваюць метак часу, мы не можам "
+"сервера.<br>Паколькі шляхавыя пункты не ўтрымліваюць метак часу, мы не можам "
"сінхранізаваць іх з аўдыёдадзенымі.</html>"
msgid "Import not possible"
@@ -10647,14 +10684,14 @@ msgid ""
"Some waypoints with timestamps from before the start of the track or after "
"the end were omitted or moved to the start."
msgstr ""
-"Некаторыя шляхавыя кропкі створаны да пачатку трэка ці пасля яго канчатка і "
+"Некаторыя шляхавыя пункты створаны да пачатку трэка ці пасля яго канчатка і "
"будуць прапушчаны ці перанесены ў пачатак трэка."
msgid ""
"Some waypoints which were too far from the track to sensibly estimate their "
"time were omitted."
msgstr ""
-"Некаторыя шляхавыя кропкі, якія былі занадта далёка ад астатніх, былі "
+"Некаторыя шляхавыя пункты, якія былі занадта далёка ад астатніх, былі "
"праігнараваны пры разліку часу."
msgid "Import images"
@@ -10666,14 +10703,14 @@ msgid ""
"correlate them with images.</html>"
msgstr ""
"<html>Дадзеныя ў пласце GPX ''{0}'' былі папярэдне загружаныя з "
-"сервера.<br>Паколькі шляхавыя кропкі не ўтрымліваюць метак часу, мы не можам "
+"сервера.<br>Паколькі шляхавыя пункты не ўтрымліваюць метак часу, мы не можам "
"сінхранізаваць іх з выявамі.</html>"
msgid "Markers From Named Points"
-msgstr "Маркеры з найменных кропак"
+msgstr "Маркеры з найменных пунктаў"
msgid "Named Trackpoints from {0}"
-msgstr "Найменныя кропкі трэка з {0}"
+msgstr "Найменныя пункты трэка з {0}"
msgid "gps marker"
msgstr "маркер GPS"
@@ -10736,7 +10773,7 @@ msgid ""
"point where you want to synchronize."
msgstr ""
"Трэба ўтрымліваць Shift і перацягнуць значок лапкі прайгравальніка на аўдыё "
-"маркер ці на кропку трэка, дзе вы жадаеце сінхранізаваць."
+"маркер ці на пункт трэка, дзе вы жадаеце сінхранізаваць."
msgid "Unable to create new audio marker."
msgstr "Немагчыма стварыць новы аўдыё-маркер."
@@ -10757,6 +10794,8 @@ msgid ""
"JOSM does no longer support mappaint styles written in the old XML format.\n"
"Please update ''{0}'' to MapCSS"
msgstr ""
+"JOSM больш не падтрымлівае стылі mappaint, напісаныя ў старым фармаце XML.\n"
+"Абнавіце ''{0}'' на MapCSS"
msgid "loading style ''{0}''..."
msgstr "загрузка стылю ''{0}''..."
@@ -10819,10 +10858,10 @@ msgid "Authorize URL:"
msgstr "URL аўтарызацыі:"
msgid "OSM login URL:"
-msgstr ""
+msgstr "URL уваходу ў OSM:"
msgid "OSM logout URL:"
-msgstr ""
+msgstr "URL выхаду з OSM:"
msgid "Click to reset the OAuth settings to default values"
msgstr "Націсніце, каб скінуць налады OAuth да значэнняў па змаўчанні"
@@ -10930,14 +10969,6 @@ msgstr "Запусціць працэдуру аўтаматычнай аўта
msgid "Test Access Token"
msgstr "Тэст маркера доступу"
-msgid "Please enter your OSM user name"
-msgstr "Калі ласка, увядзіце ваша імя карыстальніка ў OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Імя карыстальніка не можа быць пустым. Калі ласка, увядзіце Ваша імя "
-"карыстальніка ў OSM"
-
msgid "Please enter your OSM password"
msgstr "Калі ласка, увядзіце ваш OSM-пароль"
@@ -11042,6 +11073,9 @@ msgid ""
"sure to set an OAuth consumer key and secret in the <i>Advanced OAuth "
"parameters</i>."
msgstr ""
+"<strong>Увага:</strong> Паколькі вы выкарыстоўваеце не стандартны OSM API, "
+"не забудзьцеся наладзіць ключ спажыўца OAuth і крыптаключ у <i>Пашыраных "
+"наладах OAuth</i>."
msgid "Get an Access Token for ''{0}''"
msgstr "Атрымаць маркер доступу для ''{0}''"
@@ -11614,13 +11648,13 @@ msgid "Display live audio trace."
msgstr "Паказаць гукавыя падказкі ў рэальным часе"
msgid "Explicit waypoints with valid timestamps."
-msgstr "Дакладных шляхавых кропак з правільнымі часавымі пазнакамі"
+msgstr "Дакладных шляхавых пунктаў з правільнымі часавымі пазнакамі"
msgid "Explicit waypoints with time estimated from track position."
-msgstr "Дакладных шляхавых кропак з прыблізным часам з пазіцыі на трэку"
+msgstr "Дакладных шляхавых пунктаў з прыблізным часам з пазіцыі на трэку"
msgid "Named trackpoints."
-msgstr "Названыя кропкі трэка."
+msgstr "Названыя пункты трэка."
msgid "Modified times (time stamps) of audio files."
msgstr "Часоў змен (пазнак часу) гукавых файлаў"
@@ -11650,14 +11684,14 @@ msgstr "Пры імпартаванні гуку, ствараць пазнак
msgid "When importing audio, apply it to any waypoints in the GPX layer."
msgstr ""
-"Калі імпартуецца гук, ужываць яго для любых шляхавых кропак з пласта GPX."
+"Калі імпартуецца гук, ужываць яго для любых шляхавых пунктаў з пласта GPX."
msgid ""
"Automatically create audio markers from trackpoints (rather than explicit "
"waypoints) with names or descriptions."
msgstr ""
-"Аўтаматычна ствараць гукавыя пазнакі з кропак трэка (замест відавочных "
-"шляхавых кропак) з імёнамі ці апісаннямі."
+"Аўтаматычна ствараць гукавыя пазнакі з пунктаў трэка (замест відавочных "
+"шляхавых пунктаў) з імёнамі ці апісаннямі."
msgid ""
"Create audio markers at the position on the track corresponding to the "
@@ -11744,7 +11778,7 @@ msgid "Draw boundaries of downloaded data"
msgstr "Адлюстроўваць межы запампаваных дадзеных"
msgid "Draw virtual nodes in select mode"
-msgstr "Адлюстроўваць віртуальныя кропкі ў рэжыме выбару"
+msgstr "Адлюстроўваць віртуальныя пункты ў рэжыме выбару"
msgid "Draw inactive layers in other color"
msgstr "Адлюстроўваць неактыўныя пласты іншым колерам"
@@ -11753,7 +11787,7 @@ msgid "Display discardable keys"
msgstr "Паказваць выдаляемыя ключы"
msgid "Highlight target ways and nodes"
-msgstr "Вылучыце мэтавыя лініі і кропкі"
+msgstr "Вылучыце мэтавыя лініі і пункты"
msgid "Draw rubber-band helper line"
msgstr "Маляваць «гумовую» дапаможную лінію"
@@ -11784,7 +11818,7 @@ msgid "Draw the boundaries of data loaded from the server."
msgstr "Адлюстроўваць межы вобласці, запампаванай з сервера."
msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Адлюстроўваць віртуальныя кропкі ў рэжыме выбару, для выгоды праўкі."
+msgstr "Адлюстроўваць віртуальныя пункты ў рэжыме выбару, для выгоды праўкі."
msgid "Draw the inactive data layers in a different color."
msgstr "Адлюстроўваць неактыўныя пласты дадзеных іншым колерам."
@@ -11801,7 +11835,7 @@ msgstr ""
"контураў."
msgid "Hightlight target nodes and ways while drawing or selecting"
-msgstr "Адзначце мэтавыя кропкі і лініі падчас малявання ці выбару"
+msgstr "Адзначце мэтавыя пункты і лініі падчас малявання ці выбару"
msgid ""
"This option suppresses the filling of areas, overriding anything specified "
@@ -11865,7 +11899,7 @@ msgid "Force lines if no segments imported"
msgstr "Адлюстроўваць лініі, нават калі няма імпартаваных сегментаў"
msgid "Draw large GPS points"
-msgstr "Маляваць буйныя GPS кропкі"
+msgstr "Маляваць буйныя GPS пункты"
msgid "Draw a circle from HDOP value"
msgstr "Маляваць круг значэння HDOP"
@@ -11885,7 +11919,7 @@ msgid "Track date"
msgstr "Дата трэка"
msgid "Single Color (can be customized for named layers)"
-msgstr "Адным колерам (можа быць вызначана для найменных слаёў)"
+msgstr "Адным колерам (можа быць вызначана для найменных пластоў)"
msgid "Car"
msgstr "Аўтамабіль"
@@ -11912,10 +11946,10 @@ msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
msgstr ""
-"Аўтаматычна ствараць пласт метак з шляхавых кропак пры адкрыцці GPX пласта."
+"Аўтаматычна ствараць пласт метак з шляхавых пунктаў пры адкрыцці GPX пласта."
msgid "Draw lines between raw GPS points"
-msgstr "Маляваць лініі паміж кропкамі GPS"
+msgstr "Маляваць лініі паміж пунктамі GPS"
msgid ""
"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11942,7 +11976,7 @@ msgstr ""
"Адлюстроўваць лініі, нават калі няма імпартаванай інфармацыі пра лініі."
msgid "Draw direction arrows for lines, connecting GPS points."
-msgstr "Адлюстроўваць стрэлкі на лініях, якія злучаюць кропкі GPS."
+msgstr "Адлюстроўваць стрэлкі на лініях, якія злучаюць пункты GPS."
msgid ""
"Draw the direction arrows using table lookups instead of complex math."
@@ -11963,7 +11997,7 @@ msgid "Draw a circle from HDOP value."
msgstr "Маляваць круг значэння HDOP."
msgid "Draw larger dots for the GPS points."
-msgstr "Адлюстроўваць кропкі GPS больш тоўста"
+msgstr "Адлюстроўваць пункты GPS больш тоўста"
msgid "Width of drawn GPX line (0 for default)"
msgstr "Шырыня адлюстроўванай лініі GPX трэка (0 для шырыні па змаўчанні)"
@@ -11979,48 +12013,48 @@ msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
-"Аднолькавы колер ва ўсіх кропак і сегментаў трэкаў. Колер можа быць "
-"вызначаны ў менеджэры слаёў."
+"Аднолькавы колер ва ўсіх пунктаў і сегментаў трэкаў. Колер можа быць "
+"вызначаны ў менеджэры пластоў."
msgid "Colors points and track segments by velocity."
-msgstr "Колеры кропак і сегментаў трэкаў па хуткасці."
+msgstr "Колеры пунктаў і сегментаў трэкаў па хуткасці."
msgid "Colors points and track segments by direction."
-msgstr "Размаляваць кропкі і сегменты трэка па кірунку."
+msgstr "Размаляваць пункты і сегменты трэка па кірунку."
msgid ""
"Colors points and track segments by dilution of position (HDOP). Your "
"capture device needs to log that information."
msgstr ""
-"Колеры кропак і сегментаў трэка залежаць ад \"зніжэння дакладнасці\" (HDOP). "
-"Ваша прылада павінна рэгістраваць гэтую інфармацыю."
+"Колеры пунктаў і сегментаў трэка залежаць ад \"зніжэння дакладнасці\" "
+"(HDOP). Ваша прылада павінна рэгістраваць гэтую інфармацыю."
msgid "Colors points and track segments by its timestamp."
-msgstr "Размаляваць кропкі і сегменты трэка па пазнаках часу."
+msgstr "Размаляваць пункты і сегменты трэка па пазнаках часу."
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Дазваляе наладжваць афарбоўку трэка для розных сярэдніх хуткасцяў."
msgid "Track and Point Coloring"
-msgstr "Размаляваць трэкі і кропкі"
+msgstr "Размаляваць трэкі і пункты"
msgid "Colors points and track segments by data limits."
-msgstr "Размаляваць кропкі і сегменты трэка па межах дадзеных."
+msgstr "Размаляваць пункты і сегменты трэка па межах дадзеных."
msgid "Waypoint labelling"
-msgstr "Адлюстраванне шляхавых кропак"
+msgstr "Адлюстраванне шляхавых пунктаў"
msgid "Audio waypoint labelling"
-msgstr "Аўдыё-адзнакі дарожных кропак"
+msgstr "Аўдыё-адзнакі дарожных пунктаў"
msgid "Incorrect waypoint label pattern: {0}"
-msgstr "Няправільны шаблон подпісу шляхавой кропкі: {0}"
+msgstr "Няправільны шаблон подпісу шляхавага пункта: {0}"
msgid "Incorrect pattern"
msgstr "Няслушны шаблон"
msgid "Incorrect audio waypoint label pattern: {0}"
-msgstr "Няправільны шаблон подпісу аўдыё шляхавой кропкі: {0}"
+msgstr "Няправільны шаблон подпісу аўдыё шляхавага пункта: {0}"
msgid "Show splash screen at startup"
msgstr "Паказваць застаўку пры запуску"
@@ -12046,10 +12080,10 @@ msgstr ""
"фільтры файлаў)"
msgid "Reverse zoom with mouse wheel"
-msgstr ""
+msgstr "Звярнуць маштабаванне колцам мышы"
msgid "Intermediate steps between native resolutions"
-msgstr ""
+msgstr "Прамежкавыя ступені паміж зыходнымі рэзалюцыямі"
msgid "Show localized name in selection lists, if available"
msgstr "Паказаць беларускую назву ў спісах выбару, калі магчыма"
@@ -12080,19 +12114,23 @@ msgstr ""
"напрыклад, фільтры тыпаў файлаў"
msgid "Check if you feel opposite direction more convenient"
-msgstr ""
+msgstr "Уключыце, калі вам зручней зваротны кірунак"
msgid ""
"Divide intervals between native resolution levels to smaller steps if they "
"are much larger than zoom ratio"
msgstr ""
+"Падзяліць інтэрвалы паміж узроўнямі зыходнага рэзалюцыі на драбнейшыя "
+"ступені, калі яны нашмат больш, чым каэфіцыент маштабавання"
msgid "Zoom steps to get double scale"
-msgstr ""
+msgstr "Колькасць ступеняў маштабавання для падваення маштабу"
msgid ""
"Higher value means more steps needed, therefore zoom steps will be smaller"
msgstr ""
+"Большае значэнне азначае неабходнасць большага ліку крокаў, так што самі "
+"крокі маштабавання будуць менш"
msgid "Look and Feel"
msgstr "Афармленне"
@@ -12149,7 +12187,7 @@ msgid "4. Enter name for this layer"
msgstr "4. Увядзіце імя для гэтага пласта"
msgid "Store WMS endpoint only, select layers at usage"
-msgstr "Захаваць толькі канцавыя кропкі WMS, абярыце пласт для выкарыстання"
+msgstr "Захаваць толькі канцавыя пункты WMS, абярыце пласт для выкарыстання"
msgid "Show bounds"
msgstr "Паказаць межы"
@@ -12349,7 +12387,7 @@ msgstr ""
"аднавіць не захаваныя змены пры наступным запуску.)</i>"
msgid "Keep backup files when saving data layers"
-msgstr "Не выдаляць файлы рэзервовых копій пры захаванні слаёў дадзеных"
+msgstr "Не выдаляць файлы рэзервовых копій пры захаванні пластоў дадзеных"
msgid "When saving, keep backup files ending with a ~"
msgstr ""
@@ -12359,7 +12397,7 @@ msgid ""
"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
"the file name and saves it in the same folder.)</i>"
msgstr ""
-"<i>(JOSM можа не выдаляць файлы рэзервовых копій пры захаванні слаёў "
+"<i>(JOSM можа не выдаляць файлы рэзервовых копій пры захаванні пластоў "
"дадзеных. Пры гэтым да імя файла дадаецца суфікс ''~'' і ён захоўваецца ў "
"той жа тэчцы.)</i>"
@@ -12484,7 +12522,7 @@ msgstr ""
"{1}</table></html>"
msgid "Sort presets menu alphabetically"
-msgstr ""
+msgstr "Сартаваць меню нарыхтовак па алфавіце"
msgid "Tagging Presets"
msgstr "Нарыхтоўкі тэгаў"
@@ -12773,7 +12811,7 @@ msgid "LKS-92 (Latvia TM)"
msgstr "LKS-92 (TM Латвіі)"
msgid "Rijksdriehoekscoördinaten (Netherlands)"
-msgstr ""
+msgstr "Rijksdriehoekscoordinaten (Нідэрланды)"
msgid "SWEREF99 13 30 / EPSG:3008 (Sweden)"
msgstr "SWEREF99 13 30 / EPSG:3008 (Швецыя)"
@@ -13096,7 +13134,7 @@ msgid "Please enter the OSM API URL."
msgstr "Калі ласка, увядзіце URL OSM API."
msgid "Use Overpass server for object downloads"
-msgstr ""
+msgstr "Выкарыстоўваць сервер Overpass для загрузкі аб''ектаў"
msgid "Overpass server: "
msgstr "Сервер Overpass: "
@@ -13158,6 +13196,14 @@ msgstr "Параметры злучэння"
msgid "Connection Settings for the OSM server."
msgstr "Параметры злучэння з серверам OSM."
+msgid "Please enter your OSM user name"
+msgstr "Калі ласка, увядзіце ваша імя карыстальніка ў OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Імя карыстальніка не можа быць пустым. Калі ласка, увядзіце Ваша імя "
+"карыстальніка ў OSM"
+
msgid "Action"
msgstr "Дзеянне"
@@ -13277,7 +13323,7 @@ msgid "Checks for errors on religious objects"
msgstr "Праверка на памылкі рэлігійных аб’ектаў"
msgid "Checks for errors on relations"
-msgstr "Праверка памылак у адносінах"
+msgstr "Праверка памылак у дачыненнях"
msgid "Unnecessary tags"
msgstr "Непатрэбныя тэгі"
@@ -13361,7 +13407,7 @@ msgid "Elements of type {0} are supported."
msgstr "Падтрымліваецца элемент тыпу {0}."
msgid "This preset also sets: {0}"
-msgstr ""
+msgstr "Гэта нарыхтоўка таксама дадае: {0}"
msgid "Edit also …"
msgstr "Змяніць таксама..."
@@ -13370,7 +13416,7 @@ msgid "Apply Preset"
msgstr "Ужыць нарыхтоўку"
msgid "New relation"
-msgstr "Новыя адносіны"
+msgstr "Новае дачыненне"
msgid ""
"The preset <i>{0}</i> cannot be applied since nothing has been selected!"
@@ -13436,7 +13482,7 @@ msgid "Presets"
msgstr "Нарыхтоўкі"
msgid "Search for objects by preset..."
-msgstr ""
+msgstr "Пошук аб''ектаў па нарыхтоўцы..."
msgid "Search for objects by preset"
msgstr "Пошук аб’ектаў па нарыхтоўцы"
@@ -13492,7 +13538,7 @@ msgstr ""
"''short_descriptions'' павінна быць такім жа, як і ў ''values''"
msgid "This corresponds to the key ''{0}''"
-msgstr ""
+msgstr "Гэта адпавядае ключу ''{0}''"
msgid "More information about this feature"
msgstr "Падрабязней"
@@ -13592,13 +13638,13 @@ msgid "false: the property is explicitly switched off"
msgstr "false: параметр відавочна выключаны"
msgid "false: the property ''{0}'' is explicitly switched off"
-msgstr ""
+msgstr "false: уласцівасць ''{0}'' відавочна выключана"
msgid "true: the property is explicitly switched on"
msgstr "true: параметр відавочна ўключаны"
msgid "true: the property ''{0}'' is explicitly switched on"
-msgstr ""
+msgstr "true: уласцівасць ''{0}'' відавочна ўключана"
msgid ""
"partial: different selected objects have different values, do not change"
@@ -13608,12 +13654,13 @@ msgid ""
"partial: different selected objects have different values for ''{0}'', do "
"not change"
msgstr ""
+"partial: у розных абраных аб''ектаў розныя значэнні ''{0}'', не змяняюцца"
msgid "unset: do not set this property on the selected objects"
msgstr "абнуліць: не ўсталёўваць гэты параметр для выбраных аб’ектаў"
msgid "unset: do not set the property ''{0}'' on the selected objects"
-msgstr ""
+msgstr "unset: не ўсталёўваць уласцівасць ''{0}'' у вылучаных аб''ектаў"
msgid "Cut"
msgstr "Выразаць"
@@ -13657,33 +13704,33 @@ msgstr ""
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
-"Лінія з вонкавым ID ''{0}'' утрымоўвае адсутную кропку з вонкавым ID ''{1}''."
+"Лінія з вонкавым ID ''{0}'' утрымоўвае адсутны пункт з вонкавым ID ''{1}''."
msgid "Deleted node {0} is part of way {1}"
-msgstr "Выдаленая кропка {0} гэта частка лініі {1}"
+msgstr "Выдалены пункт {0} гэта частка лініі {1}"
msgid ""
"Way {0} with {1} nodes has incomplete nodes because at least one node was "
"missing in the loaded data."
msgstr ""
-"Лінія {0} з {1} кропкамі ўтрымоўвае незавершаныя кропкі, таму што, прынамсі, "
-"адна кропка адсутнічала ў дадзеных, загружаных з сервера."
+"Лінія {0} з {1} пунктамі ўтрымоўвае незавершаныя пункты, таму што, прынамсі, "
+"адзін пункт адсутнічала ў дадзеных, загружаных з сервера."
msgid ""
"Relation with external id ''{0}'' refers to a missing primitive with "
"external id ''{1}''."
msgstr ""
-"Адносіны з вонкавым id ''{0}'' звяртаецца да адсутнага элемента з вонкавым "
+"Дачыненне з вонкавым id ''{0}'' звяртаецца да адсутнага элемента з вонкавым "
"id ''{1}''."
msgid "Deleted member {0} is used by relation {1}"
-msgstr "Выключаны член {0} ўваходзіць у склад адносін {1}"
+msgstr "Выключаны член {0} ўваходзіць у склад дачынення {1}"
msgid "All Formats"
msgstr "Усе фарматы"
msgid "Downloading points {0} to {1}..."
-msgstr "Спампоўка кропак з {0} да {1}..."
+msgstr "Спампоўка пунктаў з {0} да {1}..."
msgid "Contacting OSM Server..."
msgstr "Падлучэнне да сервера OSM..."
@@ -13716,6 +13763,16 @@ msgstr ""
"Недапушчальнае значэнне атрыбуту ''{0}'' элемента ''{1}'' у магчымасцях "
"сервера, роўнае ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Памылка пры даданні сертыфіката {0} - не супадае адбітак сертыфіката. "
+"Чакаўся {1}, атрыманы {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Даданне сертыфіката для TLS-злучэнняў: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Сервер паведаміў пра няўдалы разбор даты ''{0}''."
@@ -13926,13 +13983,13 @@ msgid "{0} not available (offline mode)"
msgstr "{0} недаступны (аўтаномны рэжым)"
msgid "Fetching a package of nodes from ''{0}''"
-msgstr "Выбарка пакета кропак з ''{0}''"
+msgstr "Выбарка пакета пунктаў з ''{0}''"
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}''"
@@ -13951,13 +14008,13 @@ msgid "Downloading OSM data..."
msgstr "Спампоўка дадзеных OSM..."
msgid "Fetching node with id {0} from ''{1}''"
-msgstr "Выбарка кропкі з id {0} з ''{1}''"
+msgstr "Выбарка пункта з id {0} з ''{1}''"
msgid "Fetching way with id {0} from ''{1}''"
msgstr "Выбарка лініі з id {0} з ''{1}''"
msgid "Fetching relation with id {0} from ''{1}''"
-msgstr "Выбарка адносін з id {0} з '' {1} ''"
+msgstr "Выбарка дачынення з id {0} з '' {1} ''"
msgid "Server replied with response code 404 for id {0}. Skipping."
msgstr "Сервер выдаў памылку 404 для id {0}. Прапускаем."
@@ -14201,7 +14258,7 @@ msgstr ""
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
msgid "Deleted way {0} contains nodes"
-msgstr "Выдаленая лінія {0} утрымоўвае кропкі"
+msgstr "Выдаленая лінія {0} утрымоўвае пункты"
msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
msgstr "Адсутнічае абавязковы атрыбут ''{0}'' на <nd> лініі {1}."
@@ -14210,23 +14267,24 @@ msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
msgstr "Няслушнае значэнне атрыбуту ''ref'' элемента <nd>. Атрымана {0}."
msgid "Deleted relation {0} contains members"
-msgstr "Выдаленыя адносіны {0} ўтрымліваюць даччыныя элементы"
+msgstr "Выдаленае дачыненне {0} ўтрымлівае даччыныя элементы"
msgid "Missing attribute ''ref'' on member in relation {0}."
-msgstr "Адсутнічае атрыбут ''ref'' ва ўдзельніка адносін {0}."
+msgstr "Адсутнічае атрыбут ''ref'' ва ўдзельніка дачынення {0}."
msgid ""
"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
msgstr ""
-"Няправільнае значэнне атрыбуту ''ref'' у ўдзельніка адносін {0}. Атрымана {1}"
+"Няправільнае значэнне атрыбуту ''ref'' у ўдзельніка дачынення {0}. Атрымана "
+"{1}"
msgid "Missing attribute ''type'' on member {0} in relation {1}."
-msgstr "Адсутнічае атрыбут ''type'' у ўдзельніка {0} адносін {1}."
+msgstr "Адсутнічае атрыбут ''type'' у ўдзельніка {0} дачынення {1}."
msgid ""
"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
msgstr ""
-"Няправільнае значэнне атрыбуту ''type'' у ўдзельніка {0} адносін {1}. "
+"Няправільнае значэнне атрыбуту ''type'' у ўдзельніка {0} дачынення {1}. "
"Атрымана {2}."
msgid "Incomplete <member> specification with ref=0"
@@ -14297,7 +14355,7 @@ msgid "Downloading referring ways ..."
msgstr "Спампоўка залежных ліній ..."
msgid "Downloading referring relations ..."
-msgstr "Спампоўка залежных адносін..."
+msgstr "Спампоўка залежных дачыненняў..."
msgid "Reading changesets..."
msgstr "Чытанне пакетаў правак..."
@@ -14359,7 +14417,7 @@ msgstr "Пачатак перадачы на сервер з асобным за
msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
msgstr ""
-"{0}% ({1}/{2}), {3} засталося. Перадача на сервер кропкі ''{4}'' (id: {5})"
+"{0}% ({1}/{2}), {3} засталося. Перадача на сервер пункта ''{4}'' (id: {5})"
msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
msgstr ""
@@ -14500,10 +14558,10 @@ msgstr ""
msgid "Remote Control has been asked to create a new node."
msgstr ""
-"Праз Дыстанцыйнае кіраванне атрыманы запыт на стварэнне новай кропкі."
+"Праз Дыстанцыйнае кіраванне атрыманы запыт на стварэнне новага пункта."
msgid "There is no layer opened to add node"
-msgstr "Няма адкрытага пласта для дадання кропкі"
+msgstr "Няма адкрытага пласта для дадання пункта"
msgid "Remote Control has been asked to create a new way."
msgstr "Праз Дыстанцыйнае кіраванне атрыманы запыт на стварэнне новай лініі."
@@ -14605,7 +14663,7 @@ msgid "Include OSM data in the .joz session file."
msgstr "Уключыць дадзеныя OSM у файл сеансу .joz."
msgid "Link to a GPX data file on your local disk."
-msgstr ""
+msgstr "Спасылка на GPX-файл на вашым лакальным дыску"
msgid "Include GPX data in the .joz session file."
msgstr "Уключыць дадзеныя GPX у файл сеансу .joz."
@@ -14651,6 +14709,8 @@ msgstr ""
msgid ""
"Version ''{0}'' of meta data for note layer is not supported. Expected: 0.1"
msgstr ""
+"Версія ''{0}'' метададзеных для пласта нататак не падтрымліваецца. Чакалася: "
+"0.1"
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
@@ -15076,7 +15136,7 @@ msgid "Downloading plugin list from ''{0}''"
msgstr "Спампоўка спісу модуляў з ''{0}''"
msgid "Unsuccessful HTTP request"
-msgstr ""
+msgstr "Няўдалы HTTP-запыт"
msgid "Plugin list download error"
msgstr "Памылка загрузкі спісу модуляў"
@@ -15119,78 +15179,6 @@ msgstr "нявызначаны чыннік"
msgid "Error playing sound"
msgstr "Памылка пры прайграванні гуку"
-msgid "Do nothing"
-msgstr "Нічога не рабіць"
-
-msgid "Report Bug"
-msgstr "Паведаміць пра памылку"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Адбылася нечаканая памылка.<br>Гэта заўсёды памылка праграмавання. Калі вы "
-"карыстаецеся апошняй<br>версіяй JOSM - не злічыце за працу, запоўніце, калі "
-"ласка, заяўку на выпраўленне памылкі (trac)."
-
-msgid "Update JOSM"
-msgstr "Абнавіць JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Паўстала непрадбачаная выключная сітуацыя. Гэта заўсёды памылка "
-"праграмавання.<br><br>Але ў вас старая версія JOSM ({0}),<br>а не бягучая "
-"стабільная версія (<b>{1}</b>).<br><br><b>Калі ласка, абновіце JOSM</b> "
-"перад тым, як прымеце рашэнне аб адпраўцы справаздачы пра памылку."
-
-msgid "Unexpected Exception"
-msgstr "Нечаканая памылка"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Больш не паказваць памылкі ў гэтай сесіі"
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Вы выявілі памылку ў JOSM. Перш чым вы паведаміце нам пра яе, праверце што "
-"вы працуеце на апошняй версіі JOSM тут:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Вы таксама павінны абнавіць і модулі. Калі і гэта не дапаможа, паведаміце "
-"нам пра выяўленую памылку, скарыстаўшыся наступнай спасылкай:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Прадстаўленая ніжэй інфармацыя пра памылку ўжо падрыхтавана для вас. Калі "
-"ласка, дадайце інфармацыю пра тое, як узнавіць памылку і паспрабуйце апісаць "
-"гэта настолькі падрабязна, наколькі гэта магчыма."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Як альтэрнатыва, калі гэта не працуе, вы можаце ўручную ўпісаць інфармацыю "
-"ніжэй, па гэтым URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Тэкст ужо скапіяваны ў буфер абмену)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Вы сутыкнуліся з памылкай у JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15218,17 +15206,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the node, and upload again."
msgstr[0] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца кропкай {1}.<br>Калі ласка, загрузіце кропку, выдаліце "
-"спасылку на кропку і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
+"яшчэ выкарыстоўваецца пунктам {1}.<br>Калі ласка, загрузіце пункт, выдаліце "
+"спасылку на пункт і перадайце на сервер ізноў."
msgstr[1] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца кропкамі {1}.<br>Калі ласка, загрузіце кропкі, "
-"выдаліце спасылкі на кропку і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
+"яшчэ выкарыстоўваецца пунктамі {1}.<br>Калі ласка, загрузіце пункты, "
+"выдаліце спасылкі на пункт і перадайце на сервер ізноў."
msgstr[2] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца кропкамі {1}.<br>Калі ласка, загрузіце кропкі, "
-"выдаліце спасылкі на кропку і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
+"яшчэ выкарыстоўваецца пунктамі {1}.<br>Калі ласка, загрузіце пункты, "
+"выдаліце спасылкі на пункт і перадайце на сервер ізноў."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -15239,17 +15227,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the node, and upload again."
msgstr[0] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
"яшчэ выкарыстоўваецца лініяй {1}.<br>Калі ласка, загрузіце лінію, выдаліце "
-"спасылку на кропку і перадайце на сервер ізноў."
+"спасылку на пункт і перадайце на сервер ізноў."
msgstr[1] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
"яшчэ выкарыстоўваецца лініямі {1}.<br>Калі ласка, загрузіце лініі, выдаліце "
-"спасылкі на кропку і перадайце на сервер ізноў."
+"спасылкі на пункт і перадайце на сервер ізноў."
msgstr[2] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
"яшчэ выкарыстоўваецца лініямі {1}.<br>Калі ласка, загрузіце лініі, выдаліце "
-"спасылкі на кропку і перадайце на сервер ізноў."
+"спасылкі на пункт і перадайце на сервер ізноў."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -15260,17 +15248,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the node, and upload again."
msgstr[0] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца адносінамі {1}.<br>Калі ласка, загрузіце адносіны, "
-"выдаліце спасылку на кропку і перадайце на сервер зноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
+"яшчэ выкарыстоўваецца дачыненнем {1}.<br>Калі ласка, загрузіце дачыненне, "
+"выдаліце спасылку на пункт і перадайце на сервер зноў."
msgstr[1] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца адносінамі {1}.<br>Калі ласка, загрузіце адносіны, "
-"выдаліце спасылку на кропку і перадайце на сервер зноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
+"яшчэ выкарыстоўваецца дачыненнямі {1}.<br>Калі ласка, загрузіце дачыненні, "
+"выдаліце спасылку на пункт і перадайце на сервер зноў."
msgstr[2] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>кропку {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца адносінамі {1}.<br>Калі ласка, загрузіце адносіны, "
-"выдаліце спасылку на кропку і перадайце на сервер зноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>пункт {0}</strong>. Яна ўсё "
+"яшчэ выкарыстоўваецца дачыненнямі {1}.<br>Калі ласка, загрузіце дачыненні, "
+"выдаліце спасылку на пункт і перадайце на сервер зноў."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -15282,15 +15270,15 @@ msgid_plural ""
"the way, and upload again."
msgstr[0] ""
"<strong>Не атрымалася</strong> выдаліць <strong>лінію {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца кропкай {1}.<br>Калі ласка, загрузіце кропку, выдаліце "
+"яшчэ выкарыстоўваецца пунктам {1}.<br>Калі ласка, загрузіце пункт, выдаліце "
"спасылку на лінію і перадайце на сервер ізноў."
msgstr[1] ""
"<strong>Не атрымалася</strong> выдаліць <strong>лінію {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца кропкамі {1}.<br>Калі ласка, загрузіце кропкі, "
+"яшчэ выкарыстоўваецца пунктамі {1}.<br>Калі ласка, загрузіце пункты, "
"выдаліце спасылкі на лінію і перадайце на сервер ізноў."
msgstr[2] ""
"<strong>Не атрымалася</strong> выдаліць <strong>лінію {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца кропкамі {1}.<br>Калі ласка, загрузіце кропкі, "
+"яшчэ выкарыстоўваецца пунктамі {1}.<br>Калі ласка, загрузіце пункты, "
"выдаліце спасылкі на лінію і перадайце на сервер ізноў."
msgid ""
@@ -15324,15 +15312,15 @@ msgid_plural ""
"reference to the way, and upload again."
msgstr[0] ""
"<strong>Не атрымалася</strong> выдаліць <strong>лінію {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца адносінамі {1}.<br>Калі ласка, загрузіце адносіны, "
+"яшчэ выкарыстоўваецца дачыненнем {1}.<br>Калі ласка, загрузіце дачыненне, "
"выдаліце спасылку на лінію і перадайце на сервер зноў."
msgstr[1] ""
"<strong>Не атрымалася</strong> выдаліць <strong>лінію {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца адносінамі {1}.<br>Калі ласка, загрузіце адносіны, "
+"яшчэ выкарыстоўваецца дачыненнямі {1}.<br>Калі ласка, загрузіце дачыненні, "
"выдаліце спасылку на лінію і перадайце на сервер зноў."
msgstr[2] ""
"<strong>Не атрымалася</strong> выдаліць <strong>лінію {0}</strong>. Яна ўсё "
-"яшчэ выкарыстоўваецца адносінамі {1}.<br>Калі ласка, загрузіце адносіны, "
+"яшчэ выкарыстоўваецца дачыненнямі {1}.<br>Калі ласка, загрузіце дачыненні, "
"выдаліце спасылку на лінію і перадайце на сервер зноў."
msgid ""
@@ -15344,17 +15332,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
-"ўсё яшчэ выкарыстоўваецца кропкай {1}.<br>Калі ласка, загрузіце кропку, "
-"выдаліце спасылку на адносіны і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
+"ўсё яшчэ выкарыстоўваецца пунктам {1}.<br>Калі ласка, загрузіце пункт, "
+"выдаліце спасылку на дачыненне і перадайце на сервер ізноў."
msgstr[1] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
-"ўсё яшчэ выкарыстоўваецца кропкамі {1}.<br>Калі ласка, загрузіце кропкі, "
-"выдаліце спасылкі на адносіны і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
+"ўсё яшчэ выкарыстоўваецца пунктамі {1}.<br>Калі ласка, загрузіце пункты, "
+"выдаліце спасылкі на дачыненне і перадайце на сервер ізноў."
msgstr[2] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
-"ўсё яшчэ выкарыстоўваецца кропкамі {1}.<br>Калі ласка, загрузіце кропкі, "
-"выдаліце спасылкі на адносіны і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
+"ўсё яшчэ выкарыстоўваецца пунктамі {1}.<br>Калі ласка, загрузіце пункты, "
+"выдаліце спасылкі на дачыненне і перадайце на сервер ізноў."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -15365,17 +15353,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
"ўсё яшчэ выкарыстоўваецца лініяй {1}.<br>Калі ласка, загрузіце лінію, "
-"выдаліце спасылку на адносіны і перадайце на сервер ізноў."
+"выдаліце спасылку на дачыненне і перадайце на сервер ізноў."
msgstr[1] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
"ўсё яшчэ выкарыстоўваецца лініямі {1}.<br>Калі ласка, загрузіце лініі, "
-"выдаліце спасылкі на адносіны і перадайце на сервер ізноў."
+"выдаліце спасылкі на дачыненне і перадайце на сервер ізноў."
msgstr[2] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
"ўсё яшчэ выкарыстоўваецца лініямі {1}.<br>Калі ласка, загрузіце лініі, "
-"выдаліце спасылкі на адносіны і перадайце на сервер ізноў."
+"выдаліце спасылкі на дачыненне і перадайце на сервер ізноў."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -15386,17 +15374,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the relation, and upload again."
msgstr[0] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
-"ўсё яшчэ выкарыстоўваецца адносіным {1}.<br>Калі ласка, загрузіце адносіны, "
-"выдаліце спасылку на адносіны і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
+"ўсё яшчэ выкарыстоўваецца дачыненнем {1}.<br>Калі ласка, загрузіце "
+"дачыненне, выдаліце спасылку на дачыненне і перадайце на сервер ізноў."
msgstr[1] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
-"ўсё яшчэ выкарыстоўваецца адносінамі {1}.<br>Калі ласка, загрузіце адносіны, "
-"выдаліце спасылкі на адносіны і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
+"ўсё яшчэ выкарыстоўваецца дачыненнямі {1}.<br>Калі ласка, загрузіце "
+"дачыненні, выдаліце спасылкі на дачыненне і перадайце на сервер ізноў."
msgstr[2] ""
-"<strong>Не атрымалася</strong> выдаліць <strong>адносіны {0}</strong>. Яно "
-"ўсё яшчэ выкарыстоўваецца адносінамі {1}.<br>Калі ласка, загрузіце адносіны, "
-"выдаліце спасылкі на адносіны і перадайце на сервер ізноў."
+"<strong>Не атрымалася</strong> выдаліць <strong>дачыненне {0}</strong>. Яно "
+"ўсё яшчэ выкарыстоўваецца дачыненнямі {1}.<br>Калі ласка, загрузіце "
+"дачыненні, выдаліце спасылкі на дачыненне і перадайце на сервер ізноў."
msgid ""
"<html>Uploading to the server <strong>failed</strong> because your "
@@ -15594,9 +15582,6 @@ msgstr "Загрузка перанакіравана на ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Выяўлена занадта шмат перанакіраванняў на URL загрузкі. Адмена."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Немагчыма знайсці пераклад {0}. Вернута да {1}."
@@ -15757,10 +15742,10 @@ msgstr ""
"аб`ектаў JOSM або адпаведнага тэксту.</p></html>"
msgid "Unable to delete file {0}"
-msgstr ""
+msgstr "Не атрымалася выдаліць файл {0}"
msgid "Unable to create directory {0}"
-msgstr ""
+msgstr "Не атрымалася стварыць каталог {0}"
msgid "ms"
msgstr "мс"
@@ -15814,6 +15799,84 @@ msgstr "Ігнараванне скажонай геаметрыі: {0}"
msgid "Failed to load XML schema."
msgstr "Немагчыма загрузіць XML схему."
+msgid "Do nothing"
+msgstr "Нічога не рабіць"
+
+msgid "Report Bug"
+msgstr "Паведаміць пра памылку"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Адбылася нечаканая памылка.<br>Гэта заўсёды памылка праграмавання. Калі вы "
+"карыстаецеся апошняй<br>версіяй JOSM - не злічыце за працу, запоўніце, калі "
+"ласка, заяўку на выпраўленне памылкі (trac)."
+
+msgid "Update JOSM"
+msgstr "Абнавіць JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Паўстала непрадбачаная выключная сітуацыя. Гэта заўсёды памылка "
+"праграмавання.<br><br>Але ў вас старая версія JOSM ({0}),<br>а не бягучая "
+"стабільная версія (<b>{1}</b>).<br><br><b>Калі ласка, абновіце JOSM</b> "
+"перад тым, як прымеце рашэнне аб адпраўцы справаздачы пра памылку."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Больш не паказваць памылкі ў гэтай сесіі"
+
+msgid "Unexpected Exception"
+msgstr "Нечаканая памылка"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Вы сутыкнуліся з памылкай у JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Вы выявілі памылку ў JOSM. Перш чым вы паведаміце нам пра яе, праверце што "
+"вы працуеце на апошняй версіі JOSM тут:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Вы таксама павінны абнавіць і модулі. Калі і гэта не дапаможа, паведаміце "
+"нам пра выяўленую памылку, скарыстаўшыся наступнай спасылкай:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Прадстаўленая ніжэй інфармацыя пра памылку ўжо падрыхтавана для вас. Калі "
+"ласка, дадайце інфармацыю пра тое, як узнавіць памылку і паспрабуйце апісаць "
+"гэта настолькі падрабязна, наколькі гэта магчыма."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Як альтэрнатыва, калі гэта не працуе, вы можаце ўручную ўпісаць інфармацыю "
+"ніжэй, па гэтым URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Тэкст ужо скапіяваны ў буфер абмену)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Не атрымалася адкрыць справаздачу пра памылку. Калі ласка, паведаміце пра яе "
+"ўручную на гэтым вэб-сайце:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15861,7 +15924,7 @@ msgid ""
"You requested too many nodes (limit is 50,000). Either request a smaller "
"area, or use planet.osm"
msgstr ""
-"Запытана занадта шмат кропак (максімум - 50 000). Абярыце меншую вобласць, "
+"Запытана занадта шмат пунктаў (максімум - 50 000). Абярыце меншую вобласць, "
"або выкарыстоўвайце planet.osm"
msgid "Database offline for maintenance"
@@ -16162,14 +16225,14 @@ msgstr "Спадарожнікавыя здымкі Mapbox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "GPS-трэкі OpenStreetMap"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Стандартны пласт)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr "OpenStreetMap Carto (стандартны пласт)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik чорна-белы)"
@@ -16177,8 +16240,14 @@ msgstr "OpenStreetMap (Mapnik чорна-белы)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, без подпісаў)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (французскі стыль)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (нямецкі стыль)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "GPS-трэкі OpenStreetMap"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16189,20 +16258,17 @@ msgstr "Грамадскі транспарт (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (нямецкі стыль)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Камбоджа, Лаос, Тайланд, В''етнам 2-моўная"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (аверлэй)"
msgid "Strava cycling heatmap"
-msgstr "Strava цеплавая веламапа"
+msgstr "Strava цеплавая велакарта"
msgid "Strava running heatmap"
msgstr "Strava цеплавая карта бегуноў"
@@ -16256,37 +16322,37 @@ msgid "OSM Inspector: Boundaries (EU)"
msgstr "OSM Inspector: Межы (EU)"
msgid "SIG Instituto Geográfico Nacional (WMTS)"
-msgstr ""
+msgstr "SIG Нацыянальны геаграфічны інстытут Аргентыны (WMTS)"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI чорна-белая 2.5м"
msgid "LPI NSW Base Map"
-msgstr ""
+msgstr "LPI NSW базавая карта"
msgid "LPI NSW Topographic Map"
-msgstr ""
+msgstr "LPI NSW тапаграфічная карта"
msgid "LPI NSW Imagery"
-msgstr ""
+msgstr "LPI NSW спадарожнікавыя здымкі"
msgid "LPI NSW Administrative Boundaries Suburb"
-msgstr ""
+msgstr "LPI NSW адміністрацыйныя межы прыгарадаў"
msgid "LPI NSW Administrative Boundaries LGA"
-msgstr ""
+msgstr "LPI NSW адміністрацыйныя межы раёнаў мясцовага самакіравання"
msgid "LPI NSW Administrative Boundaries County"
-msgstr ""
+msgstr "LPI NSW адміністрацыйныя межы акруг"
msgid "LPI NSW Administrative Boundaries Parish"
-msgstr ""
+msgstr "LPI NSW адміністрацыйныя межы прыходаў"
msgid "LPI NSW Administrative Boundaries State Forest"
-msgstr ""
+msgstr "LPI NSW адміністрацыйныя межы дзяржаўных лясоў"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
-msgstr ""
+msgstr "LPI NSW адміністрацыйныя межы ахоўваных прыродных зон NPWS"
msgid "basemap.at"
msgstr "basemap.at"
@@ -16294,8 +16360,11 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at артафота"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
-msgstr "Грац: Базавая мапа"
+msgstr "Грац: Базавая карта"
msgid "Tiris: DGM (Terrain model)"
msgstr "Tiris: DGM (мадэль рэльефу)"
@@ -16318,50 +16387,50 @@ msgstr "VoGIS: Поўнакаляровая выява 2012 (12см)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Поўнакаляровая выява 2015 (15см)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: поўнакаляровая выява 2015 (10 см)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Планы"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Мадэль глеб)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Мадель паверхні)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: вышыні і рэльеф мясцовасці"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
-msgstr ""
+msgstr "AGIV(laanderen) - аэрафотаздымка (пакрывае таксама рэгіён Брусэля)"
msgid "URBISfr numerical imagery (2013)"
-msgstr ""
+msgstr "URBISfr - лічбавая выява (2013)"
msgid "URBISnl numerical imagery (2013)"
msgstr "URBISnl - лічбавая выява (2013)"
msgid "URBIS 2009 aerial imagery"
-msgstr ""
+msgstr "URBIS 2009 - аэрафотаздымка"
msgid "URBIS 2012 aerial imagery"
-msgstr ""
+msgstr "URBIS 2012 - аэрафотаздымка"
msgid "URBIS 2014 aerial imagery"
-msgstr ""
+msgstr "URBIS 2014 - аэрафотаздымка"
msgid "URBIS 2015 aerial imagery"
-msgstr ""
+msgstr "URBIS 2015 - аэрафотаздымка"
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW (allonie) лічбавыя выявы PICC"
msgid "SPW(allonie) 2015 aerial imagery"
-msgstr ""
+msgstr "SPW(allonie) 2015 аэрафотаздымка"
msgid "SPW(allonie) 2012-2013 aerial imagery"
-msgstr ""
+msgstr "SPW(allonie) 2012-2013 аэрафотаздымка"
msgid "SPW(allonie) 2009-2010 aerial imagery"
-msgstr ""
+msgstr "SPW(allonie) 2009-2010 аэрафотаздымка"
msgid "TEC bus lines (2014)"
-msgstr ""
+msgstr "TEC аўтобусныя маршруты (2014)"
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Карта гарадскіх раёнаў"
@@ -16403,7 +16472,7 @@ msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Данія)"
msgid "Geodatastyrelsen Cadastral Parcels INSPIRE View"
-msgstr ""
+msgstr "Geodatastyrelsen: кадастравыя ўчасткі па INSPIRE"
msgid "Geodatastyrelsen DTK Kort25"
msgstr "Геададзеныя агенцтва DTK Kort25"
@@ -16471,11 +16540,11 @@ msgstr "Géolittoral V2 - Артафота 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - трасы"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr ""
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Ліён - артафота 2012-03 10 см - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr ""
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Ліён - артафота 2015-05 8 см - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Атлантычная Луара - артафота 2012 - 20 см"
@@ -16487,7 +16556,7 @@ msgid "Route 500™©®"
msgstr "Route 500™©®"
msgid "Toulouse - Orthophotoplan 2015"
-msgstr ""
+msgstr "Тулуза - артафотаплан 2015"
msgid "Toulouse - Orthophotoplan 2013"
msgstr "Тулуза - артафотаплан 2013"
@@ -16527,14 +16596,23 @@ msgstr "Баварыя (80 см)"
msgid "Bavaria (2 m)"
msgstr "Баварыя (2 м)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Берлін - аэрафотаздымка 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Берлін - аэрафотаздымка 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Берлін - аэрафотаздымка 2015"
+
msgid "Stuttgart (aerial imagery)"
-msgstr ""
+msgstr "Штутгарт (аэрафотаздымка)"
msgid "Erlangen aerial imagery (2013 6.25 cm)"
-msgstr ""
+msgstr "Эрланген - аэрафотаздымка (2013 6.25 см)"
msgid "Erlangen 2011 aerial imagery (5.0 cm)"
-msgstr ""
+msgstr "Эрланген 2011 аэрафотаздымка (5.0 см)"
msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr "Старая карта Цвенкау - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
@@ -16542,16 +16620,6 @@ msgstr "Старая карта Цвенкау - TK25 Messtischblatt (4739; 1906
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Старая карта Пегау - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr ""
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr ""
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16577,46 +16645,49 @@ msgid "Drone Imagery 2014 (Haiti)"
msgstr "Здымкі з дрону 2014 (Гаіці)"
msgid "Drone Imagery Canaan(Haiti) November 2015"
-msgstr ""
+msgstr "Canaan (Гаіці) - здымка з дрона, лістапад 2015"
msgid "FÖMI ortophoto 2000"
-msgstr ""
+msgstr "FÖMI артафота 2000"
msgid "FÖMI ortophoto 2005"
-msgstr ""
+msgstr "FÖMI артафота 2005"
msgid "Szeged ortophoto 2011"
-msgstr ""
+msgstr "Сегед - артафота 2011"
msgid "Inner part of Szeged"
-msgstr ""
+msgstr "Унутраная частка Сегеда"
msgid "Törökbálint ortophoto 2013"
-msgstr ""
+msgstr "Törökbálint - артафота 2013"
msgid "5 cm resolution bald image"
-msgstr ""
+msgstr "Выява без расліннасці з рэзалюцыяй 5 см"
+
+msgid "Törökbálint ortophoto 2015"
+msgstr "Таракбалінт - артафота 2015"
msgid "Danube flood ortophoto 2013"
-msgstr ""
+msgstr "Разліў Дуная - артафота 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgstr ""
+msgstr "Рэчышча Дуная ў Будапешце, Сентэндры і Сігетманасторы"
msgid "Budapest district XII ortophoto 2013"
-msgstr ""
+msgstr "Будапешт, акруга XII - артафота 2013"
msgid "Interspect Budapest ortophoto 2014"
-msgstr ""
+msgstr "Interspect - Будапешт, артафота 2014"
msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr ""
+msgstr "Пяць акруг Будапешта: III, IV, XIII, XIV, XV"
msgid "OpenStreetMap Hungary (hiking routes)"
-msgstr ""
+msgstr "OpenStreetMap Вугоршчына (маршруты пешага турызму)"
msgid "Hillshade Hungary"
-msgstr ""
+msgstr "Вугоршчына: рэльеф"
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ірландыя Міністэрства абароны Вялікабрытаніі 1:25000 GSGS 3906"
@@ -16653,13 +16724,16 @@ msgid "OSMIE Dail Election Areas"
msgstr "OSMIE - выбарчыя акругі Палаты прадстаўнікоў (Дойл Эрэн)"
msgid "OSMIE T.ie Land not in Counties"
-msgstr ""
+msgstr "OSMIE: землі па-за графствамі"
msgid "Lodi - Italy"
msgstr "Лодзі - Італія"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Ламбардыя - Італія (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
-msgstr ""
+msgstr "Ламбардыя - Італія (CTR DBT)"
msgid "Sicily - Italy"
msgstr "Сіцылія - Італія"
@@ -16694,11 +16768,8 @@ msgstr "1.cikla артафотакарта - Латвія"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Літва)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire: артафота 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire: артафота 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Люксембург Inspire Чыгунка"
@@ -16799,6 +16870,9 @@ msgstr "Познанскі павет: будынкі"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Познаньскі павет: артафотакарта"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Ропчыцка-Сяндзішаўскі павет: будынкі"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Жэшаўскі павет: будынкі"
@@ -16808,6 +16882,9 @@ msgstr "Жэшаўскі павет: артафотакарта"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Сталёвавольскі павет: будынкі"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr "Познань: артафотакарта 2014 (аэрафотаздымак)"
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Пшэмысль: будынкі"
@@ -16917,7 +16994,7 @@ msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Кантон Аргаў 25 см (AGIS 2014)"
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
-msgstr ""
+msgstr "Кантон Цюрых - артафота 2014/2015 10см"
msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr "Горад Устэр: артафота 2008 10см"
@@ -17299,7 +17376,7 @@ msgid ""
"option to automatically generate individual house number nodes from a Way."
msgstr ""
"Адзіны агульны дыялог для ўводу адраснай інтэрпаляцыі з магчымасцю "
-"аўтаматычнай генерацыі асобных кропак з нумарамі дамоў з лініі інтэрпаляцыі."
+"аўтаматычнай генерацыі асобных пунктаў з нумарамі дамоў з лініі інтэрпаляцыі."
msgid ""
"Makes a pair of selected way segments parallel by rotating one of them "
@@ -17382,12 +17459,12 @@ msgid "Create a grid of ways."
msgstr "Стварае сетку з ліній."
msgid "Customization of public transport stops."
-msgstr ""
+msgstr "Налада прыпынкаў грамадскага транспарта."
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
msgstr ""
-"Стварэнне і кіраванне адраснымі кропкамі і будынкамі ў Чэскай Рэспубліцы"
+"Стварэнне і кіраванне адраснымі пунктамі і будынкамі ў Чэскай Рэспубліцы"
msgid ""
"Allows to import various file formats into JOSM directly. Currently "
@@ -17456,13 +17533,13 @@ msgstr ""
msgid ""
"Download GPS points from Globalsat dg100 data logger directly in JOSM."
msgstr ""
-"Дазваляе загрузіць кропкі GPS з Globalsat dg100 data logger непасрэдна ў "
+"Дазваляе загрузіць пункты GPS з Globalsat dg100 data logger непасрэдна ў "
"JOSM."
msgid ""
"Analyse a set of GPS points to obtain its centre and direction of spread."
msgstr ""
-"Аналіз набору кропак GPS для атрымання іх цэнтра і напрамку распаўсюду."
+"Аналіз набору пунктаў GPS для атрымання іх цэнтра і напрамку распаўсюду."
msgid "Allows to filter out unnecessary GPS tracks"
msgstr "Фільтраванне непатрэбных GPS трэкаў"
@@ -17499,9 +17576,9 @@ msgid ""
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
"matches the filename of an image."
msgstr ""
-"Модуль для сумяшчэння выяў з шляхавымі кропкамі GPX трэка. Спалучэнне будзе "
-"ажыццёўлена, калі атрыбут тэгаў ''name'', ''cmt'' ці ''desc'' шляхавай "
-"кропкі, будзе адпавядаць назве файла выявы."
+"Модуль для сумяшчэння выяў з шляхавымі пунктамі GPX трэка. Спалучэнне будзе "
+"ажыццёўлена, калі атрыбут тэгаў ''name'', ''cmt'' ці ''desc'' шляхавага "
+"пункта, будзе адпавядаць назве файла выявы."
msgid "Plugin for importing spatial referenced images"
msgstr "Модуль для імпарту прасторава прывязаных выяў"
@@ -17511,6 +17588,14 @@ msgstr "Імпарт вектарнай графікі (SVG)"
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
+"Гэты модуль спрашчае маляванне і рэдагаванне калідораў усярэдзіне будынкаў."
+
+msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Дапамагае ў маляванні ўнутраных памяшканняў будынка. Уключае валідатар і "
+"стыль mappaint для дадзеных аб унутраных памяшканнях."
msgid ""
"Extra information about current layer objects pop ups - currently GPX "
@@ -17552,7 +17637,7 @@ msgstr "Дапамагае вектарызаваць выявы WMS."
msgid ""
"Support live GPS input (moving dot) through a connection to gpsd server."
msgstr ""
-"Падтрымка GPS ўводу (рух кропкі) з дапамогай падлучэння да сервера gpsd."
+"Падтрымка GPS ўводу (рух пункта) з дапамогай падлучэння да сервера gpsd."
msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
@@ -17668,7 +17753,7 @@ msgid ""
"Shows an additional information about point on map. There is only a Czech "
"RUIAN module available at this moment."
msgstr ""
-"Паказвае дадатковую інфармацыю аб пункце на мапе. Зараз даступны толькі "
+"Паказвае дадатковую інфармацыю аб пункце на карце. Зараз даступны толькі "
"модуль Czech RUIAN."
msgid "Read and write osmosis poly filter files"
@@ -17699,7 +17784,7 @@ msgstr ""
"некаторых пластоў"
msgid "Relation and multipolygon creating and editing panel."
-msgstr "Панэль стварэння і праўкі мультыпалігонаў і іншых адносін"
+msgstr "Панэль стварэння і праўкі мультыпалігонаў і іншых дачыненняў"
msgid "Plugin for reverting changesets"
msgstr "Модуль для адкату пакетаў правак"
@@ -17738,9 +17823,9 @@ msgid ""
"Simplify area by removing nodes on very obtuse angles. This can be "
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-"Спрасціць палігон выдаленнем кропак на вельмі тупых кутах. Дадзенае дзеянне "
+"Спрасціць палігон выдаленнем пунктаў на вельмі тупых кутах. Дадзенае дзеянне "
"можа быць абмежавана указаннем максімальнага памеру выдаляемага фрагмента. "
-"Таксама выдаляе блізкія кропкі."
+"Таксама выдаляе блізкія пункты."
msgid "Edit features for OpenSeaMap"
msgstr "Змяненняў уласцівасцяў рэдагавання OpenSeaMap"
@@ -17756,7 +17841,7 @@ msgstr ""
"гарадскога дарожнага руху SUMO"
msgid "Allow adding markers/nodes on current gps positions."
-msgstr "Дазваляе дадаваць пазнакі/кропкі ў бягучай GPS пазіцыі."
+msgstr "Дазваляе дадаваць пазнакі/пункты ў бягучай GPS пазіцыі."
msgid ""
"Launch browser to a Web resource about a selected object having known tags, "
@@ -17773,6 +17858,9 @@ msgid ""
"of tagging presets (quick preview of the dialog that will popup). You can "
"start the jar-file as standalone as well."
msgstr ""
+"Дадае ў меню «Вокны» тэстар нарыхтовак тэгаў, які дапамагае ў распрацоўцы "
+"нарыхтовак тэгаў (хуткі прадпрагляд усплывальнага дыялогавага акна). Можна "
+"таксама запусціць jar-файл аўтаномна."
msgid "Make terraced houses out of single blocks."
msgstr "Зрабіць шэраг дамоў уздоўж вуліцы з аднаго блока."
@@ -17848,7 +17936,7 @@ msgid "Easy downloading along a long set of interconnected ways"
msgstr "Хуткая запампоўка ўздоўж вялікага набору злучаных ліній"
msgid "Enables searching for waypoint imported from gpx file."
-msgstr "Пошук па шляхавых кропках, імпартаваных з файлаў gpx."
+msgstr "Пошук па шляхавых пунктах, імпартаваных з файлаў gpx."
msgid "Simplifies linking OSM objects to Wikipedia articles"
msgstr "Спрашчае звязванне аб’ектаў OSM з артыкуламі Wikipedia"
@@ -18077,7 +18165,7 @@ msgid "spur"
msgstr "адгалінаванне"
msgid "crossover"
-msgstr ""
+msgstr "стрэлкавы з''езд"
msgid "Electrified"
msgstr "Электрыфікаваная"
@@ -18198,7 +18286,7 @@ msgid "sandwich"
msgstr "сэндвічы"
msgid "coffee_shop"
-msgstr ""
+msgstr "кавярня"
msgid "sushi"
msgstr "сушы"
@@ -18213,37 +18301,37 @@ msgid "chicken"
msgstr "кураціна"
msgid "american"
-msgstr ""
+msgstr "амерыканская"
msgid "ice_cream"
msgstr "марожанае"
msgid "international"
-msgstr ""
+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 ""
+msgstr "вегетарыянская"
msgid "korean"
-msgstr ""
+msgstr "карэйская"
msgid "Internet access"
msgstr "Кропка доступу ў інтэрнэт"
@@ -18454,11 +18542,11 @@ msgstr "скейтборд"
msgctxt "sport"
msgid "ice_skating"
-msgstr ""
+msgstr "катанне на каньках"
msgctxt "sport"
msgid "roller_skating"
-msgstr ""
+msgstr "катанне на ролікавых каньках"
msgctxt "sport"
msgid "soccer"
@@ -18821,10 +18909,10 @@ msgid "Toll"
msgstr "Платная"
msgid "Intermittent"
-msgstr ""
+msgstr "Вадаём, які перасыхае"
msgid "Seasonal"
-msgstr ""
+msgstr "Залежыць ад сезону"
msgid "In the tidal range"
msgstr "У зоне прыліву"
@@ -18894,10 +18982,10 @@ msgid "ICAO"
msgstr "ICAO"
msgid "Car brand"
-msgstr ""
+msgstr "Марка аўтамабіля"
msgid "Motorcycle brand"
-msgstr ""
+msgstr "Марка матацыкла"
msgid "From (initial stop)"
msgstr "Ад (пачатковая)"
@@ -18952,35 +19040,41 @@ msgstr "Вуліцы"
msgid "Motorway"
msgstr "Аўтамагістраль"
+msgid "Destination"
+msgstr "Месца прызначэння"
+
+msgid "Destination reference"
+msgstr "Указальнік пункта прызначэння"
+
msgid "Placement"
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 "пераходнае"
@@ -19001,7 +19095,7 @@ msgid "Primary"
msgstr "Асноўная"
msgid "Overhead trolley wires"
-msgstr ""
+msgstr "Тралейбусныя правады"
msgid "Primary Link"
msgstr "З’езд з асноўнай"
@@ -19247,7 +19341,7 @@ msgid "Tourist buses"
msgstr "Турыстычныя аўтобусы"
msgid "Max. speed Heavy Goods Vehicles (km/h)"
-msgstr ""
+msgstr "Макс. хуткасць цяжкага грузавога транспарта (км/г)"
msgid "Min. speed (km/h)"
msgstr "Мін. хуткасць (у км/г)"
@@ -19537,7 +19631,7 @@ msgid "reversible"
msgstr "са зменным напрамкам"
msgid "Waypoints"
-msgstr "Дарожныя кропкі"
+msgstr "Дарожныя пункты"
msgid "Motorway Junction"
msgstr "Магістральная развязка"
@@ -19545,9 +19639,6 @@ msgstr "Магістральная развязка"
msgid "Number"
msgstr "Нумар"
-msgid "Exit to"
-msgstr "Выезд на"
-
msgid "Services"
msgstr "Прыдарожны сэрвіс"
@@ -19642,29 +19733,29 @@ 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 "Месца раз’езду"
@@ -19804,7 +19895,7 @@ msgid "Wall"
msgstr "Сцяна"
msgid "dry_stone"
-msgstr ""
+msgstr "сухі мур"
msgid "noise_barrier"
msgstr "шумаахоўны экран"
@@ -19816,7 +19907,7 @@ msgid "Retaining Wall"
msgstr "Падпорная сценка"
msgid "Jersey Barrier"
-msgstr ""
+msgstr "Загарода з блокаў"
msgctxt "Barrier"
msgid "Ditch"
@@ -20029,6 +20120,15 @@ msgstr "прытокава-адліўныя ўчасткі"
msgid "mangrove"
msgstr "мангравыя зараснікі"
+msgid "wet_meadow"
+msgstr "забалочаны луг"
+
+msgid "string_bog"
+msgstr "аапа-балота"
+
+msgid "saltern"
+msgstr "саляварня"
+
msgid "Mud"
msgstr "Бруд"
@@ -20214,7 +20314,7 @@ msgid "Pier"
msgstr "Пірс"
msgid "Mooring"
-msgstr ""
+msgstr "Швартоўка"
msgid "commercial"
msgstr "камерцыйная"
@@ -20630,7 +20730,7 @@ msgid "Public Transport"
msgstr "Грамадскі транспарт"
msgid "Public Transport Route (Rail)"
-msgstr ""
+msgstr "Маршрут грамадскага транспарта (чыгуначны)"
msgid "Route type"
msgstr "Тып маршруту"
@@ -20666,7 +20766,7 @@ msgid "route segment"
msgstr "участак маршруту"
msgid "Public Transport Route (Bus)"
-msgstr ""
+msgstr "Маршрут грамадскага транспарта (аўтобус)"
msgid "trolleybus"
msgstr "тралейбус"
@@ -20775,7 +20875,7 @@ msgid "backward segment"
msgstr "сегмент назад"
msgid "halt point"
-msgstr "канчатковая кропка"
+msgstr "канчатковы пункт"
msgid "forward halt point"
msgstr "канчатковая наперад"
@@ -20961,7 +21061,7 @@ msgid "Cafe"
msgstr "Кафэ"
msgid "Ice cream"
-msgstr ""
+msgstr "Марозіва"
msgid "Pub"
msgstr "Піўная"
@@ -21100,7 +21200,7 @@ msgid "Phone number"
msgstr "Нумар тэлефона"
msgid "Other Information Point"
-msgstr "Іншая інфармацыйная кропка"
+msgstr "Іншы інфармацыйны пункт"
msgid "Leisure"
msgstr "Вольны час"
@@ -21139,13 +21239,13 @@ msgid "Water Park"
msgstr "Аквапарк"
msgid "Swimming Pool"
-msgstr ""
+msgstr "Плавальны басейн"
msgid "Used for the water area only."
-msgstr ""
+msgstr "Выкарыстоўваецца толькі для самой ванны басейна (не будынкі)."
msgid "Fitness Station"
-msgstr ""
+msgstr "Пляцоўка для фітнеса"
msgid "Sauna"
msgstr "Сауна"
@@ -21181,6 +21281,9 @@ msgstr "Кастрышча"
msgid "Fishing"
msgstr "Месца для рыбалкі"
+msgid "Bird Hide"
+msgstr "Хованка для назірання за птушкамі"
+
msgid "Night Club"
msgstr "Начны клуб"
@@ -21490,7 +21593,7 @@ msgid "Point Number"
msgstr "Нумар пункта"
msgid "Point Name"
-msgstr "Назва кропкі"
+msgstr "Назва пункта"
msgid "Phone Number"
msgstr "Нумар тэлефона"
@@ -21502,10 +21605,10 @@ msgid "Veterinary"
msgstr "Ветэрынарыя"
msgid "Emergency"
-msgstr ""
+msgstr "Экстраная дапамога"
msgid "Ambulance Station"
-msgstr ""
+msgstr "Станцыя хуткай дапамогі"
msgid "Automated Defibrillator"
msgstr "Аўтаматызаваны дэфібрылятар"
@@ -21520,13 +21623,13 @@ msgid "Last check note"
msgstr "Заўвагі апошняй праверкі"
msgid "Fire Extinguisher"
-msgstr ""
+msgstr "Вогнетушыцель"
msgid "Indoor"
msgstr "У памяшканні"
msgid "Fire Hose"
-msgstr ""
+msgstr "Пажарны рукаў"
msgid "Fire Hydrant"
msgstr "Пажарны кран"
@@ -21579,10 +21682,10 @@ msgid "Count"
msgstr "Колькасць"
msgid "Water Tank"
-msgstr ""
+msgstr "Рэзервуар з вадой"
msgid "Volume (in liters)"
-msgstr ""
+msgstr "Аб''ём (у літрах)"
msgid "Assembly Point"
msgstr "Месца збору"
@@ -21612,13 +21715,13 @@ msgid "fire"
msgstr "пажар"
msgid "air_raid"
-msgstr ""
+msgstr "паветраная трывога"
msgid "civil_defense"
msgstr "грамадзянская абарона"
msgid "Range (in meters)"
-msgstr ""
+msgstr "Адлегласць чутнасці (у метрах)"
msgid "Social Facility"
msgstr "Сацыяльныя паслугі"
@@ -21627,16 +21730,16 @@ msgid "Nursing Home"
msgstr "Дом састарэлых (састарэлы тэг)"
msgid "Group Home"
-msgstr ""
+msgstr "Установа групавога пражывання"
msgid "For"
-msgstr ""
+msgstr "Для"
msgid "Assisted Living"
-msgstr ""
+msgstr "Установа сумеснага пражывання"
msgid "Outreach"
-msgstr ""
+msgstr "Сацыяльная ўстанова без пражывання"
msgctxt "social_facility"
msgid "Shelter"
@@ -21689,10 +21792,10 @@ msgstr "пісуар"
msgctxt "toilets"
msgid "Diaper"
-msgstr ""
+msgstr "Столік для змены пялёнак"
msgid "room"
-msgstr ""
+msgstr "у асобным пакоі"
msgid "Post Box"
msgstr "Паштовая скрыня"
@@ -21899,13 +22002,13 @@ msgstr "поўная"
msgctxt "hunting stand"
msgid "Hide"
-msgstr ""
+msgstr "Хованка"
msgid "Lock"
msgstr "Замыкаецца"
msgid "Water Point"
-msgstr ""
+msgstr "Пункт набору вады"
msgid "Compressed Air"
msgstr "Кампрэсар для шын"
@@ -21966,53 +22069,53 @@ msgstr "Поле для гольфа"
msgctxt "golf"
msgid "Tee"
-msgstr ""
+msgstr "Стартавая пляцоўка"
msgctxt "golf"
msgid "Hole"
-msgstr ""
+msgstr "Шлях да лункі"
msgid "Par"
-msgstr ""
+msgstr "Пар"
msgid "Handicap rating"
-msgstr ""
+msgstr "Рэйтынг перашкоды"
msgctxt "golf"
msgid "Pin"
-msgstr ""
+msgstr "Лунка"
msgctxt "golf"
msgid "Bunker"
-msgstr ""
+msgstr "Бункер"
msgctxt "golf"
msgid "Natural"
-msgstr ""
+msgstr "Напаўняльнік"
msgctxt "golf"
msgid "Frontal Water hazard"
-msgstr ""
+msgstr "Франтальная водная перашкода"
msgctxt "golf"
msgid "Lateral water hazard"
-msgstr ""
+msgstr "Бакавая водная перашкода"
msgctxt "golf"
msgid "Green"
-msgstr ""
+msgstr "Лужок"
msgctxt "golf"
msgid "Fairway"
-msgstr ""
+msgstr "Гладкае поле"
msgctxt "golf"
msgid "Rough"
-msgstr ""
+msgstr "Няроўнае поле"
msgctxt "golf"
msgid "Driving range"
-msgstr ""
+msgstr "Трэніравальная зона"
msgid "Miniature Golf"
msgstr "Мінігольф"
@@ -22086,13 +22189,13 @@ msgid "Gymnastics"
msgstr "Гімнастыка"
msgid "Ice Skating"
-msgstr ""
+msgstr "Катанне на каньках"
msgid "ice_rink"
msgstr "коўзанка"
msgid "Roller Skating"
-msgstr ""
+msgstr "Катанне на ролікавых каньках"
msgid "Skateboard"
msgstr "Скейтборд"
@@ -22378,7 +22481,7 @@ msgstr "дзіцячы садок"
msgctxt "building"
msgid "manufacture"
-msgstr ""
+msgstr "вытворчае"
msgctxt "building"
msgid "warehouse"
@@ -22406,7 +22509,7 @@ msgstr "газасховішча"
msgctxt "building"
msgid "silo"
-msgstr ""
+msgstr "сховішча для сыпкіх матэрыялаў"
msgctxt "building"
msgid "cowshed"
@@ -22446,7 +22549,11 @@ msgstr "сінагога"
msgctxt "building"
msgid "transformer_tower"
-msgstr ""
+msgstr "трансфарматарная вежа"
+
+msgctxt "building"
+msgid "public"
+msgstr "грамадскі"
msgctxt "building"
msgid "Levels"
@@ -22526,7 +22633,7 @@ msgstr "аварыйны"
msgctxt "entrance"
msgid "staircase"
-msgstr ""
+msgstr "у пад''езд/на лесвіцу"
msgid "Entrance number"
msgstr "Нумар ўваходу"
@@ -22562,7 +22669,7 @@ msgid "Gasometer"
msgstr "Газасховішча"
msgid "Silo"
-msgstr ""
+msgstr "Сховішча для сыпкіх матэрыялаў"
msgid "Storage Tank"
msgstr "Рэзервуар"
@@ -22701,7 +22808,7 @@ msgid "Pipeline Marker"
msgstr "Паказальнік трубаправода"
msgid "Pipeline Valve"
-msgstr ""
+msgstr "Засаўка трубаправода"
msgid "Water Tower"
msgstr "Воданапорная вежа"
@@ -23422,10 +23529,10 @@ msgid "Power Street Cabinet"
msgstr "Трасфарматарная будка"
msgid "Transformer Tower"
-msgstr ""
+msgstr "Трансфарматарная вежа"
msgid "Power Portal"
-msgstr ""
+msgstr "Партальная апора"
msgid "Type of construction"
msgstr "Канструкцыя"
@@ -23447,7 +23554,7 @@ msgid "red/white"
msgstr "чырвона-белая"
msgid "Portal design"
-msgstr ""
+msgstr "Дызайн партальнай апоры"
msgctxt "power"
msgid "portal"
@@ -23880,7 +23987,7 @@ msgid "Kitchen"
msgstr "Кухня"
msgid "Houseware"
-msgstr ""
+msgstr "Хатняе начынне"
msgid "Curtain"
msgstr "Запавесы"
@@ -23925,10 +24032,10 @@ msgid "Chemist"
msgstr "Побытавая хімія"
msgid "Cosmetics"
-msgstr ""
+msgstr "Касметыка"
msgid "Perfumery"
-msgstr ""
+msgstr "Парфумерыя"
msgid "Beauty"
msgstr "Салон прыгажосці"
@@ -24038,7 +24145,7 @@ msgstr "пакеты для экскрыментаў"
msgid "food"
msgstr "прадукты харчавання"
-msgid "news_papers"
+msgid "newspapers"
msgstr "газеты"
msgid "parking_tickets"
@@ -24053,8 +24160,8 @@ msgstr "схемы грамадскага транспарта"
msgid "public_transport_tickets"
msgstr "квіткі на грамадскі транспарт"
-msgid "SIM-cards"
-msgstr "SIM-карты"
+msgid "SIM_cards"
+msgstr "SIM карткі"
msgid "stamps"
msgstr "маркі"
@@ -24265,79 +24372,79 @@ msgid "Telecommunication"
msgstr "Тэлекамунікацыйная кампанія"
msgid "Craft"
-msgstr ""
+msgstr "Майстэрня"
msgid "Carpenter"
-msgstr ""
+msgstr "Столяр ці цясляр"
msgid "Shoemaker"
-msgstr ""
+msgstr "Пашыў ці рамонт абутку"
msgid "Photographer"
-msgstr ""
+msgstr "Фатограф"
msgid "Metal construction"
-msgstr ""
+msgstr "Вырабы з металу"
msgid "Electrician"
-msgstr ""
+msgstr "Электрык"
msgid "Brewery"
-msgstr ""
+msgstr "Бровар"
msgid "Plumber"
-msgstr ""
+msgstr "Сантэхнік"
msgid "Sawmill"
-msgstr ""
+msgstr "Піларама"
msgid "Gardener"
-msgstr ""
+msgstr "Садоўнік ці ландшафтны дызайнер"
msgid "Winery"
-msgstr ""
+msgstr "Вінакурня"
msgid "Hvac"
-msgstr ""
+msgstr "Усталёўка кандыцыянераў"
msgid "Painter"
-msgstr ""
+msgstr "Маляр"
msgid "Stonemason"
-msgstr ""
+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 "Геаграфія"
@@ -24755,7 +24862,7 @@ msgid "coconut_palms"
msgstr "какосавыя пальмы"
msgid "hazel_plants"
-msgstr ""
+msgstr "фундук"
msgid "cherry_trees"
msgstr "вішні"
@@ -24764,7 +24871,7 @@ msgid "persimmon_trees"
msgstr "хурма"
msgid "walnut_trees"
-msgstr ""
+msgstr "грэцкі арэх"
msgid "plum_trees"
msgstr "слівы"
@@ -25235,7 +25342,7 @@ msgid "from way"
msgstr "з лініі"
msgid "via node or ways"
-msgstr "праз кропку ці лінію"
+msgstr "праз пункт ці лінію"
msgid "to way"
msgstr "на лінію"
@@ -25274,7 +25381,7 @@ msgid "location of enforcement device"
msgstr "размяшчэнне абмяжоўваючай прылады"
msgid "node on way where enforcement starts"
-msgstr "кропка пачатку абмежавання на лініі"
+msgstr "пункт пачатку абмежавання на лініі"
msgid "where enforcement ends"
msgstr "канец абмежавання"
@@ -25325,7 +25432,22 @@ msgid "natural"
msgstr "прыродны"
msgid "Walking Route"
-msgstr ""
+msgstr "Пешы маршрут"
+
+msgid "Riding Route"
+msgstr "Конны маршрут"
+
+msgid "ihn"
+msgstr "міжнародная (ihn)"
+
+msgid "nhn"
+msgstr "нацыянальная (nhn)"
+
+msgid "rhn"
+msgstr "рэгіянальная (rhn)"
+
+msgid "lhn"
+msgstr "лакальная (lhn)"
msgid "Piste Route"
msgstr "Гарналыжны маршрут"
@@ -25351,14 +25473,11 @@ msgstr "горныя лыжы"
msgid "Detour Route"
msgstr "Аб’язны маршрут"
-msgid "Destination"
-msgstr "Месца прызначэння"
-
msgid "Ref of the way this is a detour to"
msgstr "Аб’ездам якой дарогі з’яўляецца"
msgid "fork node for alternative routes"
-msgstr "кропка адгалінавання альтэрнатыўных маршрутаў"
+msgstr "пункт адгалінавання альтэрнатыўных маршрутаў"
msgid "Power Route"
msgstr "Маршрут лініі электраперадачы"
@@ -25418,7 +25537,7 @@ msgid "last way before junction"
msgstr "апошняя лінія перад скрыжаваннем"
msgid "node of the intersection"
-msgstr "кропка скрыжавання"
+msgstr "пункт скрыжавання"
msgid "first way after junction"
msgstr "першая лінія пасля скрыжавання"
@@ -25513,8 +25632,14 @@ msgstr "Кемпінг"
msgid "Test"
msgstr "Тэст"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Нумары хат па змяншэнні ў інтэрпаляцыі адрасоў"
+msgid "Even housenumber in odd address interpolation."
+msgstr "Цотны нумар дома ў інтэрпаляцыі няцотных адрасоў."
+
+msgid "Odd housenumber in even address interpolation."
+msgstr "Няцотны нумар дома ў інтэрпаляцыі цотных адрасоў."
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr "Лінія з {0}. Па магчымасці адзначце кожны нумар дома асобна."
msgid "{0} without {1}"
msgstr "{0} без {1}"
@@ -25556,7 +25681,7 @@ msgid "sport without physical feature"
msgstr "тэг sport без фізічнага аб’екта"
msgid "{0} should be on the node where {1} and {2} intersect"
-msgstr "{0} павінен быць кропкай скрыжавання {1} і {2}"
+msgstr "{0} павінен быць пунктам скрыжавання {1} і {2}"
msgid "alternative name without {0}"
msgstr "альтэрнатыўная назва без {0}"
@@ -25601,9 +25726,18 @@ msgid ""
"Wrong usage of {0} tag. Remove {1}, because it is clear that the name is "
"missing even without an additional tag."
msgstr ""
+"Няправільнае выкарыстанне тэга {0}. Выдаліце {1}, бо ясна, што назва "
+"адсутнічае, нават без дадатковага тэга."
-msgid "{0} is deprecated. Please use instead a multipolygon."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
msgstr ""
+"{0} — няпэўны тэг. Выкарыстоўвайце ключ fixme, значэннем якога з''яўляецца "
+"інфармацыя пра тое, што менавіта трэба выправіць."
+
+msgid "{0} is deprecated. Please use instead a multipolygon."
+msgstr "{0} не рэкамендуецца. Выкарыстоўвайце замест гэтага мультыпалігон."
msgid ""
"{0} is deprecated. Please specify interval by using opening_hours syntax"
@@ -25657,13 +25791,13 @@ msgid "{0} is inaccurate"
msgstr "{0} — недакладнае значэнне"
msgid "{0} is deprecated for {1}"
-msgstr ""
+msgstr "{0} не рэкамендуецца для {1}"
msgid "{0} is deprecated. Use the {1}: key prefix instead."
-msgstr ""
+msgstr "{0} ужываць не рэкамендуецца. Выкарыстоўвайце наўзамен прэфікс {1}:"
msgid "questionable key (ending with a number): {0}"
-msgstr ""
+msgstr "сумнеўны ключ (сканчаецца лікам): {0}"
msgid "{0} on a node. Should be used on a way."
msgstr "{0} на кропцы. Павінен выкарыстоўвацца на лініі."
@@ -25672,16 +25806,16 @@ msgid "{0} on a node. Should be drawn as an area."
msgstr "{0} на кропцы. Павінен быць намаляваны як вобласць."
msgid "{0}=* on a node. Should be used in a relation"
-msgstr "{0}=* на кропцы. Варта выкарыстоўваць у адносінах"
+msgstr "{0}=* на кропцы. Варта выкарыстоўваць у дачыненні"
msgid "{0} on a way. Should be used on a node."
msgstr "{0} на лініі. Варта выкарыстоўваць на кропцы."
msgid "{0} on a way. Should be used in a relation"
-msgstr "{0} на лініі. Павінен выкарыстоўвацца ў адносінах"
+msgstr "{0} на лініі. Павінен выкарыстоўвацца ў дачыненні"
msgid "{0} together with {1} on a node. Remove {0}."
-msgstr ""
+msgstr "{0} сумесна з {1} на пункце. Выдаліце {0}."
msgid "{0} on a node"
msgstr "{0} на кропцы"
@@ -25708,16 +25842,29 @@ msgid "{0} must be connected to a way"
msgstr "{0} павінен быць злучаны з лініяй"
msgid "node connects waterway and bridge"
-msgstr "кропка злучае водны шлях і мост"
+msgstr "пункт злучае водны шлях і мост"
+
+msgid "{0} node connected to a highway"
+msgstr "Пункт {0} злучаны з лініяй тыпу highway"
msgid "suspicious roundabout direction"
-msgstr ""
+msgstr "падазроны кірунак кругавога руху"
msgid "{0} on a large area"
-msgstr ""
+msgstr "{0} на вялікай вобласці"
msgid "{0} on a small area"
+msgstr "{0} на маленькай вобласці"
+
+msgid "Too large building"
+msgstr "Занадта вялікі будынак"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
msgstr ""
+"Пункт злучае лінію электраперадачы ці кабель з аб''ектам, які не адносіцца "
+"да энергетычнай інфраструктуры."
msgid "abbreviated street name"
msgstr "скарочанае пазначэнне вуліцы"
@@ -25748,10 +25895,10 @@ msgstr ""
"выкарыстоўвайце ''{3}''."
msgid "pedestrian railway crossing without {0}"
-msgstr ""
+msgstr "пешаходны пераход праз чыгуначныя шляхі без {0}"
msgid "railway crossing without {0}"
-msgstr ""
+msgstr "чыгуначны пераезд без {0}"
msgid "{0} with multiple values"
msgstr "{0} з некалькімі значэннямі"
@@ -25769,18 +25916,18 @@ msgid "layer should be between -5 and 5"
msgstr "узровень павінен быць ад -5 да 5"
msgid "{0} should have numbers only with optional .5 increments"
-msgstr ""
+msgstr "значэнні {0} павінны быць толькі лікамі з неабавязковым крокам 0.5"
msgid ""
"{0}: meters is default; period is separator; if units, put space then unit"
msgstr ""
-"{0}: па змаўчанні ў метрах; падзельнік - кропка; адзінкі вымярэння "
-"адлучаюцца прабелам"
+"{0}: па змаўчанні ў метрах; падзельнік - пункт; адзінкі вымярэння адлучаюцца "
+"прабелам"
msgid ""
"{0}: tonne is default; period is separator; if units, put space then unit"
msgstr ""
-"{0}: тыпова ў тонах; падзельнік - кропка; калі трэба, адзінкі вымярэння "
+"{0}: тыпова ў тонах; падзельнік - пункт; калі трэба, адзінкі вымярэння "
"адлучаюцца прабелам"
msgid "unusual {0} format"
@@ -25790,7 +25937,7 @@ msgid ""
"{0}: kilometers is default; period is separator; if units, put space then "
"unit"
msgstr ""
-"{0}: тыпова ў кіламетрах; падзельнік - кропка; калі трэба, адзінкі вымярэння "
+"{0}: тыпова ў кіламетрах; падзельнік - пункт; калі трэба, адзінкі вымярэння "
"адлучаюцца прабелам"
msgid "voltage should be in volts with no units/delimiter/spaces"
@@ -25815,10 +25962,10 @@ msgid "unusual value of {0}"
msgstr "незвычайнае значэнне {0}"
msgid "relation without type"
-msgstr "адносіны без тыпу"
+msgstr "дачыненне без тыпу"
msgid "{0} relation without {0} tag"
-msgstr "{0} адносіны без тэга {0}"
+msgstr "{0} дачыненне без тэга {0}"
msgid "religion without denomination"
msgstr "тэг religion без тэга denomination"
@@ -25872,7 +26019,7 @@ msgid "Use alternative turn restriction icon set"
msgstr "Выкарыстоўваць альтэрнатыўны набор значкоў"
msgid "Display fill colour of areas with place=*"
-msgstr ""
+msgstr "Паказваць колер залівання абласцей з place=*"
msgid "Areas are drawn with fill only around their inner edges"
msgstr "Адлюстроўваць заліванне абласцей толькі ўздоўж іх ўнутраных краёў"
@@ -25957,19 +26104,19 @@ msgid "Missing definition of new object with id {0}."
msgstr "Адсутнічае вызначэнне новага аб’екта з id {0}"
msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
-msgstr "Адсутнічае абавязковы параметр ''{0}'' для <члена> адносін {1}."
+msgstr "Адсутнічае абавязковы параметр ''{0}'' для <члена> дачынення {1}."
msgid "Illegal value for attribute ''uid''. Got ''{0}''."
msgstr "Няслушнае значэнне для атрыбуту ''uid'': ''{0}''."
msgid "nodes"
-msgstr "кропкі"
+msgstr "пункты"
msgid "ways"
msgstr "лініі"
msgid "relations"
-msgstr "адносіны"
+msgstr "дачыненні"
msgid "OSM objects"
msgstr "аб’ектаў OSM"
@@ -25985,13 +26132,13 @@ msgid ""
"in common"
msgstr ""
"Фармаваць сетку ліній, заснаваную на дзвюх існых лініях, якія маюць розныя "
-"кропкі і адну агульную"
+"пункты і адну агульную"
msgid "Select two ways with a node in common"
-msgstr "Абярыце дзве лініі з агульнай кропкай"
+msgstr "Абярыце дзве лініі з агульным пунктам"
msgid "Select two ways with alone a node in common"
-msgstr "Абярыце дзве лініі з адзінай агульнай кропкай"
+msgstr "Абярыце дзве лініі з адзінай агульным пунктам"
msgid "Create a grid of ways"
msgstr "Стварэнне сеткі з ліній"
@@ -26025,23 +26172,23 @@ msgid "Invalid URL {0}"
msgstr "Няслушная спасылка {0}"
msgid "Private (only shared as anonymous, unordered points)"
-msgstr "Прыватныя (бачныя іншым, як ананімныя, неўпарадкаваныя кропкі)"
+msgstr "Прыватныя (бачныя іншым, як ананімныя, неўпарадкаваныя пункты)"
msgid "Public (shown in trace list and as anonymous, unordered points)"
msgstr ""
"Агульнадаступныя (паказаны ў апісанні трэка як anonymous, неўпарадкаваныя "
-"кропкі)"
+"пункты)"
msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
msgstr ""
-"Адсочваныя (выглядаюць як anonymous, пранумараваныя кропкі з пазнакамі часу)"
+"Адсочваныя (выглядаюць як anonymous, пранумараваныя пункты з пазнакамі часу)"
msgid ""
"Identifiable (shown in trace list and as identifiable, ordered points with "
"timestamps)"
msgstr ""
"Ідэнтыфікаваныя (паказваюцца ў спісе трэкаў як ідэнтыфікаваныя, "
-"спарадкаваныя кропкі з часавымі адзнакамі)"
+"спарадкаваныя пункты з часавымі адзнакамі)"
msgid "Upload Trace"
msgstr "Перадача трэка на сервер"
@@ -26159,7 +26306,7 @@ msgid "Starting Epsilon"
msgstr "Пачатковы эпсілон"
msgid "Max points count per 1 km"
-msgstr "Максімальны лік кропак на 1 км"
+msgstr "Максімальны лік пунктаў на 1 км"
msgid "Enter key mode"
msgstr "Дзеянне па Enter"
@@ -26177,13 +26324,13 @@ msgid "Save as is"
msgstr "Захаваць як ёсць"
msgid "Snap to nodes"
-msgstr "Прыліпаць да кропак"
+msgstr "Прыліпаць да пунктаў"
msgid "Add fixed points on click"
-msgstr "Дадаваць фіксаваныя кропкі па кліку"
+msgstr "Дадаваць фіксаваныя пункты па кліку"
msgid "Add fixed points on spacebar"
-msgstr "Дадаваць фіксаваныя кропкі па націску прабелу"
+msgstr "Дадаваць фіксаваныя пункты па націску прабелу"
msgid "Allow edit existing ways"
msgstr "Дазволіць рэдагаванне існуючых ліній"
@@ -26212,7 +26359,7 @@ msgid ""
"to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line"
msgstr ""
"Націсніце або націсніце і цягніце для працягу, націск з Ctrl для дадання "
-"фіксаванай кропкі, націск з Shift для выдалення, Enter для спрашчэння або "
+"фіксаванага пункта, націск з Shift для выдалення, Enter для спрашчэння або "
"захавання, націск з Ctrl-Shift для пачатку новай лініі"
msgid "FastDrawing"
@@ -26225,7 +26372,7 @@ msgid "Please move the mouse to draw new way"
msgstr "Рухайце мыш, каб намаляваць новую лінію"
msgid "Are you sure you do not want to save the line containing {0} points?"
-msgstr "Упэўнены, што не жадаеце захоўваць лінію з {0} кропак?"
+msgstr "Упэўнены, што не жадаеце захоўваць лінію з {0} пунктаў?"
msgid ""
"{0} m - length of the line\n"
@@ -26242,7 +26389,7 @@ msgid "Line information"
msgstr "Інфармацыя пра лінію"
msgid "Cannot place node outside of the world."
-msgstr "Не атрымоўваецца змясціць кропку за межамі свету."
+msgstr "Не атрымоўваецца змясціць пункт за межамі свету."
msgid "Draw the way by mouse"
msgstr "Малюйце лінію мышшу"
@@ -26251,7 +26398,7 @@ msgid "min distance={0} px ({1} m)"
msgstr "мінімальная адлегласць ={0} пікселяў ({1} м)"
msgid "Eps={0}, {1} points, {2} p/km"
-msgstr "Eps={0}, {1} кропак, {2} на км"
+msgstr "Eps={0}, {1} пунктаў, {2} на км"
msgid "Fix addresses"
msgstr "Выправіць адрасаванне"
@@ -26367,17 +26514,17 @@ msgid ""
"Create relation between street and related addresses for ALL streets in the "
"current layer."
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 "Выказаць здагадку"
@@ -26606,7 +26753,7 @@ msgid "Potential"
msgstr "Патэнцыйнае"
msgid "Relation: {0}"
-msgstr "Адносіны: {0}"
+msgstr "Дачыненне: {0}"
msgid "Associate with street using:"
msgstr "Звязаць з вуліцай, выкарыстоўваючы:"
@@ -26630,7 +26777,7 @@ msgid "Convert way to individual house numbers."
msgstr "Пераўтварыць лінію да асобных нумароў хат."
msgid "Will associate {0} additional house number nodes"
-msgstr "Будзе далучана {0} дадатковых кропак нумароў хат"
+msgstr "Будзе далучана {0} дадатковых пунктаў нумароў хат"
msgid "City:"
msgstr "Горад:"
@@ -26703,14 +26850,14 @@ msgid ""
"Please select two segments that don''t share any nodes.\n"
"Alternatively put the pivot on their common node.\n"
msgstr ""
-"Абярыце два сегмента, не мелыя агульных кропак.\n"
-"Ці выкарыстоўвайце іх агульную кропку як цэнтр кручэння (пстрыкніце па ёй).\n"
+"Абярыце два сегмента, не мелыя агульных пунктаў.\n"
+"Ці выкарыстоўвайце іх агульны пункт як цэнтр кручэння (пстрыкніце па ёй).\n"
msgid ""
"Aligning would result nodes ''outside the world''.\n"
"Alignment not possible.\n"
msgstr ""
-"Выраўноўванне прывядзе да кропак «за межамі свету».\n"
+"Выраўноўванне прывядзе да пунктаў «за межамі свету».\n"
"Выраўноўванне немагчыма.\n"
msgid ""
@@ -26718,7 +26865,7 @@ msgid ""
"two way segments.\n"
"Preserved angles type alignment is not possible.\n"
msgstr ""
-"Існуе кропка-ня-цэнтр-кручэння, якая злучае больш, чым два сегменты лініі.\n"
+"Існуе пункт-ня-цэнтр-кручэння, якая злучае больш, чым два сегменты лініі.\n"
"Выраўноўванне з захаваннем кутоў немагчыма.\n"
msgid ""
@@ -26733,7 +26880,7 @@ msgid ""
"An intersection point would fall outside its adjacent nodes.\n"
"This is an unsupported scenario.\n"
msgstr ""
-"Кропка скрыжавання выйдзе за суседнія кропкі. \n"
+"Кропка скрыжавання выйдзе за суседнія пункты. \n"
"Такі сцэнар не падтрымліваецца.\n"
msgid "Undocumented problem occured.\n"
@@ -26749,8 +26896,8 @@ msgid ""
"Please select two segments that don''t share any nodes\n"
" or put the pivot on their common node.\n"
msgstr ""
-"Калі ласка, вылучыце два сегмента не мелыя агульных кропак\n"
-"ці пакажыце іх агульную кропку.\n"
+"Калі ласка, вылучыце два сегмента не мелыя агульных пунктаў\n"
+"ці пакажыце іх агульны пункт.\n"
msgid "Align Way Segments: Modes"
msgstr "Выраўноўванне сегментаў ліній: рэжымы"
@@ -27133,7 +27280,7 @@ msgid ""
"Maximum pixels a point can be away from a line and still be considered as a "
"member of this line (Default: {0})."
msgstr ""
-"Максімальная адлегласць кропкі ад лініі (пікселяў), пры якім кропка ўсё яшчэ "
+"Максімальная адлегласць пункта ад лініі (пікселяў), пры якім пункт ўсё яшчэ "
"лічыцца часткай гэтай лініі (Тыпова: {0})"
msgid "Distance Tolerance"
@@ -27183,10 +27330,10 @@ msgid "Show Address Dialog after mapping an area"
msgstr "Паказваць адрасны дыялог пасля малявання вобласці"
msgid "merge nodes"
-msgstr "Аб''ядноўваць кропкі"
+msgstr "Аб''ядноўваць пункты"
msgid "Merge nodes with existing nodes"
-msgstr "Аб’ядноўваць кропкі з існуючымі кропкамі"
+msgstr "Аб’ядноўваць пункты з існуючымі пунктамі"
msgid "Debug"
msgstr "Адладка"
@@ -27225,7 +27372,7 @@ msgid "Auto-select building"
msgstr "Аўта-выбар будынка"
msgid "Use address nodes under buildings"
-msgstr "Выкарыстоўваць адрасныя кропкі пад будынкамі"
+msgstr "Выкарыстоўваць адрасныя пункты пад будынкамі"
msgid "Buildings width:"
msgstr "Шырыня будынкаў:"
@@ -27253,22 +27400,22 @@ msgstr "Аб’яднаць адрасныя пункты"
msgid "Move tags from address nodes inside buildings to building ways"
msgstr ""
-"Перанесці тэгі з адрасных кропак усярэдзіне будынкаў на лініі будынкаў"
+"Перанесці тэгі з адрасных пунктаў усярэдзіне будынкаў на лініі будынкаў"
msgid "Select both address nodes and building ways to merge"
-msgstr "Для зліцця вылучыце адрасныя кропкі і контуры будынкаў"
+msgstr "Для зліцця вылучыце адрасныя пункты і контуры будынкаў"
msgid "No address nodes found in the selection"
-msgstr "Адрасныя кропкі не вылучаны"
+msgstr "Адрасныя пункты не вылучаны"
msgid "No building ways found in the selection"
msgstr "Лініі будынкаў не вылучаны"
msgid "There is {0} building with multiple address nodes inside"
msgid_plural "There are {0} buildings with multiple address nodes inside"
-msgstr[0] "{0} будынак з некалькімі адраснымі кропкамі ўсярэдзіне"
-msgstr[1] "{0} будынкі з некалькімі адраснымі кропкамі ўсярэдзіне"
-msgstr[2] "{0} будынкаў з некалькімі адраснымі кропкамі ўсярэдзіне"
+msgstr[0] "{0} будынак з некалькімі адраснымі пунктамі ўсярэдзіне"
+msgstr[1] "{0} будынкі з некалькімі адраснымі пунктамі ўсярэдзіне"
+msgstr[2] "{0} будынкаў з некалькімі адраснымі пунктамі ўсярэдзіне"
msgid "There is {0} building with address conflicts"
msgid_plural "There are {0} buildings with address conflicts"
@@ -27277,7 +27424,7 @@ msgstr[1] "{0} будынкі з канфліктамі адрасоў"
msgstr[2] "{0} будынкаў з канфліктамі адрасоў"
msgid "No address nodes inside buildings found"
-msgstr "Адрасныя кропкі ўсярэдзіне будынкаў не знойдзены"
+msgstr "Адрасныя пункты ўсярэдзіне будынкаў не знойдзены"
msgid "on polygon"
msgstr "на палігоне"
@@ -27413,7 +27560,8 @@ msgstr "Спачатку абярыце пласт WMS у спісе."
msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
msgstr ""
-"Не выкарыстоўваць адносіны для адрасоў (аднак, \"addr:street\" на элементах)."
+"Не выкарыстоўваць дачыненне для адрасоў (аднак, \"addr:street\" на "
+"элементах)."
msgid "off"
msgstr "выкл."
@@ -27600,7 +27748,7 @@ msgstr ""
"пластоў."
msgid "Enable this to use the tag \"add:street\" on nodes."
-msgstr "Дазволіць пры гэтым выкарыстоўваць тэг \"add:street\" на кропках."
+msgstr "Дазволіць пры гэтым выкарыстоўваць тэг \"add:street\" на пунктах."
msgid "Unexpected file extension. {0}"
msgstr "Неспадзяванае пашырэнне файла. {0}"
@@ -27778,7 +27926,7 @@ msgid ""
"(two points required)"
msgstr ""
"Адзначце першы кут для абразання малюнка\n"
-"(Патрабуецца адзначыць дзве кропкі)"
+"(Патрабуецца адзначыць два пункты)"
msgid "Image cropping"
msgstr "Абразаць малюнак"
@@ -27788,7 +27936,7 @@ msgid ""
"(two points required)"
msgstr ""
"Адзначце першую папярочку Lambert для геапрывязкі\n"
-"(Усяго трэба дзве кропкі)"
+"(Усяго трэба два пункты)"
msgid "Image georeferencing"
msgstr "Геапрывязка выявы"
@@ -28005,10 +28153,10 @@ msgid "Generate matches"
msgstr "Падабраць пары"
msgid "Layer:"
-msgstr ""
+msgstr "Пласт:"
msgid "{0}: 0 / {1}: 0 / {2}: 0"
-msgstr ""
+msgstr "{0}: 0 / {1}: 0 / {2}: 0"
msgid "Subject"
msgstr "Мэтавы пласт"
@@ -28041,10 +28189,10 @@ msgid "Empty selection"
msgstr "Нічога не вылучана"
msgid "Freeze reference selection"
-msgstr ""
+msgstr "Заблакаваць вылучэнне ў даведкавым пласце"
msgid "{0}: {1} / {2}: {3} / {4}: {5}"
-msgstr ""
+msgstr "{0}: {1} / {2}: {3} / {4}: {5}"
msgid "Invalid reference or subject"
msgstr "Няслушны аб''ект даведкавага або мэтавага пласта"
@@ -28057,7 +28205,7 @@ msgstr ""
"Пастаянна спампоўваць дадзеныя карты пры панарамаванні і змене маштабу."
msgid "Toggle the continuous download on/off"
-msgstr ""
+msgstr "Уключыць/адключыць сталую спампоўку"
msgid "Download Settings"
msgstr "Параметры загрузкі"
@@ -28093,9 +28241,10 @@ msgstr "Макс. колькасць патокаў"
msgid "Maximum number of boxes to download for each pan/zoom."
msgstr ""
+"Максімальная колькасць блокаў, загружаных пры кожным зруху/маштабаванні"
msgid "Max download boxes"
-msgstr ""
+msgstr "Макс. загружаных блокаў"
msgid ""
"Time in milliseconds after a pan/zoom before it starts downloading. "
@@ -28139,6 +28288,9 @@ msgid ""
"is selected there is no indication that something is being done, and no way "
"to cancel the download."
msgstr ""
+"Здушыць паказ індыкатара прагрэсу пры спампоўцы. Калі ўключана, то не будзе "
+"ніякай індыкацыі пра тое, што выконваюцца якія-небудзь дзеянні, і ніякага "
+"спосабу адмяніць спампоўку."
msgid "Address"
msgstr "Адрас"
@@ -28155,8 +28307,8 @@ msgid ""
"Remove the area from the relation before splitting it."
msgstr ""
"Выдзелены палігон не можа быць разрэзаны, таму што ён з''яўляецца "
-"ўдзельнікам адносін.\n"
-"Выдаліце палігон з адносін, перш чым разрэзаць яго."
+"ўдзельнікам дачынення.\n"
+"Выдаліце палігон з дачынення, перш чым разрэзаць яго."
msgid "TangoGPS Files (*.log)"
msgstr "TangoGPS Файлы (*.log)"
@@ -28193,7 +28345,7 @@ msgid "Download from OSM along selected ways"
msgstr "Запампаваць дадзеныя з OSM уздоўж вылучаных ліній"
msgid "{0} intermediate nodes to download."
-msgstr "{0} прамежкавых кропак для загрузкі."
+msgstr "{0} прамежкавых пунктаў для загрузкі."
msgid "between {0} {1} and {2} {3}"
msgstr "паміж {0} {1} і {2} {3}"
@@ -28433,7 +28585,7 @@ msgid "GPSBlam"
msgstr "GPSBlam"
msgid "select gpx points and \"blam!\", find centre and direction of spread"
-msgstr "Абярыце кропкі gpx і \"blam!\", знайдзіце цэнтр і кірунак распаўсюду"
+msgstr "Абярыце пункты gpx і \"blam!\", знайдзіце цэнтр і кірунак распаўсюду"
msgid "Add EGPX layer"
msgstr "Дадаць EGPX пласт"
@@ -28652,7 +28804,7 @@ msgid "default"
msgstr "па змаўчанні"
msgid "end nodes"
-msgstr "Канчатковыя кропкі"
+msgstr "Канчатковыя пункты"
msgid "incline"
msgstr "ухіл"
@@ -29070,7 +29222,7 @@ msgid "Rotate image right"
msgstr "Круціць малюнак направа"
msgid "WayPoint Image"
-msgstr "Малюначак шляхавой кропкі"
+msgstr "Малюначак шляхавага пункта"
msgid "Display non-geotagged photos"
msgstr "Паказаць фатаграфіі, якія не маюць каардынатаў"
@@ -29100,20 +29252,83 @@ msgid "Please open or create data layer before importing"
msgstr "Адкрыйце ці стварыце пласт дадзеных перад імпартам"
msgid "Concourse wizard ..."
-msgstr ""
+msgstr "Памагаты стварэння вестыбюляў..."
msgid "Opens up a wizard to create a concourse"
-msgstr ""
+msgstr "Адкрыць памочнік стварэння вестыбюляў"
msgid "Vertical layer:"
-msgstr ""
+msgstr "Вертыкальны пласт:"
msgid "Structure type:"
-msgstr ""
+msgstr "Тып структуры:"
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr "Памочнік малявання ўнутраных памяшканняў"
+
+msgid "POWER"
+msgstr "МАГУТНАСЦЬ"
+
+msgid "Activates the plug-in"
+msgstr "Актывуе модуль"
+
+msgid "Working Level"
+msgstr "Рабочы ўзровень"
+
+msgid "Selects the working level."
+msgstr "Выбар бягучага працоўнага ўзроўня."
+
+msgid "Level Name"
+msgstr "Назва ўзроўня"
+
+msgid "Optional name-tag for a level."
+msgstr "Неабавязковая назва для ўзроўня."
+
+msgid "The object preset you want to tag."
+msgstr "Нарыхтоўка тэга для дадзенага аб''екта."
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr "Значэнне тэга name, калі вылучаны аб''ект room"
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr "Значэнне тэга ref, калі вылучаны аб''ект room"
+
+msgid "Apply Tags"
+msgstr "Ужыць тэгі"
+
+msgid "Fitting"
+msgstr "Падганянне"
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+"<html>Не забудзьцеся напачатку наладзіць зрушэнне планаў "
+"будынка.<br>Выкарыстоўвайце для гэтага модуль PicLayer, які можна ўсталяваць "
+"<br>з дапамогай інструментара кіравання модулямі ў наладах JOSM.</html>"
+
+msgid "Level Selection"
+msgstr "Выбар узроўня"
+
+msgid "Lowest Level"
+msgstr "Самы ніжні ўзровень"
+
+msgid "The lowest level of your building."
+msgstr "Самы ніжні ўзровень будынка."
+
+msgid "Highest Level"
+msgstr "Самы верхні ўзровень"
+
+msgid "The highest level of your building."
+msgstr "Самы верхні ўзровень будынка."
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr "Інструменты для малявання ўнутраных памяшканняў"
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -29124,7 +29339,7 @@ msgid ""
"Move the mouse to show trackpoint info for current layer. Hold shift to "
"highlight tracks"
msgstr ""
-"Перамяшчайце мыш, каб паказаць інфармацыю аб кропках трэка для бягучага "
+"Перамяшчайце мыш, каб паказаць інфармацыю аб пунктах трэка для бягучага "
"пласта. Утрымлівайце Shift для падсвятлення трэкаў."
msgid "Delete this"
@@ -29208,11 +29423,11 @@ msgid "order of junction (n):"
msgstr "парадак злучэнняў (n)"
msgid "produce OSM-Relations: junction"
-msgstr "стварыць адносіны OSM: злучэнні (junction)"
+msgstr "стварыць дачыненні OSM: злучэнні (junction)"
msgid ""
"if enabled the plugin produces osm-relations from the junction subgraphs"
-msgstr "калі уключаны, модуль стварае адносіны OSM з падграфаў развязак"
+msgstr "калі уключаны, модуль стварае дачыненні OSM з падграфаў развязак"
msgid "create the channel digraph"
msgstr "стварыць арграф канала"
@@ -29261,7 +29476,7 @@ msgid "Looking for shoreline..."
msgstr "Пошук берагавой лініі..."
msgid "{0} nodes so far..."
-msgstr "{0} кропак на дадзены момант..."
+msgstr "{0} пунктаў на дадзены момант..."
msgid "Lake Walker."
msgstr "Трасіроўшчык азёр"
@@ -29285,7 +29500,7 @@ msgid "Running Douglas-Peucker approximation..."
msgstr "Апраксімацыя Douglas-Peucker..."
msgid "Removing duplicate nodes..."
-msgstr "Выдаленне паўтаральных кропак..."
+msgstr "Выдаленне паўтаральных пунктаў..."
msgid "Lakewalker trace"
msgstr "Трасіроўшчык азёр"
@@ -29327,7 +29542,7 @@ msgid "Maximum number of segments per way"
msgstr "Максімальная колькасць сегментаў у лініі"
msgid "Maximum number of nodes in initial trace"
-msgstr "Максімальная колькасць кропак на эскізе"
+msgstr "Максімальная колькасць пунктаў на эскізе"
msgid "Maximum gray value to count as water (0-255)"
msgstr "Самае светлае адценне шэрага, які лічыць вадой (0-255)"
@@ -29339,7 +29554,7 @@ msgid "Resolution of Landsat tiles (pixels per degree)"
msgstr "Разрозненне квадратаў Landsat (пікселяў на градус)"
msgid "Size of Landsat tiles (pixels)"
-msgstr "Памер квадратаў спадарожнікавых здымкаў (у кропках)"
+msgstr "Памер квадратаў спадарожнікавых здымкаў (у пікселях)"
msgid "Shift all traces to east (degrees)"
msgstr "Ссунуць усе трэкі на ўсход (градусы)"
@@ -29381,7 +29596,7 @@ msgid ""
"Maximum number of nodes to generate before bailing out (before simplifying "
"lines). Default 50000."
msgstr ""
-"Максімальная колькасць кропак, згенераваных перад ачысткай (да спрашчэння "
+"Максімальная колькасць пунктаў, згенераваных перад ачысткай (да спрашчэння "
"ліній). Па змаўчанні 50000."
msgid ""
@@ -29397,7 +29612,7 @@ msgid ""
"0.0003."
msgstr ""
"Дакладнасць алгарытму спрашчэння ліній Douglas-Peucker, якая вымяраецца ў "
-"градусах.<br>Меншыя значэнні даюць больш кропак і больш дакладныя лініі. Па "
+"градусах.<br>Меншыя значэнні даюць больш пунктаў і больш дакладныя лініі. Па "
"змаўчанні 0.0003."
msgid ""
@@ -29411,10 +29626,10 @@ msgstr ""
"Памер аднаго квадрата спадарожнікавага здымка, у пікселях. Па змаўчанні 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 "Кірунак пошуку зямлі. Па змаўчанні — усход."
@@ -29522,10 +29737,10 @@ msgid "images"
msgstr "здымкі"
msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
+msgstr "Шрыфт дарожнага знака ў ''{0}'' мае няправільны фармат"
msgid "Could not read font-file from ''{0}''"
-msgstr ""
+msgstr "Не атрымалася прачытаць файл шрыфта з ''{0}''"
msgid "Mapillary"
msgstr "Mapillary"
@@ -29766,16 +29981,16 @@ 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 "Go to setting and log in to Mapillary before uploading."
-msgstr ""
+msgstr "Перайсці да налад і ўвайсці ў Mapillary перад адпраўкай дадзеных."
msgid "Upload selected sequence"
msgstr "Адаслаць вылучаную паслядоўнасць"
@@ -29836,13 +30051,13 @@ msgid "Select mode"
msgstr "Рэжым вылучэння"
msgid "Mapillary login"
-msgstr ""
+msgstr "Уваход у Mapillary"
msgid "Login successful, return to JOSM."
-msgstr ""
+msgstr "Уваход паспяхова выкананы, зварот у JOSM."
msgid "Supported image formats (JPG and PNG)"
-msgstr ""
+msgstr "Падтрымоўваныя фарматы малюнкаў (JPG і PNG)"
msgid "Downloading Mapillary images"
msgstr "Загрузка здымкаў Mapillary"
@@ -29860,16 +30075,16 @@ msgid "Uploading: {0}"
msgstr "Адсылаецца: {0}"
msgid "The image key ''{0}'' is invalid!"
-msgstr ""
+msgstr "Няслушны ідэнтыфікатар малюнка ''{0}''!"
msgid "The image key must not be null here!"
-msgstr ""
+msgstr "Ідэнтыфікатар малюнка тут не павінен мець значэнне null!"
msgid "The sequence key ''{0}'' is invalid!"
-msgstr ""
+msgstr "Няслушны ідэнтыфікатар паслядоўнасці ''{0}''!"
msgid "The sequence key must not be null here!"
-msgstr ""
+msgstr "Ідэнтыфікатар паслядоўнасці тут не павінен мець значэнне null!"
msgid "Measured values"
msgstr "Вымераныя значэнні"
@@ -29896,7 +30111,7 @@ msgid "Angle"
msgstr "Кут"
msgid "Angle between two selected Nodes"
-msgstr "Кут паміж дзвюма вылучанымі кропкамі"
+msgstr "Кут паміж двума вылучанымі пунктамі"
msgid "Layer to make measurements"
msgstr "Пласт для правядзення вымярэнняў"
@@ -29920,14 +30135,14 @@ 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>Усе новыя лініі атрымалі сяброўства у ралявых суадносінах.Трэба "
+"<html>Усе новыя лініі атрымалі сяброўства у ралявых дачыненнях.Трэба "
"спраўдзіць і выправіць калі патрэбна.</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>"
msgid "Split way"
@@ -29944,7 +30159,7 @@ 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 "Немагчыма спарадкаваць лініі. Калі ласка, праверце іх кірунак"
@@ -29954,7 +30169,7 @@ msgstr "Стварыць абмежаванні павароту налева (
msgid "Unable to find via nodes. Please check your selection"
msgstr ""
-"Немагчыма знайсці кропкі \"via\" (праз). Калі ласка, праверце, што вы абралі"
+"Немагчыма знайсці пункты \"via\" (праз). Калі ласка, праверце, што вы абралі"
msgid "About Plugin"
msgstr "Пра модуль"
@@ -30628,7 +30843,7 @@ msgstr ""
"Памылка пераўтварэння: Мінімальнае значэнне Y павінна быць менш максімальнага"
msgid "Transform error: Points too close"
-msgstr "Памылка пераўтварэння: кропкі знаходзяцца блізка адзін ад аднаго"
+msgstr "Памылка пераўтварэння: пункты знаходзяцца блізка адзін ад аднаго"
msgid "Transform error: Unsupported variant."
msgstr "Памылка пераўтварэння: Непадтрымоўваны варыянт."
@@ -30652,13 +30867,13 @@ msgid "Show target"
msgstr "Паказаць мэту"
msgid "Take X and Y from selected node"
-msgstr "Атрымаць X і Y з вылучанай кропкі"
+msgstr "Атрымаць X і Y з вылучанага пункта"
msgid "Debug info"
msgstr "Адладкавая інфармацыя"
msgid "Merge close nodes"
-msgstr "Зліць кропкі, змешчаныя побач"
+msgstr "Зліць пункты, змешчаныя побач"
msgid "Remove objects smaller than"
msgstr "Выдаліць аб’екты менш чым"
@@ -30733,7 +30948,7 @@ msgid "Imported PDF: "
msgstr "Імпартаваны PDF: "
msgid "Please select exactly one node."
-msgstr "Калі ласка, вылучыце толькі адну кропку"
+msgstr "Калі ласка, вылучыце толькі адзін пункт"
msgid "PDF files"
msgstr "Файлы PDF"
@@ -30769,7 +30984,7 @@ msgid "Max distance is not a number"
msgstr "Максімальная адлегласць не з’яўляецца лікам"
msgid "Joining nodes"
-msgstr "Далучэнне кропак"
+msgstr "Далучэнне пунктаў"
msgid "Joining adjacent segments"
msgstr "Злучэнне сумежных адрэзкаў"
@@ -30916,22 +31131,22 @@ msgid "Please load some photos."
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 "No image selected"
-msgstr ""
+msgstr "Выява не абрана"
msgid "(Empty values delete the according fields.)"
-msgstr ""
+msgstr "(Пустыя значэнні выдаляюць адпаведныя палі.)"
msgid "coordinates"
msgstr "каардынаты"
@@ -30940,13 +31155,13 @@ msgid "Latitude and longitude"
msgstr "Шырата і даўгата"
msgid "Edit Image Coordinates"
-msgstr ""
+msgstr "Змяніць каардынаты выявы"
msgid "Edit coordinates in separate editor"
-msgstr ""
+msgstr "Змяніць каардынаты ў асобным рэдактары"
msgid "altitude"
-msgstr ""
+msgstr "вышыня"
msgid "Altitude:"
msgstr "Вышыня:"
@@ -30955,7 +31170,7 @@ msgid "speed"
msgstr "хуткасць"
msgid "positive number or empty"
-msgstr ""
+msgstr "дадатны лік ці пустое"
msgid "Speed:"
msgstr "Хуткасць:"
@@ -30964,7 +31179,7 @@ msgid "direction"
msgstr "напрамак"
msgid "range -360.0 .. 360.0, or empty"
-msgstr ""
+msgstr "у дыяпазоне -360.0 .. 360.0, ці пустое"
msgid "Direction:"
msgstr "Напрамак:"
@@ -30973,10 +31188,10 @@ msgid "°"
msgstr "°"
msgid "Undo changes made in this dialog"
-msgstr ""
+msgstr "Адмяніць змены, зробленыя ў гэтым дыялогу"
msgid "Reload GPS data from image file"
-msgstr ""
+msgstr "Перазагрузіць GPS-дадзеныя з файла выявы"
msgid "New layer for untagged images"
msgstr "Новы пласт для не адзначанага малюнка"
@@ -30988,7 +31203,7 @@ msgid "Do you want to save current calibration of layer {0}?"
msgstr "Вы жадаеце захаваць каліброўку пласта {0}?"
msgid "Select an option"
-msgstr ""
+msgstr "Абярыце адзін з варыянтаў"
msgid "Load Picture Calibration..."
msgstr "Загрузіць каліброўку малюнка..."
@@ -31000,7 +31215,7 @@ msgid "Loading file failed: {0}"
msgstr "Загрузка файла не атрымалася: {0}"
msgid "Problem occurred"
-msgstr ""
+msgstr "Паўстала праблема"
msgid "Load World File Calibration..."
msgstr "Загрузіць калібравальныя дадзеныя з world-файла..."
@@ -31041,7 +31256,7 @@ msgid ""
"Please use {0} to upload your KMLs that were calibrated incorrectly."
msgstr ""
"KML прывязка знаходзіцца ў стадыі бэта-тэставання і можа прывесці да "
-"няправільнай прывязкі слаёў!\n"
+"няправільнай прывязкі пластоў!\n"
"Выкарыстоўвайце {0}, каб загрузіць свае KML, якія былі прывязаныя "
"няправільна."
@@ -31165,7 +31380,7 @@ msgid "Do you want to apply it ?"
msgstr "Жадаеце ўжыць?"
msgid "Load calibration file?"
-msgstr ""
+msgstr "Загрузіць калібравальны файл?"
msgid "It will be applied automatically."
msgstr "Ён будзе ўжыты аўтаматычна."
@@ -31176,10 +31391,10 @@ msgstr ""
"З дадзенага моманту калібравальныя файлы будуць загружацца аўтаматычна."
msgid "Point info"
-msgstr "Інфармацыя пра кропку"
+msgstr "Інфармацыя пра пункт"
msgid "Point info."
-msgstr "Інфармацыя пра кропку."
+msgstr "Інфармацыя пра пункт."
msgid "Connecting server"
msgstr "Злучэнне з серверам"
@@ -31191,13 +31406,13 @@ msgid "Data not available."
msgstr "Дадзеныя недаступныя"
msgid "Add new address point"
-msgstr "Дадаць новую адрасную кропку"
+msgstr "Дадаць новую адрасны пункт"
msgid "Tags copied to clipboard."
msgstr "Тэгі скапіяваны ў буфер абмену."
msgid "New address point added."
-msgstr "Новая адрасная кропка дададзена."
+msgstr "Новая адрасны пункт дададзена."
msgid "Download Osmosis poly"
msgstr "Запампаваць Osmosis poly"
@@ -31212,7 +31427,7 @@ msgid "The file must begin with a polygon name"
msgstr "Файл павінен пачынацца з імя палігона"
msgid "There are less than 2 points in an area"
-msgstr "У вобласці меней 2 кропак"
+msgstr "У вобласці меней 2 пунктаў"
msgid "A polygon coordinate line must contain exactly 2 numbers"
msgstr "Радок з каардынатамі палігона павінна ўтрымоўваць 2 лікі"
@@ -31224,7 +31439,7 @@ msgid "Invalid coordinates were found: {0}, {1}"
msgstr "Знойдзены недапушчальныя каардынаты: {0}, {1}"
msgid "{0} points were outside world bounds and were moved"
-msgstr "{0} кропак апынуліся за межамі свету і былі перамешчаны"
+msgstr "{0} пунктаў апынуліся за межамі свету і былі перамешчаны"
msgid "Osmosis polygon filter files"
msgstr "Файлы Osmosis polygon filter file"
@@ -31486,7 +31701,7 @@ msgid "Select GPX file"
msgstr "Абярыце GPX файл"
msgid "The GPX file contained no tracks or waypoints."
-msgstr "GPX файл не ўтрымоўвае трэкаў ці шляхавых кропак."
+msgstr "GPX файл не ўтрымоўвае трэкаў ці шляхавых пунктаў."
msgid "Create Stops from GPX"
msgstr "Стварыць прыпынкі з GPX"
@@ -31504,8 +31719,8 @@ msgid ""
"The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
"has trackpoints."
msgstr ""
-"GPX файл не ўтрымоўвае пэўных кропак трэка. Калі ласка, выкарыстоўвайце GPX "
-"файл, які мае кропкі трэка."
+"GPX файл не ўтрымоўвае пэўных пунктаў трэка. Калі ласка, выкарыстоўвайце GPX "
+"файл, які мае пункты трэка."
msgid "GPX File Trouble"
msgstr "Праблемны GPX файл"
@@ -31526,7 +31741,7 @@ msgid "Public Transport: Edit track stop list"
msgstr "Грамадскі транспарт: Рэдагаваць прыпынак у спісе маршруту"
msgid "Public Transport: Relocate nodes in track stoplist"
-msgstr "Грамадскі транспарт: Перамясціць кропкі ў спісе прыпынкаў маршруту"
+msgstr "Грамадскі транспарт: Перамясціць пункты ў спісе прыпынкаў маршруту"
msgid "Public Transport: sort track stop list"
msgstr "Грамадскі транспарт: Сартаваць спіс прыпынкаў маршруту"
@@ -31538,16 +31753,25 @@ msgid "Stopname"
msgstr "Назва прыпынку"
msgid "Public Transport: Detach waypoints"
-msgstr "Грамадскі транспарт: Адлучыць шляхавыя кропкі"
+msgstr "Грамадскі транспарт: Адлучыць шляхавыя пункты"
msgid "Public Transport: Disable waypoints"
-msgstr "Грамадскі транспарт: Адключыць шляхавыя кропкі"
+msgstr "Грамадскі транспарт: Адключыць шляхавыя пункты"
msgid "Public Transport: Enable waypoints"
-msgstr "Грамадскі транспарт: Уключыць шляхавыя кропкі"
+msgstr "Грамадскі транспарт: Уключыць шляхавыя пункты"
msgid "Public Transport: Edit waypoint name"
-msgstr "Грамадскі транспарт: Рэдагаваць імя кропкі"
+msgstr "Грамадскі транспарт: Рэдагаваць імя пункта"
+
+msgid "Distance between stops"
+msgstr "Адлегласць паміж прыпынкамі"
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr "Патрабуецца сапраўдны маршрут public_transport:version=2"
+
+msgid "Invalid selection"
+msgstr "Няправільнае вылучэнне"
msgid "Public transport routes"
msgstr "Маршруты грамадскага транспарту"
@@ -31572,25 +31796,25 @@ msgstr ""
"Памылка ініцыялізацыі JSlider. Пераканайцеся, што ваша мета-інф. карэктная."
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 "Дадаць тэгі boundary і admin_level да ліній ў адносінах мяжы"
+msgstr "Дадаць тэгі boundary і admin_level да ліній ў дачыненні мяжы"
msgid "Move area tags from contour to relation"
-msgstr "Перамясціць тэгі палігона з контуру на адносіны"
+msgstr "Перамясціць тэгі палігона з контуру на дачыненне"
msgid "When moving tags, consider even non-repeating ones"
msgstr "Перасоўваючы тэгі, не забывайце і пра непаўтаральныя"
@@ -31605,16 +31829,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 "Стварыць мультыпалігон з вылучаных аб''ектаў"
@@ -31623,7 +31847,7 @@ msgid "Create multipolygons from rings"
msgstr "Стварыць мультыпалігоны з акружнасцяў"
msgid "Move tags from ways to relation"
-msgstr "Перамясціць тэгі з лініі на адносіны"
+msgstr "Перамясціць тэгі з лініі на дачыненне"
msgid "Enter admin level and name for the border relation:"
msgstr "Калі ласка, увядзіце admin_level і назву мяжы:"
@@ -31632,32 +31856,32 @@ 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 "Запампаваць спасылкі"
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 "Ператварыць у палігон"
@@ -31670,52 +31894,52 @@ msgstr ""
"Рэканструкцыя палігонаў можа быць ажыццёўлена толькі для знешніх ліній"
msgid "Reconstruct polygons from relation {0}"
-msgstr "Аднавіць палігон з адносін {0}"
+msgstr "Аднавіць палігон з дачынення {0}"
msgid "Reconstruct route"
msgstr "Рэканструяваць маршрут"
msgid "Open relation wiki page"
-msgstr "Адкрыць старонку вікі інфармацыі пра адносіны"
+msgstr "Адкрыць старонку вікі інфармацыі пра дачыненне"
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 "Замкнуць мультыпалігон для лініі {0}"
msgid "Node without ''house'' role found"
-msgstr "Знойдзена кропка без ролі ''house''"
+msgstr "Знойдзены пункт без ролі ''house''"
msgid "Way without ''house'' or ''street'' role found"
msgstr "Знойдзена лінія без ролі ''house'' ці ''street''"
msgid "Relation without ''house'' role found"
-msgstr "Знойдзены адносіны без ролі ''house''"
+msgstr "Знойдзены дачыненне без ролі ''house''"
msgid "Relation does not have name"
-msgstr "У адносін адсутнічае імя"
+msgstr "У дачынення адсутнічае імя"
msgid "Relation has streets with different names"
-msgstr "Адносіны ўтрымліваюць вуліцы з рознымі назвамі"
+msgstr "Дачыненне ўтрымлівае вуліцы з рознымі назвамі"
msgid "fix associatedStreet relation"
-msgstr "выправіць адносіны associatedStreet"
+msgstr "выправіць дачыненне associatedStreet"
msgid "Relation without ''subarea'' role found"
-msgstr "Знойдзены адносіны без ролі ''subarea''"
+msgstr "Знойдзены дачыненне без ролі ''subarea''"
msgid "Node without ''label'' or ''admin_centre'' role found"
-msgstr "Знойдзена кропка без ролі ''label'' ці ''admin_centre''"
+msgstr "Знойдзены пункт без ролі ''label'' ці ''admin_centre''"
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Знойдзена лінія без ролі ''inner'' ці ''outer''"
msgid "Node without ''stop'' or ''platform'' role found"
-msgstr "Выяўлена кропка без ролі ''stop'' ці ''platform''"
+msgstr "Выяўлены пункт без ролі ''stop'' ці ''platform''"
msgid "Way platform without ''platform'' role found"
msgstr "Выяўлена лінія платформы без ролі ''platform''"
@@ -31862,22 +32086,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 "Выдаліць кропку ''{0}'' ў пазіцыі {1} з адносін ''{2}''"
+msgstr "Выдаліць пункт ''{0}'' ў пазіцыі {1} з дачынення ''{2}''"
msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Выдаліць лінію ''{0}'' ў пазіцыі {1} з адносін ''{2}''"
+msgstr "Выдаліць лінію ''{0}'' ў пазіцыі {1} з дачынення ''{2}''"
msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "Выдаліць адносіны ''{0}'' ў пазіцыі {1} з адносін ''{2}''"
+msgstr "Выдаліць дачыненне ''{0}'' ў пазіцыі {1} з дачынення ''{2}''"
msgid "routing active route"
msgstr "Маршрутызацыя: актыўны маршрут"
@@ -31898,7 +32122,7 @@ msgid "Click to remove destination"
msgstr "Націсніце, каб выдаліць прызначэнне"
msgid "Open a list of routing nodes"
-msgstr "Адкрыць спіс кропак маршруту"
+msgstr "Адкрыць спіс пунктаў маршруту"
msgid "Add routing layer"
msgstr "Дадаць пласт шляхоў."
@@ -32079,13 +32303,13 @@ msgid "Simplify Area"
msgstr "Спрасціць палігон"
msgid "Delete unnecessary nodes from an area."
-msgstr "Выдаліць непатрэбныя кропкі з палігона."
+msgstr "Выдаліць непатрэбныя пункты з палігона."
msgid "Yes, delete nodes"
-msgstr "Так, выдаліць кропкі"
+msgstr "Так, выдаліць пункты"
msgid "Delete nodes outside of downloaded data regions"
-msgstr "Выдаліць кропкі за межамі вобласці запампаваных з сервера дадзеных"
+msgstr "Выдаліць пункты за межамі вобласці запампаваных з сервера дадзеных"
msgid "No, abort"
msgstr "Не, перапыніць"
@@ -32094,10 +32318,10 @@ msgid "Do you want to delete them anyway?"
msgstr "Вы ўсё адно жадаеце выдаліць іх?"
msgid "Delete nodes outside of data regions?"
-msgstr "Выдаліць кропкі за межамі вобласці дадзеных?"
+msgstr "Выдаліць пункты за межамі вобласці дадзеных?"
msgid "average nearby nodes"
-msgstr "асерадніць суседнія кропкі"
+msgstr "асерадніць суседнія пункты"
msgid ""
"Node of the way (area) is removed if all of <u>Angle Weight</u>, <u>Area "
@@ -32117,13 +32341,13 @@ msgstr ""
"<u>Мера плошчы</u> і <u>Мера адлегласці</u>. <u>Мера</u> вылічаецца: "
"<u>Значэнне</u> / <u>Мяжа</u>, дзе <u>Значэнне</u> адно з <u>Кут</u>, "
"<u>Плошча</u> або <u>Адлегласць</u>, вылічаемае з кожнай тройкі злучаных "
-"кропак лініі. <ul><li><u>Значэнне</u> <u>Кута</u> - кут у градусах на "
+"пунктаў лініі. <ul><li><u>Значэнне</u> <u>Кута</u> - кут у градусах на "
"сярэдняй кропцы</li><li><u>Значэнне</u> <u>Плошчы</u> - плошча "
"трохвугольніка</li><li><u>Значэнне</u> <u>Адлегласці</u> - Cross Track Error "
"Distance</li></ul>Усе тры <u>Меры</u > множацца на іх <u>Каэфіцыент</u> і "
"падсумоўваюцца. Кропка з найменшай сумай выдаляецца. Разлікі і выдаленне "
-"працягваюцца, пакуль ёсць што выдаляць. Зліццё блізкіх кропак - наступны "
-"крок спрашчэння, які аб''ядноўвае кропкі, якія бліжэй названага "
+"працягваюцца, пакуль ёсць што выдаляць. Зліццё блізкіх пунктаў - наступны "
+"крок спрашчэння, які аб''ядноўвае пункты, якія бліжэй названага "
"<u>Парога</u> у метрах."
msgid "Angle Threshold"
@@ -32145,7 +32369,7 @@ msgid "Distance Factor"
msgstr "Каэфіцыент адлегласці"
msgid "Merge Nearby Nodes Threshold"
-msgstr "Парог блізкасці кропак (м)"
+msgstr "Парог блізкасці пунктаў (м)"
msgid "SeaMap Editor"
msgstr "Рэдактар марскіх карт"
@@ -32160,13 +32384,13 @@ msgid "Spline goes outside of the world."
msgstr "Сплайн выходзіць за межы свету."
msgid "Add an existing node to spline: {0}"
-msgstr "Дадаць існую кропку да сплайну: {0}"
+msgstr "Дадаць існы пункт да сплайну: {0}"
msgid "Add a new node to spline: {0}"
-msgstr "Дадаць новую кропку да сплайну: {0}"
+msgstr "Дадаць новы пункт да сплайну: {0}"
msgid "Delete spline node {0}"
-msgstr "Выдаліць кропку сплайну {0}"
+msgstr "Выдаліць пункт сплайну {0}"
msgid "Finish spline"
msgstr "Завяршыць сплайн"
@@ -32181,7 +32405,7 @@ msgid "Curve steps"
msgstr "Лік сегментаў крывой"
msgid "Undelete node {0}"
-msgstr "Вярнуць выдаленую кропку {0}"
+msgstr "Вярнуць выдалены пункт {0}"
msgid "OSM Export"
msgstr "Экспарт OSM"
@@ -32227,7 +32451,7 @@ msgid "Error parsing {0}: {1}"
msgstr "Памылка разбору {0}: {1}"
msgid "Surveyor waypoint layer"
-msgstr "Пласт шляхавых кропак Surveyor"
+msgstr "Пласт шляхавых пунктаў Surveyor"
msgid "{0} start"
msgstr "{0} пачатак"
@@ -32236,7 +32460,7 @@ msgid "{0} end"
msgstr "{0} канец"
msgid "Waypoint Description"
-msgstr "Апісанне шляхавой кропкі"
+msgstr "Апісанне шляхавага пункта"
msgid "Tag2Link Preferences"
msgstr "Налады Tag2Link"
@@ -32311,10 +32535,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 "захаваць лінію вонкавага контуру"
@@ -32367,16 +32591,13 @@ msgstr "Шэраг хат уздоўж вуліцы"
msgid "Creates individual buildings from a long building."
msgstr "Стварыць асобныя будынкі з доўгага будынка"
-msgid "Invalid selection"
-msgstr "Няправільнае вылучэнне"
-
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 і кропку для пазначэння "
+"Вылучыце адну замкнёную лінію, якая складаецца мінімум з чатырох пунктаў. "
+"(Дадаткова можна абраць дарогу для тэга addr:street і пункт для пазначэння "
"пачатку нумарацыі)"
msgid "Terrace"
@@ -32435,7 +32656,7 @@ msgid "Something went wrong, try again"
msgstr "Нешта пайшло не так, паспрабуйце яшчэ раз"
msgid "Cannot place a node outside of the world."
-msgstr "Не атрымоўваецца змясціць кропку за межамі свету"
+msgstr "Не атрымоўваецца змясціць пункт за межамі свету"
msgid "Layer to draw OSM error"
msgstr "Пласт для адлюстравання памылак OSM"
@@ -32447,7 +32668,7 @@ msgid "Browse map with left button"
msgstr "Праглядаць карту, выкарыстоўваючы левую кнопку мышы"
msgid "Merge objects nodes"
-msgstr "Аб’яднаць кропкі аб’ектаў"
+msgstr "Аб’яднаць пункты аб’ектаў"
msgid "Tracer"
msgstr "Трасіроўшчык"
@@ -32490,10 +32711,10 @@ msgid "Select parameter"
msgstr "Абярыце параметр"
msgid "Tracer2: add a way with {0} points"
-msgstr "Tracer2: дадаць лінію з {0} кропак"
+msgstr "Tracer2: дадаць лінію з {0} пунктаў"
msgid "Tracer2: modify way to {0} points"
-msgstr "Tracer2: змяніць лінію з {0} кропак"
+msgstr "Tracer2: змяніць лінію з {0} пунктаў"
msgid "Tracer2 error"
msgstr "Памылка Tracer2"
@@ -32679,7 +32900,7 @@ msgid "Signature Info"
msgstr "Падрабязнасці подпісу"
msgid "Sorry, there are no Signatures for the selected Node."
-msgstr "Выбачайце, няма подпісаў для абранай кропкі"
+msgstr "Выбачайце, няма подпісаў для абранага пункта"
msgid "No Signature found"
msgstr "Подпісу не знойдзена"
@@ -32688,7 +32909,7 @@ msgid ""
"Selected node was:\n"
"{0}"
msgstr ""
-"Абраная кропка:\n"
+"Абраны пункт:\n"
"{0}"
msgid "Sorry, there are no Signatures for the selected Attribute."
@@ -32843,10 +33064,10 @@ msgstr ""
msgid "Edit turn relations and lane lengths for selected node."
msgstr ""
-"Рэдагаваць абмежаванні на паварот і даўжыню паласы для абранай кропкі"
+"Рэдагаваць абмежаванні на паварот і даўжыню паласы для абранага пункта"
msgid "Validate turn- and lane-length-relations for consistency."
-msgstr "Праверыць адносіны абмежаванняў і даўжыні паласы на цэласнасць"
+msgstr "Праверыць дачыненні абмежаванняў і даўжыні паласы на цэласнасць"
msgid "Turn Lanes"
msgstr "Паваротныя палосы"
@@ -32858,13 +33079,13 @@ 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 "Дадаць паварот"
@@ -32877,17 +33098,17 @@ msgstr "Выдаліць паварот"
msgid "{0} lanes are not referenced in any turn-relation."
msgstr ""
-"У {0} апісанняў палос адсутнічаюць спасылкі на адносіны абмежаванняў "
+"У {0} апісанняў палос адсутнічаюць спасылкі на дачыненне абмежаванняў "
"павароту."
msgid "Put the ways in order."
msgstr "Размясціць шляхі па парадку"
msgid "Relation references non-existent (regular) lane {0}"
-msgstr "Адносіны спасылаюцца на неіснуючую (звычайную) паласу {0}"
+msgstr "Дачыненне спасылаецца на неіснуючую (звычайную) паласу {0}"
msgid "Relation references non-existent extra lane {0}"
-msgstr "Адносіны спасылаюцца на неіснуючую дадатковую паласу {0}"
+msgstr "Дачыненне спасылаецца на неіснуючую дадатковую паласу {0}"
msgid "Integer list \"{0}\" contains unexpected values."
msgstr "Спіс лікаў \"{0}\" утрымоўвае некарэктныя значэнні"
@@ -32903,7 +33124,7 @@ msgid ""
"relation representing this turn restriction."
msgstr ""
"У наступнай табліцы вы можаце рэдагаваць <strong>неапрацаваныя "
-"тэгі</strong>, ўнутры адносін OSM, якія вызначаюць дадзенае абмежаванне на "
+"тэгі</strong>, ўнутры дачынення OSM, якое вызначае дадзенае абмежаванне на "
"паварот."
msgid ""
@@ -32911,7 +33132,7 @@ msgid ""
"OSM relation representing this turn restriction."
msgstr ""
"У наступнай табліцы вы можаце рэдагаваць <strong>неапрацаваных "
-"удзельнікаў</strong>, ўнутры адносін OSM, якія вызначаюць дадзенае "
+"удзельнікаў</strong>, ўнутры дачынення OSM, якое вызначае дадзенае "
"абмежаванне на паварот."
msgid "Type:"
@@ -32936,20 +33157,20 @@ msgid ""
"Cannot add object ''{0}'' as relation member because it is deleted or "
"invisible in layer ''{1}''"
msgstr ""
-"Немагчыма дадаць аб''ект ''{0}'' у якасці ўдзельніка адносін, таму што ён "
+"Немагчыма дадаць аб''ект ''{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 "Правіць асноўныя атрыбуты абмежавання на паварот"
@@ -33341,8 +33562,8 @@ msgid ""
msgstr ""
"Лінія з роляй <strong>from</strong><span class=\"object-name\">{0}</span> і "
"лінія з роляй <strong>to</strong> <span class=\"object-name\">{1}</span> "
-"перасякаюцца ў пункце <span class=\"object-name\">{2}</span>, але гэтая "
-"кропка не выступае ў ролі <strong>via</strong>.<br> Рэкамендуецца стварыць "
+"перасякаюцца ў пункце <span class=\"object-name\">{2}</span>, але гэты пункт "
+"не выступае ў ролі <strong>via</strong>.<br> Рэкамендуецца стварыць "
"унікальны аб''ект з роляй <strong>via</strong>."
msgid "Set via-Object"
@@ -33351,7 +33572,7 @@ msgstr "Задаць як элемент «праз»"
msgid ""
"Replaces the currently configured via-objects with the node at the "
"intersection"
-msgstr "Замяніць ўжо устаноўленыя элементы «праз» на кропку перасячэння"
+msgstr "Замяніць ўжо устаноўленыя элементы «праз» на пункт перасячэння"
msgid "Go to Basic Editor and manually fix the list of via-objects"
msgstr ""
@@ -33395,8 +33616,8 @@ msgid ""
"Make sure you add one or more via objects (nodes or ways) to the turn "
"restriction."
msgstr ""
-"Пераканайцеся, што вы дадалі адзін або больш аб’ектаў з роляй «праз» (кропак "
-"ці ліній) да абмежавання на паварот."
+"Пераканайцеся, што вы дадалі адзін або больш аб’ектаў з роляй «праз» "
+"(пунктаў ці ліній) да абмежавання на паварот."
msgid "Go to the Advanced Editor and add via objects"
msgstr "Перайдзіце ў Пашыраны рэдактар і дадайце аб’екты з роляй «праз»"
@@ -33447,8 +33668,8 @@ msgid ""
msgstr ""
"Лінія <span class=\"object-name\">{0}</span> з роляй <tt>from</tt> і лінія "
"<span class=\"object-name\">{1}</span> з роляй <tt>to</tt> перасякаюцца ў "
-"кропцы <span class=\"object-name\">{2}</span>. <p> Абедзве лініі павінны "
-"быць злучаны ў кропцы скрыжавання."
+"пункце <span class=\"object-name\">{2}</span>. <p> Абедзве лініі павінны "
+"быць злучаны ў пункце скрыжавання."
msgid ""
"The way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> should "
@@ -33456,7 +33677,7 @@ msgid ""
"way <span class=\"object-name\">{3}</span>."
msgstr ""
"Лінія <span class=\"object-name\">{0}</span> з роляй <tt>{1}</tt> павінна "
-"быць падзелена ў кропцы <span class=\"object-name\">{2}</span>, дзе яна "
+"быць падзелена ў пункце <span class=\"object-name\">{2}</span>, дзе яна "
"злучаецца з лініяй <span class=\"object-name\">{3}</span>."
msgid "Split now"
@@ -33469,14 +33690,14 @@ msgid ""
"This turn restriction uses the node <span class=\"object-name\">{0}</span> "
"as member with role <tt>{1}</tt>."
msgstr ""
-"Абмежаванне на паварот выкарыстоўвае кропку <span class=\"object-"
+"Абмежаванне на паварот выкарыстоўвае пункт <span class=\"object-"
"name\">{0}</span> у якасці члена з роляй <tt>{1}</tt>."
msgid ""
"This turn restriction uses the relation <span class=\"object-"
"name\">{0}</span> as member with role <tt>{1}</tt>."
msgstr ""
-"Абмежаванне на паварот выкарыстоўвае адносіны <span class=\"object-"
+"Абмежаванне на паварот выкарыстоўвае дачыненне <span class=\"object-"
"name\">{0}</span> у якасці члена з роляй <tt>{1}</tt>."
msgid "A way is required instead."
@@ -33496,7 +33717,7 @@ msgstr "Аднавіць аб’ект па id"
msgid "Unable to undelete node {0}. Object has likely been redacted"
msgstr ""
-"Не атрымалася аднавіць кропку {0}. Аб’ект, верагодна, быў адрэдагаваны"
+"Не атрымалася аднавіць пункт {0}. Аб’ект, верагодна, быў адрэдагаваны"
msgid "Unable to undelete way {0}. Object has likely been redacted"
msgstr ""
@@ -33504,7 +33725,7 @@ msgstr ""
msgid "Unable to undelete relation {0}. Object has likely been redacted"
msgstr ""
-"Не атрымалася аднавіць адносіны {0}. Аб’ект, верагодна, быў адрэдагаваны"
+"Не атрымалася аднавіць дачыненне {0}. Аб’ект, верагодна, быў адрэдагаваны"
msgid "Undelete Object"
msgstr "Аднавіць аб’ект"
@@ -33529,47 +33750,47 @@ msgid "Close dialog and cancel"
msgstr "Зачыніць дыялог і адмяніць"
msgid "Add nodes at intersections"
-msgstr "Дадаць кропкі на скрыжаванні"
+msgstr "Дадаць пункты на скрыжаванні"
msgid "Add missing nodes at intersections of selected ways."
-msgstr "Дадаць адсутныя кропкі на скрыжаваннях выдзеленых ліній."
+msgstr "Дадаць адсутныя пункты на скрыжаваннях выдзеленых ліній."
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 "Выраўнаваць кропкі ў лініі"
+msgstr "Выраўнаваць пункты ў лініі"
msgid "The way with selected nodes can not be straightened."
-msgstr "Лінія з абранымі кропкамі не можа быць выпрастана"
+msgstr "Лінія з абранымі пунктамі не можа быць выпрастана"
msgid "Internal error: number of nodes is {0}."
-msgstr "Унутраная памылка: лік кропак = {0}."
+msgstr "Унутраная памылка: лік пунктаў = {0}."
msgid "Copy all tags of selected objects to paste buffer."
-msgstr ""
+msgstr "Капіяваць усе тэгі вылучаных аб''ектаў у буфер абмену."
msgid "Extract node"
-msgstr "Выняць кропку"
+msgstr "Выняць пункт"
msgid "Extracts node from a way"
-msgstr "Выняць кропку з лініі"
+msgstr "Выняць пункт з лініі"
msgid ""
"This tool extracts node from its ways and requires single node to be "
"selected."
msgstr ""
-"Гэты інструмент вымае кропку з лініі і патрабуе каб была абрана адна кропка."
+"Гэты інструмент вымае пункт з лініі і патрабуе каб быў абраны адзін пункт."
msgid "Extract node from line"
-msgstr "Выняць кропку з лініі"
+msgstr "Выняць пункт з лініі"
msgid "Paste Relations"
-msgstr "Уставіць адносіны"
+msgstr "Уставіць дачыненні"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
@@ -33579,7 +33800,7 @@ msgid "Split Object"
msgstr "Падзяліць аб’екты"
msgid "Split an object at the selected nodes."
-msgstr "Падзяліць аб’екты ў выдзеленых кропках."
+msgstr "Падзяліць аб’екты ў выдзеленых пунктах."
msgid "The current selection cannot be used for splitting."
msgstr "Бягучае вылучэнне немагчыма падзяліць."
@@ -33589,19 +33810,19 @@ msgstr "Вылучаная лінія не замкнёная."
msgid "The selected way does not contain the selected node."
msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Выбраная кропка не належыць выбранай лініі."
-msgstr[1] "Выбранай лініі належаць не ўсе выбраныя кропкі."
-msgstr[2] "Выбранай лініі належаць не ўсе выбраныя кропкі."
+msgstr[0] "Выбраны пункт не належыць выбранай лініі."
+msgstr[1] "Выбранай лініі належаць не ўсе выбраныя пункты."
+msgstr[2] "Выбранай лініі належаць не ўсе выбраныя пункты."
msgid ""
"The selected way is not a split way, please select split points or split way "
"too."
msgstr ""
-"Немагчыма падзяліць аб’ект па абранай лініі. Выберыце кропкі або лінію, па "
+"Немагчыма падзяліць аб’ект па абранай лініі. Выберыце пункты або лінію, па "
"якіх аб’ект можа быць разрэзаны."
msgid "The selected nodes can not be consecutive nodes in the object."
-msgstr "Выбраныя кропкі не могуць быць паслядоўнымі кропкамі ў аб’екце"
+msgstr "Выбраныя пункты не могуць быць паслядоўнымі пунктамі ў аб’екце"
msgid "Split adjacent ways"
msgstr "Падзяліць сумежныя лініі"
@@ -33613,7 +33834,7 @@ msgid ""
"There are several ways containing one of the splitting nodes. Select ways "
"participating in this operation."
msgstr ""
-"Ёсць некалькі ліній, якія змяшчаюць адну з падзяляльных кропак. Абярыце "
+"Ёсць некалькі ліній, якія змяшчаюць адну з падзяляльных пунктаў. Абярыце "
"лініі, якія ўдзельнічаюць у гэтай аперацыі."
msgid "Symmetry"
@@ -33623,7 +33844,7 @@ msgid ""
"Please select at least two nodes for symmetry axis and something else to "
"mirror."
msgstr ""
-"Калі ласка, абярыце, прынамсі, дзве кропкі для восі сіметрыі і штосьці яшчэ "
+"Калі ласка, абярыце, прынамсі, два пункты для восі сіметрыі і штосьці яшчэ "
"для адлюстравання."
msgid "Copy tags from previous selection"
@@ -33639,21 +33860,21 @@ msgid "Add remembered source tag"
msgstr "Дадаць тэг \"source=*\", запомнены з папярэдняга вылучэння"
msgid "UnGlue Relation"
-msgstr "Падзяліць Адносіны"
+msgstr "Падзяліць Дачыненне"
msgid ""
"Duplicate nodes, ways and relations that are used by multiple relations."
msgstr ""
-"Дубляваць кропкі, лініі і адносіны, якія скарыстаны ў некалькіх адносінах."
+"Дубляваць пункты, лініі і дачыненні, якія скарыстаны ў некалькіх дачыненнях."
msgid "UnGlue Relations"
-msgstr "Адлучыць адносіны"
+msgstr "Адлучыць дачыненні"
msgid "Unglued Relations"
-msgstr "Разарваныя адносіны"
+msgstr "Разарваныя дачыненні"
msgid "Change relation member for {0} {1}"
-msgstr "Замена члена адносін {0} {1}"
+msgstr "Замена члена дачынення {0} {1}"
msgid "Circle arc"
msgstr "Дуга акружнасці"
@@ -33716,7 +33937,7 @@ msgstr "Стварыць па каардынатах..."
msgid "Create geometry by entering lat lon coordinates for it."
msgstr ""
-"Стварыць геаметрыю, паказаўшы для яе каардынаты кропак (шырату і даўгату)."
+"Стварыць геаметрыю, паказаўшы для яе каардынаты пунктаў (шырату і даўгату)."
msgid ""
"Enter the coordinates for the new nodes, one for each line.<br/>If you enter "
@@ -33741,9 +33962,9 @@ msgid ""
"24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg 42' 52.13\" N, 21 "
"deg 11' 47.60\" E</li></ul>"
msgstr ""
-"Калі ласка, увядзіце каардынаты новых кропак, па адной у радку.<br/>Калі "
+"Калі ласка, увядзіце каардынаты новых пунктаў, па адной у радку.<br/>Калі "
"ўвесці два радкі з аднолькавымі каардынатамі, будуць створаны дубляваныя "
-"кропкі.<br/>У якасці падзельнікаў даўгаты і шыраты можна выкарыстоўваць "
+"пункты.<br/>У якасці падзельнікаў даўгаты і шыраты можна выкарыстоўваць "
"прабел, коску або кропку з коскай.<br/>Дадатныя лікі або сімвалы N, E "
"паказваюць паўночную шырату і ўсходнюю даўгату.<br/>Для паўднёвай шыраты і "
"заходняй даўгаты выкарыстоўваце адмоўныя лікі або сімвалы S, "
@@ -33816,18 +34037,18 @@ msgid ""
"This tool can only replace a node, upgrade a node to a way or a "
"multipolygon, or replace a way with a way."
msgstr ""
-"Гэты інструмент ў стане замяняць кропкі, абнаўляць кропку да лініі, або "
-"лінію да мультыпалігону, і замяняць лінію лініяй"
+"Гэты інструмент ў стане замяняць пункты, абнаўляць пункт да лініі, або лінію "
+"да мультыпалігону, і замяняць лінію лініяй"
msgid "Node belongs to way(s), cannot replace."
-msgstr "Кропка прыналежыць да лініі(ям), замяніць нельга."
+msgstr "Пункт прыналежыць да лініі(ям), замяніць нельга."
msgid "Replace geometry for node {0}"
-msgstr "Замяніць геаметрыю для кропкі {0}"
+msgstr "Замяніць геаметрыю для пункта {0}"
msgid "Relation is not a multipolygon, cannot be used as a replacement."
msgstr ""
-"Адносіны не з''яўляюцца мультыпалігоным і не могуць выкарыстоўвацца ў якасці "
+"Дачыненне не з''яўляецца мультыпалігоным і не можа выкарыстоўвацца ў якасці "
"замены."
msgid ""
@@ -33844,8 +34065,8 @@ msgid ""
"The way to be replaced cannot have any nodes with properties or relation "
"memberships unless they belong to both ways."
msgstr ""
-"Лінія, якая замяняецца, не можа мець кропак з тэгамі або кропак, якія "
-"з''яўляюцца членамі адносін, калі толькі яны не належаць абедзьвем гэтым "
+"Лінія, якая замяняецца, не можа мець пунктаў з тэгамі або пунктаў, якія "
+"з''яўляюцца членамі дачынення, калі толькі яны не належаць абедзьвем гэтым "
"лініям."
msgid "Exceeded iteration limit for robust method, using simpler method."
@@ -33856,20 +34077,23 @@ msgid "Replace geometry for way {0}"
msgstr "Замяніць геаметрыю для лініі {0}"
msgid "Replace Membership"
-msgstr ""
+msgstr "Замяніць удзел у дачыненні"
msgid ""
"In relations where the selected object is member of, replace it with a new "
"one"
msgstr ""
+"У дачыненнях, удзельнікам якіх быў абраны аб''ект, замяніць яго на новы"
msgid "Replaced ''{0}'' by ''{1}'' in {2} relation"
msgid_plural "Replaced ''{0}'' by ''{1}'' in {2} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Заменена ''{0}'' на ''{1}'' у {2} дачыненні"
+msgstr[1] "Заменена ''{0}'' на ''{1}'' у {2} дачыненнях"
+msgstr[2] "Заменена ''{0}'' на ''{1}'' у {2} дачыненнях"
msgid "The first selected object ''{0}'' is not part of any relation"
msgstr ""
+"Першы вылучаны аб''ект ''{0}'' не з''яўляецца часткай якога-небудзь дачынення"
msgid "Range of child primitives count"
msgstr "Колькасць нашчадкаў"
@@ -33878,22 +34102,22 @@ msgid "Range of parent primitives count"
msgstr "Дыяпазон колькасці бацькоўскіх прымітываў"
msgid "Range of referencing relation count"
-msgstr "Дыяпазон звязаных адносін"
+msgstr "Дыяпазон колькасці звязаных дачыненняў"
msgid "Range of attached ways count"
msgstr "Дыяпазон колькасці далучаных ліній"
msgid "Adjacent nodes"
-msgstr "Прылеглыя кропкі"
+msgstr "Прылеглыя пункты"
msgid "Select adjacent nodes"
-msgstr "Вылучыць прылеглыя кропкі"
+msgstr "Вылучыць прылеглыя пункты"
msgid "Adjacent ways"
msgstr "Прылеглыя лініі"
msgid "Adjacent ways will be selected. Nodes will be deselected."
-msgstr "Будуць вылучаны сумежныя лініі, а кропкі выключаны з вылучэння."
+msgstr "Будуць вылучаны сумежныя лініі, а пункты выключаны з вылучэння."
msgid "All connected ways"
msgstr "Усе злучаныя лініі"
@@ -33923,13 +34147,13 @@ 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}!"
@@ -33951,7 +34175,7 @@ msgid "Area boundary [testing]"
msgstr "Межы вобласці [тэставанне]"
msgid "Select relation or all ways that forms area boundary"
-msgstr "Выбар адносін або ўсіх ліній, якія ўтвараюць межы палігона"
+msgstr "Выбар дачынення або ўсіх ліній, якія ўтвараюць межы палігона"
msgid ""
"Nothing found. Please select way that is a part of some polygon formed by "
@@ -33970,7 +34194,7 @@ msgid "Please select one or two ways for this action"
msgstr "Для гэтага дзеяння вылучыце адну ці дзве лініі"
msgid "Select last modified nodes"
-msgstr "Нядаўна змененыя кропкі"
+msgstr "Нядаўна змененыя пункты"
msgid "Select last modified ways"
msgstr "Нядаўна змененыя лініі"
@@ -33979,7 +34203,7 @@ msgid "Select Way Nodes"
msgstr "Кропкі лініі"
msgid "Select all nodes of a selected way."
-msgstr "Выбар усіх кропак абранай лініі"
+msgstr "Выбар усіх пунктаў абранай лініі"
msgid "Undo selection"
msgstr "Адмяніць вылучэнне"
@@ -33988,10 +34212,10 @@ msgid "Reselect last added object or selection form history"
msgstr "Вылучыць зноў апошнія дададзеныя аб’екты ці вылучэнні з гісторыі"
msgid "Unselect nodes"
-msgstr "Зняць вылучэнне з кропак"
+msgstr "Зняць вылучэнне з пунктаў"
msgid "Removes all nodes from selection"
-msgstr "Прыбраць кропкі з вылучэння"
+msgstr "Прыбраць пункты з вылучэння"
msgid "Import Video"
msgstr "Імпартаваць відэа"
@@ -34155,17 +34379,16 @@ msgid ""
"download areas is selected.<br>Select a node on the start or end of a way or "
"an entire way first.</html>"
msgstr ""
-"<html>Ні кропка на лініі, ні сама лінія з канцом, якія ляжаць за "
+"<html>Ні пункт на лініі, ні сама лінія з канцом, якія ляжаць за "
"межамі<br>бягучай вобласці спампоўкі, не абраны.<br>Спачатку трэба абраць "
-"любую кропку, якая ляжыць на такой лініі.</html>"
+"любы пункт, якая ляжыць на такой лініі.</html>"
msgid "<html>Could not find a unique node to start downloading from.</html>"
msgstr ""
-"<html>Не атрымалася знайсці ўнікальную кропку, каб пачаць з яе "
-"загрузку.</html>"
+"<html>Не атрымалася знайсці ўнікальны пункт, каб пачаць з яе загрузку.</html>"
msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr "<html>Няма ліній, далучаных да кропкі ''{0}''. Адменена.</html>"
+msgstr "<html>Няма ліній, далучаных да пункта ''{0}''. Адменена.</html>"
msgid ""
"Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t "
@@ -34182,59 +34405,62 @@ msgid ""
"continue way downloading?</html>"
msgstr ""
"<html>Няма больш далучаных ліній для загрузкі з сервера.<br>Аднак быў "
-"знойдзены магчымы дублікат вылучанай кропкі.<br><br>Вылучана кропка: "
+"знойдзены магчымы дублікат вылучанага пункта.<br><br>Вылучаны пункт: "
"''{0}''.<br>А магчымы яе дублікат: ''{1}''<br>Вырабіць зліццё вылучанай "
-"кропкі з дублікатам і працягнуць спампоўку лініі з сервера?</html>"
+"пункта з дублікатам і працягнуць спампоўку лініі з сервера?</html>"
msgid "Merge duplicate node?"
-msgstr "Аб’яднаць дублікаты кропак?"
+msgstr "Аб’яднаць дублікаты пунктаў?"
msgid "<html>No more connected ways to download.</html>"
msgstr "<html>Няма больш далучаных ліній для спампоўкі з сервера.</html>"
msgid "Node ''{0}'' is a junction with more than 2 connected ways."
-msgstr "Кропка ''{0}'' гэта злучэнне больш чым 2 перасякальных ліній."
+msgstr "Пункт ''{0}'' гэта злучэнне больш чым 2 перасякальных ліній."
msgid "Enter search expression here.."
msgstr "Увядзіце дадзеныя для пошуку тут.."
msgid "Select waypoint to move map"
-msgstr "Абраць шляхавую кропку для зрушэння карты"
+msgstr "Абраць шляхавы пункт для зрушэння карты"
msgid "Waypoint search"
-msgstr "Пошук шляхавых кропак"
+msgstr "Пошук шляхавых пунктаў"
msgid "Search after waypoint. Click and move the map view to the waypoint."
msgstr ""
-"Пошук шляхавой кропкі. Перасоўвае карту на шляхавую кропку і вылучае яе."
+"Пошук шляхавага пункта. Перасоўвае карту на шляхавы пункт і вылучае яе."
msgid "Fetch Wikidata IDs"
-msgstr ""
+msgstr "Атрымаць ID Вікідадзеных"
msgid "Fetch Wikidata IDs using the ''wikipedia'' tag"
msgstr ""
+"Атрымаць ідэнтыфікатары Вікідадзеных, выкарыстоўваючы тэг ''wikipedia''"
msgid "Fetching Wikidata IDs"
-msgstr ""
+msgstr "Атрыманне ідэнтыфікатараў Вікідадзеных"
msgid "Add Wikidata"
-msgstr ""
+msgstr "Дадаць Вікідадзеныя"
msgid "No Wikidata ID found for: {0}"
-msgstr ""
+msgstr "Не знойдзены ідэнтыфікатар Вікідадзеных для: {0}"
msgid "Fetching {0} Wikidata ID for language ''{1}''"
msgid_plural "Fetching {0} Wikidata IDs for language ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Атрыманне {0} ідэнтыфікатара Вікідадзеных для мовы ''{1}''"
+msgstr[1] "Атрыманне {0} ідэнтыфікатараў Вікідадзеных для мовы ''{1}''"
+msgstr[2] "Атрыманне {0} ідэнтыфікатараў Вікідадзеных для мовы ''{1}''"
msgid "Add Wikidata for language ''{0}''"
-msgstr ""
+msgstr "Дадаць Вікідадзеныя для мовы ''{0}''"
msgid "Overwrite ''{0}'' tag {1} from {2} with new value ''{3}''?"
msgid_plural "Overwrite ''{0}'' tags {1} from {2} with new value ''{3}''?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Перазапісаць ''{0}'' тэг {1} з {2} новым значэннем ''{3}''?"
+msgstr[1] "Перазапісаць ''{0}'' тэгі {1} з {2} новым значэннем ''{3}''?"
+msgstr[2] "Перазапісаць ''{0}'' тэгаў {1} з {2} новым значэннем ''{3}''?"
msgid "Add names from Wikipedia"
msgstr "Дадаць назвы з Вікіпедыі"
@@ -34249,8 +34475,8 @@ msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
"coordinates of the first selected node"
msgstr ""
-"Капіюе ў буфер абмену шаблон {0}, падставіўшы ў яго каардынаты першай "
-"вылучанай кропкі"
+"Капіюе ў буфер абмену шаблон {0}, падставіўшы ў яго каардынаты першага "
+"вылучанага пункта"
msgid "Copy {0} template"
msgstr "Капіяваць шаблон {0}"
@@ -34327,19 +34553,3 @@ msgstr "Прыступіць да кіравання"
msgid "Drive a race car on this layer"
msgstr "Весці гоначны аўтамабіль на гэтым пласце"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "Няслушны шаблон перарывістай лініі, прынамсі, адно значэнне павінна быць > 0"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Не атрымалася выканаць разбор стыляў Mappaint з ''{0}''. Памылка: [{1}:{2}] "
-#~ "{3}"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Няслушны шаблон перарывістай лініі, значэнне павінна быць дадатным"
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index a89a25b..2148315 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2016-01-16 14:51+0000\n"
"Last-Translator: pl <Unknown>\n"
"Language-Team: Bulgarian <bg at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:37+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:37+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -154,9 +154,6 @@ msgstr "Версия Java: {0}"
msgid "Homepage"
msgstr "Сайт"
-msgid "Bug Reports"
-msgstr "Съобщаване на грешки"
-
msgid "Info"
msgstr "Данни"
@@ -178,6 +175,12 @@ msgstr "Разширения"
msgid "About JOSM..."
msgstr "За JOSM..."
+msgid "OK"
+msgstr "ОК"
+
+msgid "Report bug"
+msgstr "Докладване за грешка"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -591,9 +594,6 @@ msgstr "Коригиране на позицията на слоя с изобр
msgid "Adjust imagery offset"
msgstr "Коригиране на отместването на изображението"
-msgid "OK"
-msgstr "ОК"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1227,9 +1227,6 @@ msgstr "Също преименувай файл"
msgid "Could not rename file ''{0}''"
msgstr "Невъзможно преименуването на файла ''{0}''"
-msgid "Report bug"
-msgstr "Докладване за грешка"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Докладвайте грешката в сайта на JOSM"
@@ -1867,6 +1864,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "По-бавно възпроизвеждане"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr "Грешки при сваляне"
+
msgid "Download GPS"
msgstr "Сваляне GPS"
@@ -2018,9 +2039,6 @@ msgstr "Изтрити или преместени обекти"
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr "Грешки при сваляне"
-
msgid "Error during download"
msgstr "Грешка при сваляне"
@@ -2352,8 +2370,8 @@ msgid "Add selection to relation"
msgstr "Добавяне избраното към селекция"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3164,9 +3182,6 @@ msgstr "Разрешаване на конфликт във възлите на
msgid "Main dataset does not include node {0}"
msgstr "Главната база данни не съдържа възела {0}"
-msgid "Apply?"
-msgstr "Прилагане?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3186,27 +3201,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Релация"
-
-msgid "Old role"
-msgstr "Стара роля"
-
-msgid "New role"
-msgstr "Нова роля"
-
-msgid "Old key"
-msgstr "Стар ключ"
-
-msgid "Old value"
-msgstr "Стара стойност"
-
-msgid "New key"
-msgstr "Нов ключ"
-
-msgid "New value"
-msgstr "Нова стойност"
-
msgid "Apply selected changes"
msgstr "Приложи избраните промени"
@@ -4277,6 +4271,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4930,6 +4927,12 @@ msgstr ""
msgid "Initializing"
msgstr "Инициализиране"
+msgid "Setting defaults"
+msgstr "Настройки по подразбиране"
+
+msgid "Creating main GUI"
+msgstr "Създаване на интерфейса"
+
msgid "Updating plugins"
msgstr "Обновяване на добавките"
@@ -4939,12 +4942,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr "Зареждане на ранните разширения"
-msgid "Setting defaults"
-msgstr "Настройки по подразбиране"
-
-msgid "Creating main GUI"
-msgstr "Създаване на интерфейса"
-
msgid "Loading plugins"
msgstr "Зареждане на разширения"
@@ -5916,6 +5913,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "Прилагане?"
+
+msgid "Relation"
+msgstr "Релация"
+
+msgid "Old role"
+msgstr "Стара роля"
+
+msgid "New role"
+msgstr "Нова роля"
+
+msgid "Old key"
+msgstr "Стар ключ"
+
+msgid "Old value"
+msgstr "Стара стойност"
+
+msgid "New key"
+msgstr "Нов ключ"
+
+msgid "New value"
+msgstr "Нова стойност"
+
msgid "For selected objects only"
msgstr ""
@@ -6404,51 +6425,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "Отваряне списъка с всички заредени слоеве."
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr "Покажи/скрии"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Превключване видимостта на избрания слой."
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr "Прозрачност"
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Активиране"
-
-msgid "Activate the selected layer"
-msgstr "Активиране на избрания слой"
-
-msgid "Activate layer"
-msgstr "Активен слой"
-
-msgid "Merge this layer into another layer"
-msgstr "Обедини този слой с друг слой"
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "Копие на {0}"
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6471,12 +6447,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Преместване избрания слой един ред нагоре."
-
-msgid "Move the selected layer one row down."
-msgstr "Преместване избрания слой един ред надолу."
-
msgid "Information about layer"
msgstr "Информация за слоя"
@@ -6901,15 +6871,6 @@ msgstr "Затворен в"
msgid "Discussions"
msgstr "Дискусии"
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7015,9 +6976,6 @@ msgstr ""
msgid "Date"
msgstr "Дата"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7169,14 +7127,6 @@ msgid "Please enter an integer value > 0"
msgstr "Въведете цяло число по-голямо от нула"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7261,15 +7211,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr "URL: "
@@ -7287,6 +7228,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr "Активиране"
+
+msgid "Activate the selected layer"
+msgstr "Активиране на избрания слой"
+
+msgid "Activate layer"
+msgstr "Активен слой"
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "Копие на {0}"
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr "Прозрачност"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Обедини този слой с друг слой"
+
+msgid "Move the selected layer one row down."
+msgstr "Преместване избрания слой един ред надолу."
+
+msgid "Move the selected layer one row up."
+msgstr "Преместване избрания слой един ред нагоре."
+
+msgid "Show/hide"
+msgstr "Покажи/скрии"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Превключване видимостта на избрания слой."
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7602,10 +7612,10 @@ msgstr "Родителски релации"
msgid "Child Relations"
msgstr "Подчинени релации"
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9294,9 +9304,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -10129,12 +10136,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -12174,6 +12175,12 @@ msgstr "Настройки на връзката"
msgid "Connection Settings for the OSM server."
msgstr "Параметри на връзката с OSM сървъра."
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr "Действие"
@@ -12688,6 +12695,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13907,101 +13922,45 @@ msgid "Downloading plugin list from ''{0}''"
msgstr ""
msgid "Unsuccessful HTTP request"
-msgstr ""
-
-msgid "Plugin list download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin list:"
-msgstr ""
-
-msgid "Details:"
-msgstr ""
-
-msgid ""
-"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
-"plugin site ''{1}''."
-msgstr ""
-
-msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
-
-msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
-
-msgid ""
-"Failed to parse plugin list document from site ''{0}''. Skipping site. "
-"Exception was: {1}"
-msgstr ""
-
-msgid "Processing plugin list from site ''{0}''"
-msgstr ""
-
-msgid "This is after the end of the recording"
-msgstr "Това е след края на записа"
-
-msgid "unspecified reason"
-msgstr ""
-
-msgid "Error playing sound"
-msgstr "Грешка при възпроизвеждане на звука"
-
-msgid "Do nothing"
-msgstr "Не прави нищо"
-
-msgid "Report Bug"
-msgstr "Съобщаване за грешка"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr "Обновяване на JOSM"
+msgstr ""
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
+msgid "Plugin list download error"
msgstr ""
-msgid "Unexpected Exception"
-msgstr "Неочаквана грешка"
+msgid "JOSM failed to download plugin list:"
+msgstr ""
-msgid "Suppress further error dialogs for this session."
+msgid "Details:"
msgstr ""
msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
+msgid "Writing plugin list to local cache ''{0}''"
msgstr ""
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
+msgid "Parsing plugin list from site ''{0}''"
msgstr ""
msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
msgstr ""
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Текста вече е кипиран в буфера за обмен на данни)"
+msgid "Processing plugin list from site ''{0}''"
+msgstr ""
-msgid "You have encountered a bug in JOSM"
+msgid "This is after the end of the recording"
+msgstr "Това е след края на записа"
+
+msgid "unspecified reason"
msgstr ""
+msgid "Error playing sound"
+msgstr "Грешка при възпроизвеждане на звука"
+
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14255,9 +14214,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Не е намерен превод за локал {0}. Връщане към {1}."
@@ -14442,6 +14398,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Не прави нищо"
+
+msgid "Report Bug"
+msgstr "Съобщаване за грешка"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr "Обновяване на JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Неочаквана грешка"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Текста вече е кипиран в буфера за обмен на данни)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14780,14 +14796,14 @@ msgstr "Mapbox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Black & White)"
@@ -14795,8 +14811,14 @@ msgstr "OpenStreetMap (Mapnik Black & White)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, без етикети)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (German Style)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS Traces"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -14807,15 +14829,12 @@ msgstr "Public Transport (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (German Style)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -14912,6 +14931,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -14936,14 +14958,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Terrain model)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr ""
@@ -15089,10 +15111,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15147,6 +15169,15 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr ""
@@ -15162,16 +15193,6 @@ msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr ""
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr ""
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15217,6 +15238,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15277,6 +15301,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15313,11 +15340,8 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Railway"
@@ -15418,6 +15442,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15427,6 +15454,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16087,6 +16117,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17454,6 +17489,12 @@ msgstr "Автомобилни"
msgid "Motorway"
msgstr "Магистрала"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -18030,9 +18071,6 @@ msgstr "Магистрален възел"
msgid "Number"
msgstr "Номер"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Услуги"
@@ -18511,6 +18549,15 @@ msgstr "приливно-отливно крайбрежие"
msgid "mangrove"
msgstr "мангрова гора"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Кал"
@@ -19659,6 +19706,9 @@ msgstr ""
msgid "Fishing"
msgstr "Риболов"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Нощен клуб"
@@ -20927,6 +20977,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22514,8 +22568,8 @@ msgstr "торби за екскременти"
msgid "food"
msgstr "храна"
-msgid "news_papers"
-msgstr "вестници"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "билети за паркиране"
@@ -22529,8 +22583,8 @@ msgstr "карта на обществен транспорт"
msgid "public_transport_tickets"
msgstr "билети за обществен транспорт"
-msgid "SIM-cards"
-msgstr "SIM-карти"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "пощенски марки"
@@ -23786,6 +23840,21 @@ msgstr "природа"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23810,9 +23879,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23972,8 +24038,14 @@ msgstr "Къмпинг"
msgid "Test"
msgstr "Тест"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Намаляващи номера на къщи в интерполацията на адреси"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} без {1}"
@@ -24056,6 +24128,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24154,6 +24231,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24163,6 +24243,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "съкратено име на улица"
@@ -27290,6 +27378,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29633,6 +29781,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30422,9 +30579,6 @@ msgstr "Разделяне на сграда"
msgid "Creates individual buildings from a long building."
msgstr "Създава няколко отделни сгради от една голяма такава."
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -32159,6 +32313,3 @@ msgstr ""
msgid "Drive a race car on this layer"
msgstr ""
-
-#~ msgid "xml"
-#~ msgstr "xml"
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index f926057..a9d2ba2 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:36+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:36+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr "হোমপেজ"
-msgid "Bug Reports"
-msgstr "প্রোগ্রাম ত্রুটি প্রতিবেদন"
-
msgid "Info"
msgstr "তথ্য"
@@ -172,6 +169,12 @@ msgstr "প্লাগ-ইন"
msgid "About JOSM..."
msgstr "JOSMএর সম্বন্ধে।"
+msgid "OK"
+msgstr "ঠিক আছে"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -577,9 +580,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "ঠিক আছে"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1169,9 +1169,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1781,6 +1778,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1930,9 +1951,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2248,8 +2266,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3030,9 +3048,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3052,27 +3067,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4130,6 +4124,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4775,6 +4772,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "প্রধান জিইউআই তৈরি করছে"
+
msgid "Updating plugins"
msgstr ""
@@ -4784,12 +4787,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "প্রধান জিইউআই তৈরি করছে"
-
msgid "Loading plugins"
msgstr ""
@@ -5760,6 +5757,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6247,51 +6268,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6314,12 +6290,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6742,15 +6712,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6856,9 +6817,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7010,14 +6968,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7102,15 +7052,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7128,6 +7069,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7443,10 +7453,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9102,9 +9112,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9907,12 +9914,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11920,6 +11921,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12430,6 +12437,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13671,62 +13686,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13978,9 +13937,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14165,6 +14121,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14499,13 +14515,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14514,7 +14530,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14526,15 +14548,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14631,6 +14650,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14655,13 +14677,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14808,10 +14830,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14864,29 +14886,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14934,6 +14955,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14994,6 +15018,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15030,10 +15057,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15135,6 +15159,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15144,6 +15171,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15799,6 +15829,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17156,6 +17191,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17732,9 +17773,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18213,6 +18251,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19361,6 +19408,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20629,6 +20679,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22216,7 +22270,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22231,7 +22285,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23486,6 +23540,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23510,9 +23579,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23672,7 +23738,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23756,6 +23828,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23854,6 +23931,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23863,6 +23943,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26962,6 +27050,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29283,6 +29431,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30067,9 +30224,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 8773ec5..b4f1f6d 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:37+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:37+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: br\n"
msgid "License"
@@ -151,9 +151,6 @@ msgstr "Stumm Java {0}"
msgid "Homepage"
msgstr "Degemer"
-msgid "Bug Reports"
-msgstr "Kemenn un draen"
-
msgid "Info"
msgstr "Titouroù"
@@ -172,6 +169,12 @@ msgstr "Adveziantoù"
msgid "About JOSM..."
msgstr "Diwar-benn JOSM"
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,6 +4769,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "O krouiñ GUI pennañ"
+
msgid "Updating plugins"
msgstr ""
@@ -4781,12 +4784,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "O krouiñ GUI pennañ"
-
msgid "Loading plugins"
msgstr ""
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index eeadea6..65b11ed 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:36+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:36+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -149,9 +149,6 @@ msgstr "Java Verzija {0}"
msgid "Homepage"
msgstr "Početna stranica"
-msgid "Bug Reports"
-msgstr "Izvještaj o greškama"
-
msgid "Info"
msgstr "Info"
@@ -173,6 +170,12 @@ msgstr "Priključci"
msgid "About JOSM..."
msgstr "O JOSM-u..."
+msgid "OK"
+msgstr "U redu"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -577,9 +580,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "U redu"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1169,9 +1169,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1781,6 +1778,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1930,9 +1951,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2248,8 +2266,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3030,9 +3048,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3052,27 +3067,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4130,6 +4124,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4775,19 +4772,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5760,6 +5757,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6247,51 +6268,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6314,12 +6290,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6742,15 +6712,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6856,9 +6817,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7010,14 +6968,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7102,15 +7052,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7128,6 +7069,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7443,10 +7453,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9102,9 +9112,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9907,12 +9914,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11920,6 +11921,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12430,6 +12437,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13671,62 +13686,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13978,9 +13937,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14165,6 +14121,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14499,13 +14515,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14514,7 +14530,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14526,15 +14548,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14631,6 +14650,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14655,13 +14677,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14808,10 +14830,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14864,29 +14886,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14934,6 +14955,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14994,6 +15018,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15030,10 +15057,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15135,6 +15159,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15144,6 +15171,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15799,6 +15829,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17156,6 +17191,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17732,9 +17773,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18213,6 +18251,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19361,6 +19408,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20629,6 +20679,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22216,7 +22270,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22231,7 +22285,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23486,6 +23540,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23510,9 +23579,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23672,7 +23738,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23756,6 +23828,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23854,6 +23931,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23863,6 +23943,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26962,6 +27050,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29283,6 +29431,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30067,9 +30224,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 67049bf..f59ab95 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-02-25 13:56+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-05 12:55+0000\n"
"Last-Translator: pitort <pitort at eclipso.eu>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:38+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:38+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -98,7 +98,7 @@ msgid "Updating user interface"
msgstr "S''està actualitzant la interfície d''usuari/a"
msgid "Failed to save default preferences."
-msgstr ""
+msgstr "Ha fallat l''enregistrament de les preferències per defecte."
msgid "Ignoring malformed URL: \"{0}\""
msgstr "S''està ignorant l''adreça URL malformada: \"{0}\""
@@ -154,9 +154,6 @@ msgstr "Versió de Java {0}"
msgid "Homepage"
msgstr "Pàgina d''inici"
-msgid "Bug Reports"
-msgstr "Informes d''errors"
-
msgid "Info"
msgstr "Informació"
@@ -178,6 +175,12 @@ msgstr "Connectors"
msgid "About JOSM..."
msgstr "Quant al JOSM..."
+msgid "OK"
+msgstr "D’acord"
+
+msgid "Report bug"
+msgstr "Informa d''un error"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Ha fallat la localització del recurs ''{0}''."
@@ -606,9 +609,6 @@ msgstr "Ajusta la posició d''aquesta capa d''imatge"
msgid "Adjust imagery offset"
msgstr "Ajusta el desplaçament de la imatge"
-msgid "OK"
-msgstr "D’acord"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1273,9 +1273,6 @@ msgstr "Canvia també el nom del fitxer"
msgid "Could not rename file ''{0}''"
msgstr "No s''ha pogut canviar el nom del fitxer ''{0}''"
-msgid "Report bug"
-msgstr "Informa d''un error"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Informa d''un problema al sistema de de seguiment d''errors del JOSM"
@@ -1940,6 +1937,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avança a poc a poc"
+msgid "Downloading changeset content"
+msgstr "Baixant el contingut del conjunt de canvis"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Baixant el conjunt de canvis {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Baixant el contingut del conjunt de canvis {2}..."
+
+msgid "Download changesets"
+msgstr "Baixar els conjunts de canvis"
+
+msgid "Querying and downloading changesets"
+msgstr "Consultant i baixant conjunts de canvis"
+
+msgid "Determine user id for current user..."
+msgstr "Determinar l''ID de l''usuari actual..."
+
+msgid "Query and download changesets ..."
+msgstr "Consultar i baixar conjunts de canvis ..."
+
+msgid "Errors during download"
+msgstr "Errors durant la baixada"
+
msgid "Download GPS"
msgstr "Baixa del GPS"
@@ -2106,9 +2127,6 @@ msgstr "Objectes esborrats o moguts"
msgid "The following errors occurred during mass download: {0}"
msgstr "Els errors següents han aparegut durant la baixada massiva: {0}"
-msgid "Errors during download"
-msgstr "Errors durant la baixada"
-
msgid "Error during download"
msgstr "Error durant la baixada"
@@ -2467,8 +2485,8 @@ msgid "Add selection to relation"
msgstr "Afegeix la selecció a la relació"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3305,9 +3323,6 @@ msgstr "Resoldre els conflictes de la llista de nodes de la via {0}"
msgid "Main dataset does not include node {0}"
msgstr "El conjunt de dades principal no conté el node {0}"
-msgid "Apply?"
-msgstr "Aplicar?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3337,27 +3352,6 @@ msgstr ""
"Quan a la reversió d''aquesta via, hom suggereix els següents canvis per tal "
"de conservar la consistència de les dades."
-msgid "Relation"
-msgstr "Relació"
-
-msgid "Old role"
-msgstr "Vell rol"
-
-msgid "New role"
-msgstr "Nou rol"
-
-msgid "Old key"
-msgstr "Clau vella"
-
-msgid "Old value"
-msgstr "Valor vell"
-
-msgid "New key"
-msgstr "Nova clau"
-
-msgid "New value"
-msgstr "Nou valor"
-
msgid "Apply selected changes"
msgstr "Aplicar els canvis seleccionats"
@@ -3874,10 +3868,10 @@ msgid "areatext"
msgstr "àrea de text"
msgid "Expected element ''{0}'', but got ''{1}''"
-msgstr ""
+msgstr "S''esperava l''element ''{0}'', però s''ha obtingut ''{1}''"
msgid "value expected"
-msgstr ""
+msgstr "valor esperat"
msgid " (at line {0}, column {1})"
msgstr " (a la línia {0}, columna {1})"
@@ -3891,7 +3885,7 @@ msgstr ""
"S''esperava un valor sencer entre 1 i 60 per al paràmetre ''+zone=...''."
msgid "No unit found for: {0}"
-msgstr ""
+msgstr "No s''ha trobat unitat per: {0}"
msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
msgstr "El paràmetre ha de començar amb el caràcter ''+'' (trobat ''{0}''"
@@ -3980,16 +3974,16 @@ msgid "Parameter ''{0}'' required."
msgstr "Paràmetre ''{0}'' requirit."
msgid "standard parallels are opposite"
-msgstr ""
+msgstr "els paral·lels estàndards són oposats"
msgid "Cassini-Soldner"
-msgstr ""
+msgstr "Cassini-Soldner"
msgid "Double Stereographic"
msgstr "Azimutal estereogràfica doble"
msgid "Lambert Azimuthal Equal Area"
-msgstr ""
+msgstr "Azimutal equivalent"
msgid "Lambert Conformal Conic"
msgstr "Cònica conforme de Lambert"
@@ -4001,16 +3995,16 @@ msgid "Mercator"
msgstr "Mercator"
msgid "Oblique Mercator"
-msgstr ""
+msgstr "Mercator obliqua"
msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
msgstr ""
msgid "Illegal value for parameter ''{0}'': {1}"
-msgstr ""
+msgstr "Valor no permès per al paràmetre ''{0}'': {1}"
msgid "error in initialization"
-msgstr ""
+msgstr "error a la inicialització"
msgid "Polar Stereographic"
msgstr "Estereogràfica polar"
@@ -4019,7 +4013,7 @@ msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
msgstr "Estereogràfica polar: el paràmetre ''{0}'' ha de ser 90 o -90."
msgid "Sinusoidal"
-msgstr ""
+msgstr "Sinusoïdal"
msgid "Swiss Oblique Mercator"
msgstr "Mercator oblíqua suïssa"
@@ -4057,7 +4051,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "L''adreça de correu electrònic conté un domini incorrecte: {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Validador d''email"
msgid "URL is invalid"
msgstr "l''URL no és vàlida"
@@ -4078,7 +4072,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "l''URL conté un fragment que no és vàlid: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "Validador d''URL"
msgid "Addresses"
msgstr "Adreces"
@@ -4527,11 +4521,14 @@ msgid "Public Transport Route"
msgstr "Ruta de transport públic"
msgid "Route relation contains a ''{0}'' role"
-msgstr ""
+msgstr "La relació de ruta conté un rol ''{0}''"
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problema de verificació del rol"
@@ -4648,7 +4645,7 @@ msgid "Property values start or end with white space"
msgstr "Els valors comencen o acaben amb un espai en blanc"
msgid "Property values contain multiple white spaces"
-msgstr ""
+msgstr "Els valors de la propietat cotenen múltiples espais o blancs"
msgid "Property values contain HTML entity"
msgstr "Els valors contenen codi HTML"
@@ -5209,6 +5206,12 @@ msgstr "Activat el nivell de depuració detallat (traça)"
msgid "Initializing"
msgstr "S''està inicialitzant"
+msgid "Setting defaults"
+msgstr "Ajustant els valors per defecte"
+
+msgid "Creating main GUI"
+msgstr "S''està creant la interfície principal"
+
msgid "Updating plugins"
msgstr "Actualitzant els connectors"
@@ -5218,12 +5221,6 @@ msgstr "Instal·lant els connectors actualitzats"
msgid "Loading early plugins"
msgstr "Carregant els primers connectors"
-msgid "Setting defaults"
-msgstr "Ajustant els valors per defecte"
-
-msgid "Creating main GUI"
-msgstr "S''està creant la interfície principal"
-
msgid "Loading plugins"
msgstr "Carregant connectors"
@@ -6314,6 +6311,30 @@ msgstr "Mostra només els conflictes d''etiquetes"
msgid "Show tags with multiple values only"
msgstr "Mostra només les etiquetes amb varis valors"
+msgid "Apply?"
+msgstr "Aplicar?"
+
+msgid "Relation"
+msgstr "Relació"
+
+msgid "Old role"
+msgstr "Vell rol"
+
+msgid "New role"
+msgstr "Nou rol"
+
+msgid "Old key"
+msgstr "Clau vella"
+
+msgid "Old value"
+msgstr "Valor vell"
+
+msgid "New key"
+msgstr "Nova clau"
+
+msgid "New value"
+msgstr "Nou valor"
+
msgid "For selected objects only"
msgstr "Només pels objectes seleccionats"
@@ -6851,51 +6872,6 @@ msgstr "Commuta la visibilitat de la capa: {0}"
msgid "Open a list of all loaded layers."
msgstr "Mostrar una llista amb les capes carregades"
-msgid "Delete the selected layers."
-msgstr "Esborrar les capes seleccionades"
-
-msgid "Show/hide"
-msgstr "Amagar/ Mostrar"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Commuta l''estat visible de la capa seleccionada."
-
-msgid "Show/hide layer"
-msgstr "Mostra/amaga la capa"
-
-msgid "Opacity"
-msgstr "Opacitat"
-
-msgid "Adjust opacity of the layer."
-msgstr "Ajustar l''opacitat de la capa"
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Ajusta el valor de la gamma a la capa"
-
-msgid "Activate"
-msgstr "Activa"
-
-msgid "Activate the selected layer"
-msgstr "Activar la capa seleccionada"
-
-msgid "Activate layer"
-msgstr "Activar la capa"
-
-msgid "Merge this layer into another layer"
-msgstr "Fusiona aquesta capa amb una altra"
-
-msgid "Duplicate this layer"
-msgstr "Duplica la capa"
-
-msgid "Copy of {0}"
-msgstr "Copia {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copia {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "la capa és visible (cliqueu per amagar-la)"
@@ -6919,12 +6895,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Moure la capa seleccionada una fila amunt"
-
-msgid "Move the selected layer one row down."
-msgstr "Moure la capa seleccionada avall"
-
msgid "Information about layer"
msgstr "Informació sobre la capa"
@@ -7367,15 +7337,6 @@ msgstr "Tancat el"
msgid "Discussions"
msgstr "Discussions"
-msgid "Downloading changeset content"
-msgstr "Baixant el contingut del conjunt de canvis"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Baixant el conjunt de canvis {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Baixant el contingut del conjunt de canvis {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7396,7 +7357,7 @@ msgid "Download objects"
msgstr "Baixar objectes"
msgid "Download the current version of the selected objects"
-msgstr ""
+msgstr "Descarrega la versió actual dels objectes seleccionats"
msgid "Select in layer"
msgstr "Seleccionar a la capa"
@@ -7493,9 +7454,6 @@ msgstr "Actualitza la discussió del conjunt de canvis des del servidor OSM"
msgid "Date"
msgstr "Data"
-msgid "Download changesets"
-msgstr "Baixar els conjunts de canvis"
-
msgid "{0} [incomplete]"
msgstr "{0} [incomplet]"
@@ -7668,16 +7626,6 @@ msgid "Please enter an integer value > 0"
msgstr "Indiqueu un valor enter més gran que 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>El valor actual no és un nom d''usuari vàlid.<br>Si us plau, "
-"indiqueuun nom d''usuari"
-
-msgid "Please enter an non-empty user name"
-msgstr "Si us plau entreu un nom d''usuari"
-
-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 ""
@@ -7782,15 +7730,6 @@ msgstr "Consulta de URL de conjunts de canvis incorecta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Tancar la finestra i anular la consulta de conjunts de canvis"
-msgid "Querying and downloading changesets"
-msgstr "Consultant i baixant conjunts de canvis"
-
-msgid "Determine user id for current user..."
-msgstr "Determinar l''ID de l''usuari actual..."
-
-msgid "Query and download changesets ..."
-msgstr "Consultar i baixar conjunts de canvis ..."
-
msgid "URL: "
msgstr "Adreça URL: "
@@ -7812,6 +7751,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Aquesta URL de consulta de conjunts de canvis no és vàlida"
+msgid "Activate"
+msgstr "Activa"
+
+msgid "Activate the selected layer"
+msgstr "Activar la capa seleccionada"
+
+msgid "Activate layer"
+msgstr "Activar la capa"
+
+msgid "Delete the selected layers."
+msgstr "Esborrar les capes seleccionades"
+
+msgid "Duplicate this layer"
+msgstr "Duplica la capa"
+
+msgid "Copy of {0}"
+msgstr "Copia {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copia {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr "Mostra capa"
+
+msgid "Adjust opacity of the layer."
+msgstr "Ajustar l''opacitat de la capa"
+
+msgid "Opacity"
+msgstr "Opacitat"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Ajusta el valor de la gamma a la capa"
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Fusiona aquesta capa amb una altra"
+
+msgid "Move the selected layer one row down."
+msgstr "Moure la capa seleccionada avall"
+
+msgid "Move the selected layer one row up."
+msgstr "Moure la capa seleccionada una fila amunt"
+
+msgid "Show/hide"
+msgstr "Amagar/ Mostrar"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Commuta l''estat visible de la capa seleccionada."
+
+msgid "Show/hide layer"
+msgstr "Mostra/amaga la capa"
+
msgid "Discardable key: selection Foreground"
msgstr "Clau descartable: selecció en primer pla"
@@ -7892,7 +7900,7 @@ msgid "Edit Tags"
msgstr "Modifica les etiquetes"
msgid "Go to OSM wiki for tag help"
-msgstr ""
+msgstr "Vés al wiki d''OSM per veure l''ajuda de l''etiqueta"
msgid "Launch browser with wiki help for selected object"
msgstr ""
@@ -8016,7 +8024,7 @@ msgid "Refresh recent tags list after applying tag"
msgstr ""
msgid "No refresh"
-msgstr ""
+msgstr "Sense refresc"
msgid "Refresh tag status only (enabled / disabled)"
msgstr ""
@@ -8057,10 +8065,10 @@ msgid "The key ''{0}'' is already used"
msgstr "La clau ''{0}'' ja ha estat utilitzada"
msgid "Ignore key ''{0}''"
-msgstr ""
+msgstr "Ignora la clau ''{0}''"
msgid "Ignore tag ''{0}''"
-msgstr ""
+msgstr "Ignora l''etiqueta ''{0}''"
msgid "Edit ignore list"
msgstr ""
@@ -8140,12 +8148,12 @@ msgstr "Relacions de parentiu"
msgid "Child Relations"
msgstr "Relacions filles"
-msgid "Apply Role:"
-msgstr "Aplicar rol:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Entrar un rol i aplicar-ho al membres de la relació seleccionada"
+msgid "Apply Role:"
+msgstr "Aplicar rol:"
+
msgid "New Relation"
msgstr "Relació nova"
@@ -8348,16 +8356,16 @@ msgstr ""
"presents a la capa actual"
msgid "Relation Editor: Refresh"
-msgstr ""
+msgstr "Editor de relacions: Refresca"
msgid "Refresh relation from data layer"
-msgstr ""
+msgstr "Refresca la realció a partir de la capa de dades"
msgid "Refresh"
msgstr "Actualitza"
msgid "Yes, discard changes and reload"
-msgstr ""
+msgstr "Si, descarta els canvis i recarrega"
msgid "Click to discard the changes and reload data from layer"
msgstr ""
@@ -10029,9 +10037,6 @@ msgstr "Degradació de la imatgeria"
msgid "Unsupported imagery type: {0}"
msgstr "Tipus d''imatgeria no suportat: {0}"
-msgid "ERROR"
-msgstr "ERROR"
-
msgid "Next marker"
msgstr "Marcador següent"
@@ -10937,13 +10942,6 @@ msgstr "Tornar a executar la seqüència d''autorització"
msgid "Test Access Token"
msgstr "Provar el testimoni d''autenticació"
-msgid "Please enter your OSM user name"
-msgstr "Introduïu el vostre nom d''usuari OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"El nom d''usuari no pot estar buit. Introduïu el vostre nom d''usuari OSM"
-
msgid "Please enter your OSM password"
msgstr "Introduïu la vostra contrasenya OSM"
@@ -13211,6 +13209,13 @@ msgstr "Paràmetres de la connexió"
msgid "Connection Settings for the OSM server."
msgstr "Configuració de la connexió amb el servidor OSM"
+msgid "Please enter your OSM user name"
+msgstr "Introduïu el vostre nom d''usuari OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"El nom d''usuari no pot estar buit. Introduïu el vostre nom d''usuari OSM"
+
msgid "Action"
msgstr "Acció"
@@ -13773,6 +13778,14 @@ msgstr ""
"Valor invàlid per l''atribut ''{0}'' de l''element ''{1}'' a les capacitats "
"del serevidor. El valor és ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Afegint certificat per a les connexions TLS: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
"Ha fallat l''anàlisi de les dades ''{0}'' rebudes com a resposta del "
@@ -15189,79 +15202,6 @@ msgstr "raó no especificada"
msgid "Error playing sound"
msgstr "Error reproduïnt so"
-msgid "Do nothing"
-msgstr "No facis res"
-
-msgid "Report Bug"
-msgstr "Informa d''un error"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Ha hagut una excepció no esperada.<br>Això sempre és a causa d''un error al "
-"codi del programa. Si esteu utilitzant<br>la darrera versió del JOSM, si us "
-"plau, considereu l''opció d''omplir un informe d''error."
-
-msgid "Update JOSM"
-msgstr "Actualitza JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Ha hagut una excepció inesperada. Això sempre és a causa d''un error de "
-"codificació.<br><br>No obstant això, esteu utilitzant una versió antiga del "
-"JOSM ({0}),<br>en comptes d''utilitzar la versió actual "
-"verificada(<b>{1}</b>).<br><br><b>Actualitzeu el JOSM</b> abans de "
-"considerar de reportar un error."
-
-msgid "Unexpected Exception"
-msgstr "Excepció no esperada"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "No tornar a mostrar la finestra d''error durant aquesta sessió."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Heu trobat un error a JOSM. Abans d''emplenar el formulari per reportar "
-"l''error assegureu-vos que heu actualitzat JOSM a la darrera versió aquí:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Hauríeu d''actualitzar també els vostres connectors. Si el problema "
-"persisteix, ompliu un informe d''error al nostre lloc web:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"La informació sobre el problema que hi ha a sota ja ha estat inclosa. Si us "
-"plau, afegiu informació sobre la manera de reproduir el problema i aporteu "
-"el màxim possible de detalls."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Alternativament, si no funciona, podeu omplir manualment la informació en "
-"aquesta adreça URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(El text ja ha estat copiat al vostre portaretalls.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Heu trobat un error dins JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15636,9 +15576,6 @@ msgstr "La baixada ha estat redirigida vers ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Massa redireccions vers l''URL baixada. Anul·lant."
-msgid "Fetching content..."
-msgstr "Recopilant el contigut ..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"No ha estat possible de trobar una traducció a la llengua {0}. Revertint a "
@@ -15861,6 +15798,83 @@ msgstr "Ignorant la geometria malformada: {0}"
msgid "Failed to load XML schema."
msgstr "Ha fallat la càrrega de l''esquema XML"
+msgid "Do nothing"
+msgstr "No facis res"
+
+msgid "Report Bug"
+msgstr "Informa d''un error"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Ha hagut una excepció no esperada.<br>Això sempre és a causa d''un error al "
+"codi del programa. Si esteu utilitzant<br>la darrera versió del JOSM, si us "
+"plau, considereu l''opció d''omplir un informe d''error."
+
+msgid "Update JOSM"
+msgstr "Actualitza JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Ha hagut una excepció inesperada. Això sempre és a causa d''un error de "
+"codificació.<br><br>No obstant això, esteu utilitzant una versió antiga del "
+"JOSM ({0}),<br>en comptes d''utilitzar la versió actual "
+"verificada(<b>{1}</b>).<br><br><b>Actualitzeu el JOSM</b> abans de "
+"considerar de reportar un error."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "No tornar a mostrar la finestra d''error durant aquesta sessió."
+
+msgid "Unexpected Exception"
+msgstr "Excepció no esperada"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Heu trobat un error dins JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Heu trobat un error a JOSM. Abans d''emplenar el formulari per reportar "
+"l''error assegureu-vos que heu actualitzat JOSM a la darrera versió aquí:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Hauríeu d''actualitzar també els vostres connectors. Si el problema "
+"persisteix, ompliu un informe d''error al nostre lloc web:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"La informació sobre el problema que hi ha a sota ja ha estat inclosa. Si us "
+"plau, afegiu informació sobre la manera de reproduir el problema i aporteu "
+"el màxim possible de detalls."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Alternativament, si no funciona, podeu omplir manualment la informació en "
+"aquesta adreça URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(El text ja ha estat copiat al vostre portaretalls.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16209,14 +16223,14 @@ msgstr "Mapbox Satèl·lit"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap Tracks GPS"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (capa estàndard)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Blanc i negre)"
@@ -16224,8 +16238,14 @@ msgstr "OpenStreetMap (Mapnik Blanc i negre)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sense etiquetes)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (Estil francès)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Estil alemany)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap Tracks GPS"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16236,15 +16256,12 @@ msgstr "Transport públic (ÖPNV)"
msgid "Hike & Bike"
msgstr "A peu i en bici"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Estil alemany)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodja, Laos, Tailàndia, Vietnam (bilingüe)"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (supersposició)"
@@ -16341,6 +16358,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Ortofoto"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mapa base)"
@@ -16365,14 +16385,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Model del terreny)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Model de superfície)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "Imatgeria aèria AGIV(laanderen) (cobreix la regió de Brussel·les)"
@@ -16518,10 +16538,10 @@ msgstr "Géolittoral V2 - Orthofotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16576,6 +16596,15 @@ msgstr "Baviera (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Baviera(2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Berlin fotografia aèria 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Berlin fotografia aèria 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Berlin fotografia aèria 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (imatgeria aèria)"
@@ -16592,18 +16621,6 @@ msgstr ""
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Mapa antic de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Mapa físic (regions naturals)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Mapa físic (regions naturals)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Capa de superposició per a Bing (p.ex. ús amb una "
-"opacitat entre el 20% i el 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16649,6 +16666,9 @@ msgstr "Törökbálint ortofoto 2013"
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr "Törökbálint ortofoto 2015"
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16709,6 +16729,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Itàlia"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardia - Itàlia (CTR DBT)"
@@ -16745,11 +16768,8 @@ msgstr "1.cikla ortofotokarte - Letònia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lituània)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxemburg Inspire Orto 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxemburg Inspire Orto 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxemburg Inspire Ferrocarrils"
@@ -16850,6 +16870,9 @@ msgstr "Powiat poznański: Budynki (edificacions)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (imatgeria aèria)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (edificacions)"
@@ -16859,6 +16882,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (imatgeria aèria)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (edificacions)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (edificacions)"
@@ -17564,6 +17590,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -19011,6 +19042,12 @@ msgstr "Carrers"
msgid "Motorway"
msgstr "Autopista"
+msgid "Destination"
+msgstr "Destinació"
+
+msgid "Destination reference"
+msgstr "Referència destinació"
+
msgid "Placement"
msgstr "Emplaçament"
@@ -19606,9 +19643,6 @@ msgstr "Sortida de l''autopista/autovia"
msgid "Number"
msgstr "Nombre"
-msgid "Exit to"
-msgstr "Surt per"
-
msgid "Services"
msgstr "Àrea de servei"
@@ -20093,6 +20127,15 @@ msgstr "plana de marea"
msgid "mangrove"
msgstr "manglar"
+msgid "wet_meadow"
+msgstr "prat humit"
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Fangar"
@@ -21249,6 +21292,9 @@ msgstr "Foguera"
msgid "Fishing"
msgstr "Pesca"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Discoteca"
@@ -22517,6 +22563,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Nivells"
@@ -24106,8 +24156,8 @@ msgstr "bosses per excrements"
msgid "food"
msgstr "menjar"
-msgid "news_papers"
-msgstr "diaris"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parquimetre"
@@ -24121,8 +24171,8 @@ msgstr "plànols_transport_public"
msgid "public_transport_tickets"
msgstr "bitllets_transport_public"
-msgid "SIM-cards"
-msgstr "targetes-SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "segells"
@@ -25397,6 +25447,21 @@ msgstr "natural"
msgid "Walking Route"
msgstr "Ruta per a vianants"
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Pista"
@@ -25421,9 +25486,6 @@ msgstr "alpí"
msgid "Detour Route"
msgstr "Desviació de ruta"
-msgid "Destination"
-msgstr "Destinació"
-
msgid "Ref of the way this is a detour to"
msgstr "Referència de la via de la qual aquesta n''és una desviació"
@@ -25583,8 +25645,14 @@ msgstr "Càmping"
msgid "Test"
msgstr "Prova"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Nombres de carrer decreixents en interpolació d''adreces"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} sense {1}"
@@ -25675,6 +25743,11 @@ msgstr ""
"Utilització incorrecta de l''etiqueta {0}. Suprimiu {1}, perquè és evident "
"que manca el nom, fins i tot sense una altra etiqueta."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
"{0} és obsolet. Si us plau utilitzeu un multipolígon com a alternativa."
@@ -25783,6 +25856,9 @@ msgstr "{0} ha d''estar connectat amb una via"
msgid "node connects waterway and bridge"
msgstr "el node connecta un curs d''aigua i un pont"
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr "direcció sospitosa a la rotonda"
@@ -25792,6 +25868,14 @@ msgstr "{0} a una àrea gran"
msgid "{0} on a small area"
msgstr "{0} a una àrea petita"
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nom abreviat del carrer"
@@ -29230,6 +29314,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -31701,6 +31845,15 @@ msgstr "Transport públic: activar fites"
msgid "Public Transport: Edit waypoint name"
msgstr "Transport públic: modificar el nom d''una fita"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Selecció no vàlida"
+
msgid "Public transport routes"
msgstr "Itinerari de transport públic"
@@ -32535,9 +32688,6 @@ msgstr "Divideix un edifici vers cases en filera"
msgid "Creates individual buildings from a long building."
msgstr "Crear edificis individuals a partir d''un gran edifici."
-msgid "Invalid selection"
-msgstr "Selecció no vàlida"
-
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 "
@@ -34508,20 +34658,3 @@ msgstr "Anar en cotxe"
msgid "Drive a race car on this layer"
msgstr "Conduir un cotxe de carreres sobre aquesta capa"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "L''estil de traçat no és válid, com a mínim un dels valors ha de ser més "
-#~ "gran que zero"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "L''estil de traçat no és válid, els valors han de ser positius"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Ha fallat l''anàlisi dels estils de Mappaint desde ''{0}''. L''excepció ha "
-#~ "estat: [{1}:{2}] {3}"
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 22f9518..e03045a 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:15+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:13+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -150,9 +150,6 @@ msgstr "Versió de Java {0}"
msgid "Homepage"
msgstr "Pàgina d''inici"
-msgid "Bug Reports"
-msgstr "Informes d''errors"
-
msgid "Info"
msgstr "Informació"
@@ -174,6 +171,12 @@ msgstr "Connectors"
msgid "About JOSM..."
msgstr "Quant al JOSM..."
+msgid "OK"
+msgstr "D’acord"
+
+msgid "Report bug"
+msgstr "Informa d''un error"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -593,9 +596,6 @@ msgstr "Ajusta la posició d''esta capa d''imatge"
msgid "Adjust imagery offset"
msgstr "Ajusta el desplaçament de la imatge"
-msgid "OK"
-msgstr "D’acord"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1258,9 +1258,6 @@ msgstr "Canvia també el nom del fitxer"
msgid "Could not rename file ''{0}''"
msgstr "No s''ha pogut canviar el nom del fitxer ''{0}''"
-msgid "Report bug"
-msgstr "Informa d''un error"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1924,6 +1921,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avança a poc a poc"
+msgid "Downloading changeset content"
+msgstr "Descarregant el contingut del conjunt de canvis"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Descarregant el conjunt de canvis {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Descarregant el contingut del conjunt de canvis {2}..."
+
+msgid "Download changesets"
+msgstr "Descarregar els conjunts de canvis"
+
+msgid "Querying and downloading changesets"
+msgstr "Consultant i descarregant conjunts de canvis"
+
+msgid "Determine user id for current user..."
+msgstr "Determinar l''ID de l''usuari actual..."
+
+msgid "Query and download changesets ..."
+msgstr "Consultar i descarregar conjunts de canvis ..."
+
+msgid "Errors during download"
+msgstr "Errors durant la descàrrega"
+
msgid "Download GPS"
msgstr "Descarrega GPS"
@@ -2087,9 +2108,6 @@ msgstr "Objectes esborrats o moguts"
msgid "The following errors occurred during mass download: {0}"
msgstr "Els errors següents han aparegut durant la descàrrega massiva: {0}"
-msgid "Errors during download"
-msgstr "Errors durant la descàrrega"
-
msgid "Error during download"
msgstr "Error durant la descàrrega"
@@ -2436,8 +2454,8 @@ msgid "Add selection to relation"
msgstr "Afig la selecció a la relació"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3266,9 +3284,6 @@ msgstr "Resoldre els conflictes de la llista de nodes de la via {0}"
msgid "Main dataset does not include node {0}"
msgstr "El conjunt de dades principal no conté el node {0}"
-msgid "Apply?"
-msgstr "Aplicar?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3296,27 +3311,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Relació"
-
-msgid "Old role"
-msgstr "Vell rol"
-
-msgid "New role"
-msgstr "Nou rol"
-
-msgid "Old key"
-msgstr "Clau vella"
-
-msgid "Old value"
-msgstr "Valor vell"
-
-msgid "New key"
-msgstr "Nova clau"
-
-msgid "New value"
-msgstr "Nou valor"
-
msgid "Apply selected changes"
msgstr "Aplicar els canvis seleccionats"
@@ -4458,6 +4452,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problema de verificació del rol"
@@ -5123,6 +5120,12 @@ msgstr ""
msgid "Initializing"
msgstr "S''està inicialitzant"
+msgid "Setting defaults"
+msgstr "Ajustant els valors per defecte"
+
+msgid "Creating main GUI"
+msgstr "S''està creant la interfície principal"
+
msgid "Updating plugins"
msgstr "Actualitzant els connectors"
@@ -5132,12 +5135,6 @@ msgstr "Instal·lant els connectors actualitzats"
msgid "Loading early plugins"
msgstr "Carregant els primers connectors"
-msgid "Setting defaults"
-msgstr "Ajustant els valors per defecte"
-
-msgid "Creating main GUI"
-msgstr "S''està creant la interfície principal"
-
msgid "Loading plugins"
msgstr "Carregant connectors"
@@ -6162,6 +6159,30 @@ msgstr "Mostra només els conflictes d''etiquetes"
msgid "Show tags with multiple values only"
msgstr "Mostra només les etiquetes amb varis valors"
+msgid "Apply?"
+msgstr "Aplicar?"
+
+msgid "Relation"
+msgstr "Relació"
+
+msgid "Old role"
+msgstr "Vell rol"
+
+msgid "New role"
+msgstr "Nou rol"
+
+msgid "Old key"
+msgstr "Clau vella"
+
+msgid "Old value"
+msgstr "Valor vell"
+
+msgid "New key"
+msgstr "Nova clau"
+
+msgid "New value"
+msgstr "Nou valor"
+
msgid "For selected objects only"
msgstr "Només pels objectes seleccionats"
@@ -6684,51 +6705,6 @@ msgstr "Commuta la visibilitat de la capa: {0}"
msgid "Open a list of all loaded layers."
msgstr "Mostrar una llista amb les capes carregades"
-msgid "Delete the selected layers."
-msgstr "Esborrar les capes seleccionades"
-
-msgid "Show/hide"
-msgstr "Amaga/mostra"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Commuta l''estat visible de la capa seleccionada."
-
-msgid "Show/hide layer"
-msgstr "Mostra/amaga la capa"
-
-msgid "Opacity"
-msgstr "Opacitat"
-
-msgid "Adjust opacity of the layer."
-msgstr "Ajustar l''opacitat de la capa"
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Activa"
-
-msgid "Activate the selected layer"
-msgstr "Activar la capa seleccionada"
-
-msgid "Activate layer"
-msgstr "Activar la capa"
-
-msgid "Merge this layer into another layer"
-msgstr "Fusiona esta capa amb una altra"
-
-msgid "Duplicate this layer"
-msgstr "Duplica la capa"
-
-msgid "Copy of {0}"
-msgstr "Copia {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copia {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "la capa és visible (cliqueu per amagar-la)"
@@ -6751,12 +6727,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Moure la capa seleccionada una fila amunt"
-
-msgid "Move the selected layer one row down."
-msgstr "Moure la capa seleccionada avall"
-
msgid "Information about layer"
msgstr "Informació sobre la capa"
@@ -7192,15 +7162,6 @@ msgstr "Tancat el"
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr "Descarregant el contingut del conjunt de canvis"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Descarregant el conjunt de canvis {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Descarregant el contingut del conjunt de canvis {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7319,9 +7280,6 @@ msgstr ""
msgid "Date"
msgstr "Data"
-msgid "Download changesets"
-msgstr "Descarregar els conjunts de canvis"
-
msgid "{0} [incomplete]"
msgstr "{0} [incomplet]"
@@ -7495,16 +7453,6 @@ msgid "Please enter an integer value > 0"
msgstr "Per favor, indiqueu un valor enter més gran que 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>El valor actual no és un nom d''usuari vàlid.<br>Per favor, indiqueuun "
-"nom d''usuari"
-
-msgid "Please enter an non-empty user name"
-msgstr "Per favor entreu un nom d''usuari"
-
-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 ""
@@ -7611,15 +7559,6 @@ msgstr "Consulta d’URL de conjunts de canvis incorecta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Tancar la finestra i anular la consulta de conjunts de canvis"
-msgid "Querying and downloading changesets"
-msgstr "Consultant i descarregant conjunts de canvis"
-
-msgid "Determine user id for current user..."
-msgstr "Determinar l''ID de l''usuari actual..."
-
-msgid "Query and download changesets ..."
-msgstr "Consultar i descarregar conjunts de canvis ..."
-
msgid "URL: "
msgstr "Adreça URL: "
@@ -7642,6 +7581,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Esta URL de consulta de conjunts de canvis no és vàlida"
+msgid "Activate"
+msgstr "Activa"
+
+msgid "Activate the selected layer"
+msgstr "Activar la capa seleccionada"
+
+msgid "Activate layer"
+msgstr "Activar la capa"
+
+msgid "Delete the selected layers."
+msgstr "Esborrar les capes seleccionades"
+
+msgid "Duplicate this layer"
+msgstr "Duplica la capa"
+
+msgid "Copy of {0}"
+msgstr "Copia {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copia {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Ajustar l''opacitat de la capa"
+
+msgid "Opacity"
+msgstr "Opacitat"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Fusiona esta capa amb una altra"
+
+msgid "Move the selected layer one row down."
+msgstr "Moure la capa seleccionada avall"
+
+msgid "Move the selected layer one row up."
+msgstr "Moure la capa seleccionada una fila amunt"
+
+msgid "Show/hide"
+msgstr "Amaga/mostra"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Commuta l''estat visible de la capa seleccionada."
+
+msgid "Show/hide layer"
+msgstr "Mostra/amaga la capa"
+
msgid "Discardable key: selection Foreground"
msgstr "Clau descartable: selecció en primer pla"
@@ -7967,12 +7975,12 @@ msgstr "Relacions de parentiu"
msgid "Child Relations"
msgstr "Relacions filles"
-msgid "Apply Role:"
-msgstr "Aplicar rol:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Entrar un rol i aplicar-ho al membres de la relació seleccionada"
+msgid "Apply Role:"
+msgstr "Aplicar rol:"
+
msgid "New Relation"
msgstr "Relació nova"
@@ -9855,9 +9863,6 @@ msgstr "Degradació de la imatgeria"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "ERROR"
-
msgid "Next marker"
msgstr "Marcador següent"
@@ -10756,14 +10761,6 @@ msgstr "Tornar a executar la seqüència d''autorització"
msgid "Test Access Token"
msgstr "Provar el testimoni d''autenticació"
-msgid "Please enter your OSM user name"
-msgstr "Per favor, introduïu el vostre nom d''usuari OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"El nom d''usuari no pot estar buit. Per favor, introduïu el vostre nom "
-"d''usuari OSM"
-
msgid "Please enter your OSM password"
msgstr "Per favor, introduïu la vostra contrasenya OSM"
@@ -13020,6 +13017,14 @@ msgstr "Paràmetres de la connexió"
msgid "Connection Settings for the OSM server."
msgstr "Configuració de la connexió amb el servidor OSM"
+msgid "Please enter your OSM user name"
+msgstr "Per favor, introduïu el vostre nom d''usuari OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"El nom d''usuari no pot estar buit. Per favor, introduïu el vostre nom "
+"d''usuari OSM"
+
msgid "Action"
msgstr "Acció"
@@ -13574,6 +13579,14 @@ msgstr ""
"Valor invàlid per l''atribut ''{0}'' de l''element ''{1}'' a les capacitats "
"del serevidor. El valor és ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
"Ha fallat l''anàlisi de les dades ''{0}'' rebudes com a resposta del "
@@ -14979,74 +14992,6 @@ msgstr "raó no especificada"
msgid "Error playing sound"
msgstr "Error reproduïnt so"
-msgid "Do nothing"
-msgstr "No faces res"
-
-msgid "Report Bug"
-msgstr "Informa d''un error"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Ha hagut una excepció no esperada.<br>Això sempre és a causa d''un error al "
-"codi del programa. Si esteu utilitzant<br>la darrera versió de JOSM, si vos "
-"plau, considereu l''opció d''omplir un informe d''error."
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "Excepció no esperada"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "No tornar a mostrar la finestra d''error durant esta sessió."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Heu trobat un error a JOSM. Abans d''emplenar el formulari per reportar "
-"l''error assegureu-vos que heu actualitzat JOSM a la darrera versió ací:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Hauríeu d''actualitzar també els vostres connectors. Si el problema "
-"persisteix, per favor, ompliu un informe d''error al nostre lloc web:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"La informació sobre el problema que hi ha a sota ja ha estat inclosa. Si vos "
-"plau, afegiu informació sobre la manera de reproduir el problema i aporteu "
-"el màxim possible de detalls."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Alternativament, si no funciona, podeu omplir manualment la informació en "
-"esta adreça URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(El text ja ha estat copiat al vostre portaretalls.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Heu trobat un error dins JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15427,9 +15372,6 @@ msgstr "La descàrrega ha estat redirigida vers ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Massa redireccions vers la URL descarregada. Anul·lant."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"No ha estat possible de trobar una traducció a la llengua {0}. Revertint a "
@@ -15637,6 +15579,78 @@ msgstr "Ignorant la geometria malformada: {0}"
msgid "Failed to load XML schema."
msgstr "Ha fallat la càrrega de l''esquema XML"
+msgid "Do nothing"
+msgstr "No faces res"
+
+msgid "Report Bug"
+msgstr "Informa d''un error"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Ha hagut una excepció no esperada.<br>Això sempre és a causa d''un error al "
+"codi del programa. Si esteu utilitzant<br>la darrera versió de JOSM, si vos "
+"plau, considereu l''opció d''omplir un informe d''error."
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr "No tornar a mostrar la finestra d''error durant esta sessió."
+
+msgid "Unexpected Exception"
+msgstr "Excepció no esperada"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Heu trobat un error dins JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Heu trobat un error a JOSM. Abans d''emplenar el formulari per reportar "
+"l''error assegureu-vos que heu actualitzat JOSM a la darrera versió ací:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Hauríeu d''actualitzar també els vostres connectors. Si el problema "
+"persisteix, per favor, ompliu un informe d''error al nostre lloc web:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"La informació sobre el problema que hi ha a sota ja ha estat inclosa. Si vos "
+"plau, afegiu informació sobre la manera de reproduir el problema i aporteu "
+"el màxim possible de detalls."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Alternativament, si no funciona, podeu omplir manualment la informació en "
+"esta adreça URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(El text ja ha estat copiat al vostre portaretalls.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15986,13 +16000,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -16001,7 +16015,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -16013,15 +16033,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -16118,6 +16135,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -16142,13 +16162,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -16295,10 +16315,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16351,29 +16371,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16421,6 +16440,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16481,6 +16503,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16517,10 +16542,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -16622,6 +16644,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -16631,6 +16656,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -17320,6 +17348,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18737,6 +18770,12 @@ msgstr "Carrers"
msgid "Motorway"
msgstr "Autopista/Autovia"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -19327,9 +19366,6 @@ msgstr "Cruïlla de l''autopista/autovia"
msgid "Number"
msgstr "Nombre"
-msgid "Exit to"
-msgstr "Ix per"
-
msgid "Services"
msgstr "Àrea de servei"
@@ -19809,6 +19845,15 @@ msgstr "plana de marea"
msgid "mangrove"
msgstr "manglar"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Fangar"
@@ -20959,6 +21004,9 @@ msgstr ""
msgid "Fishing"
msgstr "Pesca"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -22227,6 +22275,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -23814,8 +23866,8 @@ msgstr "bosses per excrements"
msgid "food"
msgstr "menjar"
-msgid "news_papers"
-msgstr "diaris"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parquimetre"
@@ -23829,8 +23881,8 @@ msgstr "plànols_transport_public"
msgid "public_transport_tickets"
msgstr "bitllets_transport_public"
-msgid "SIM-cards"
-msgstr "targetes-SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "segells"
@@ -25084,6 +25136,21 @@ msgstr "natural"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -25108,9 +25175,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -25270,7 +25334,13 @@ msgstr "Càmping"
msgid "Test"
msgstr "Prova"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -25354,6 +25424,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -25452,6 +25527,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -25461,6 +25539,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nom abreviat del carrer"
@@ -28850,6 +28936,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -31314,6 +31460,15 @@ msgstr "Transport públic: activar fites"
msgid "Public Transport: Edit waypoint name"
msgstr "Transport públic: modificar el nom d''una fita"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Selecció no vàlida"
+
msgid "Public transport routes"
msgstr ""
@@ -32147,9 +32302,6 @@ msgstr "Divideix un edifici vers cases en filera"
msgid "Creates individual buildings from a long building."
msgstr "Crear edificis individuals a partir d''un gran edifici."
-msgid "Invalid selection"
-msgstr "Selecció no vàlida"
-
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 "
@@ -34103,20 +34255,3 @@ msgstr "Anar en cotxe"
msgid "Drive a race car on this layer"
msgstr "Conduir un cotxe de carreres sobre esta capa"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "L''estil de traçat no és válid, els valors han de ser positius"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "L''estil de traçat no és válid, com a mínim un dels valors ha de ser més "
-#~ "gran que zero"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Ha fallat l''anàlisi dels estils de Mappaint desde ''{0}''. L''excepció ha "
-#~ "estat: [{1}:{2}] {3}"
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 77650ca..37a8349 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-09 12:32+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-14 08:20+0000\n"
"Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
"Language-Team: Czech <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:39+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:38+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -152,9 +152,6 @@ msgstr "Verze prostředí Java: {0}"
msgid "Homepage"
msgstr "Domovská stránka"
-msgid "Bug Reports"
-msgstr "Nahlášení chyby"
-
msgid "Info"
msgstr "Informace"
@@ -176,6 +173,12 @@ msgstr "Doplňky"
msgid "About JOSM..."
msgstr "O JOSM…"
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Nahlásit chybu"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Nepodařilo se najít zdroj ''{0}''."
@@ -602,9 +605,6 @@ msgstr "Nastavit pozici této vrstvy podkladových map"
msgid "Adjust imagery offset"
msgstr "Nastavit posunutí vrstvy podkladových map"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1265,9 +1265,6 @@ msgstr "Přejmenovat také soubor"
msgid "Could not rename file ''{0}''"
msgstr "Nemohu přejmenovat soubor ''{0}''"
-msgid "Report bug"
-msgstr "Nahlásit chybu"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Nahlásit chybu do správce chyb JOSM"
@@ -1923,6 +1920,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Zpomalené přehrávání"
+msgid "Downloading changeset content"
+msgstr "Stahování obsahu sady změn"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Stahování sady změn {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Stahování obsahu sady změn {2}..."
+
+msgid "Download changesets"
+msgstr "Stáhnout sady změn"
+
+msgid "Querying and downloading changesets"
+msgstr "Dotazuji a stahuji sady změn"
+
+msgid "Determine user id for current user..."
+msgstr "Zjistit uživatelské id aktuálního uživatele..."
+
+msgid "Query and download changesets ..."
+msgstr "Dotaz a stažení sad změn ..."
+
+msgid "Errors during download"
+msgstr "Chyby během stahování"
+
msgid "Download GPS"
msgstr "Stáhnout GPS"
@@ -2097,9 +2118,6 @@ msgstr "Smazané nebo přesunuté objekty"
msgid "The following errors occurred during mass download: {0}"
msgstr "Během hromadného stahování došlo k následujícím chybám: {0}"
-msgid "Errors during download"
-msgstr "Chyby během stahování"
-
msgid "Error during download"
msgstr "Chyba během stahování"
@@ -2454,11 +2472,11 @@ msgid "Add selection to relation"
msgstr "Přidat výběr do relace"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Přidat výběr do relace</strong>: Zkontrolujte každou relaci, "
-"aby se předešlo poškození!"
+"{0}Přidat výběr do relace{1}: Aby se předešlo poškození, zkontrolujte každou "
+"relaci!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3312,9 +3330,6 @@ msgstr "Vyřešit konflikty v seznamu bodů cesty {0}"
msgid "Main dataset does not include node {0}"
msgstr "Hlavní datová sada neobsahuje uzel {0}"
-msgid "Apply?"
-msgstr "Použít?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3346,27 +3361,6 @@ msgstr ""
"Protože otáčíte směr cesty, jsou kvůli zachování konzistence dat navrhovány "
"tyto změny."
-msgid "Relation"
-msgstr "Vztah"
-
-msgid "Old role"
-msgstr "Stará role"
-
-msgid "New role"
-msgstr "Nová role"
-
-msgid "Old key"
-msgstr "Starý klíč"
-
-msgid "Old value"
-msgstr "Stará hodnota"
-
-msgid "New key"
-msgstr "Nový klíč"
-
-msgid "New value"
-msgstr "Nová hodnota"
-
msgid "Apply selected changes"
msgstr "Použít zvolené změny"
@@ -4503,6 +4497,9 @@ msgstr "Relace route obsajuje ''{0}'' roli"
msgid "Route relation contains a gap"
msgstr "Relace route obsahuje mezeru"
+msgid "Stop position not part of route"
+msgstr "Místo zastavení není částí trasy"
+
msgid "Role verification problem"
msgstr "Problém při kontrole rolí"
@@ -5173,6 +5170,12 @@ msgstr "Povolena podrobná úroveň ladících informací (trasování)"
msgid "Initializing"
msgstr "Inicializace"
+msgid "Setting defaults"
+msgstr "Nastavuji výchozí hodnoty"
+
+msgid "Creating main GUI"
+msgstr "Vytváří se grafické rozhraní programu (GUI)"
+
msgid "Updating plugins"
msgstr "Aktualizace doplňků"
@@ -5182,12 +5185,6 @@ msgstr "Instaluji aktualizované doplňky"
msgid "Loading early plugins"
msgstr "Načítání doplňků, které se mají načíst nejdříve"
-msgid "Setting defaults"
-msgstr "Nastavuji výchozí hodnoty"
-
-msgid "Creating main GUI"
-msgstr "Vytváří se grafické rozhraní programu (GUI)"
-
msgid "Loading plugins"
msgstr "Načítání doplňků"
@@ -6266,6 +6263,30 @@ msgstr "Zobrazit pouze značky s konfliktem"
msgid "Show tags with multiple values only"
msgstr "Zobrazit pouze značky s více hodnotami"
+msgid "Apply?"
+msgstr "Použít?"
+
+msgid "Relation"
+msgstr "Vztah"
+
+msgid "Old role"
+msgstr "Stará role"
+
+msgid "New role"
+msgstr "Nová role"
+
+msgid "Old key"
+msgstr "Starý klíč"
+
+msgid "Old value"
+msgstr "Stará hodnota"
+
+msgid "New key"
+msgstr "Nový klíč"
+
+msgid "New value"
+msgstr "Nová hodnota"
+
msgid "For selected objects only"
msgstr "Pouze pro vybrané objekty"
@@ -6796,51 +6817,6 @@ msgstr "Přepnout viditelnost vrstvy: {0}"
msgid "Open a list of all loaded layers."
msgstr "Otevřít seznam všech nahraných vrstev."
-msgid "Delete the selected layers."
-msgstr "Smazat vybrané vrstvy."
-
-msgid "Show/hide"
-msgstr "Zobrazit/skrýt"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Přepnout viditelnost zvolené vrstvy."
-
-msgid "Show/hide layer"
-msgstr "Zobrazit/skrýt vrstvu"
-
-msgid "Opacity"
-msgstr "Neprůhlednost"
-
-msgid "Adjust opacity of the layer."
-msgstr "Upravit průhlednost vrstvy"
-
-msgid "Gamma"
-msgstr "Gama"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Nastavit hodnotu gama podkladové vrstvy."
-
-msgid "Activate"
-msgstr "Aktivovat"
-
-msgid "Activate the selected layer"
-msgstr "Aktivovat vybranou vrstvu"
-
-msgid "Activate layer"
-msgstr "Aktivovat vrstvu"
-
-msgid "Merge this layer into another layer"
-msgstr "Sloučit tuto vrstvu do jiné vrstvy"
-
-msgid "Duplicate this layer"
-msgstr "Duplikovat tuto vrstvu"
-
-msgid "Copy of {0}"
-msgstr "Kopie {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopie {1} vrstvy {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "vrstva je momentálně viditelná (klikněte pro schování)"
@@ -6865,12 +6841,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "tato vrstva nemá přirozené rozlišení"
-msgid "Move the selected layer one row up."
-msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
-
-msgid "Move the selected layer one row down."
-msgstr "Přesunout zvolenou vrstvu o řádek dolů."
-
msgid "Information about layer"
msgstr "Informace o vrstvě"
@@ -7304,15 +7274,6 @@ msgstr "Uzavřen v"
msgid "Discussions"
msgstr "Diskuse"
-msgid "Downloading changeset content"
-msgstr "Stahování obsahu sady změn"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Stahování sady změn {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Stahování obsahu sady změn {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7428,9 +7389,6 @@ msgstr "Aktualizuje diskusi o sadě změn ze serveru OSM"
msgid "Date"
msgstr "Datum"
-msgid "Download changesets"
-msgstr "Stáhnout sady změn"
-
msgid "{0} [incomplete]"
msgstr "{0} [nekompletní]"
@@ -7594,16 +7552,6 @@ msgid "Please enter an integer value > 0"
msgstr "Prosím, zadejte celé číslo > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Aktuální hodnota není platné uživatelské jméno.<br>Zadejte prosím "
-"neprázdné uživatelské jméno.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Prosím, zadejte neprázdné jméno uživatele"
-
-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 ""
@@ -7704,15 +7652,6 @@ msgstr "Neplatné URL dotazu na sadu změn."
msgid "Close the dialog and abort querying of changesets"
msgstr "Uzavřít dialog a ukončit dotazování na sady změn"
-msgid "Querying and downloading changesets"
-msgstr "Dotazuji a stahuji sady změn"
-
-msgid "Determine user id for current user..."
-msgstr "Zjistit uživatelské id aktuálního uživatele..."
-
-msgid "Query and download changesets ..."
-msgstr "Dotaz a stažení sad změn ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7732,6 +7671,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Toto URL dotazu na sadu změn není platné"
+msgid "Activate"
+msgstr "Aktivovat"
+
+msgid "Activate the selected layer"
+msgstr "Aktivovat vybranou vrstvu"
+
+msgid "Activate layer"
+msgstr "Aktivovat vrstvu"
+
+msgid "Delete the selected layers."
+msgstr "Smazat vybrané vrstvy."
+
+msgid "Duplicate this layer"
+msgstr "Duplikovat tuto vrstvu"
+
+msgid "Copy of {0}"
+msgstr "Kopie {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopie {1} vrstvy {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Změnit viditelnost zvolené vrstvy."
+
+msgid "Show layer"
+msgstr "Ukázat vrstvu"
+
+msgid "Adjust opacity of the layer."
+msgstr "Upravit průhlednost vrstvy"
+
+msgid "Opacity"
+msgstr "Neprůhlednost"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Nastavit hodnotu gama podkladové vrstvy."
+
+msgid "Gamma"
+msgstr "Gama"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Nastavit hodnoty zaostření/rozostření vrstvy."
+
+msgid "Sharpness"
+msgstr "Ostrost"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Nastavit barevnost vrstvy"
+
+msgid "Colorfulness"
+msgstr "Barevnost"
+
+msgid "Merge this layer into another layer"
+msgstr "Sloučit tuto vrstvu do jiné vrstvy"
+
+msgid "Move the selected layer one row down."
+msgstr "Přesunout zvolenou vrstvu o řádek dolů."
+
+msgid "Move the selected layer one row up."
+msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
+
+msgid "Show/hide"
+msgstr "Zobrazit/skrýt"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Přepnout viditelnost zvolené vrstvy."
+
+msgid "Show/hide layer"
+msgstr "Zobrazit/skrýt vrstvu"
+
msgid "Discardable key: selection Foreground"
msgstr "Nepotřebné klíče: popředí vybraných"
@@ -8061,12 +8069,12 @@ msgstr "Rodičovské relace"
msgid "Child Relations"
msgstr "Potomci relace"
-msgid "Apply Role:"
-msgstr "Aplikovat roli:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Zadat roli, která se aplikuje na vybrané členy relace"
+msgid "Apply Role:"
+msgstr "Aplikovat roli:"
+
msgid "New Relation"
msgstr "Nová relace"
@@ -9950,9 +9958,6 @@ msgstr "Zeslabení mapového podkladu"
msgid "Unsupported imagery type: {0}"
msgstr "Nepodporovaný typ obrázků: {0}"
-msgid "ERROR"
-msgstr "CHYBA"
-
msgid "Next marker"
msgstr "Následující značka"
@@ -10675,6 +10680,8 @@ msgid ""
"JOSM does no longer support mappaint styles written in the old XML format.\n"
"Please update ''{0}'' to MapCSS"
msgstr ""
+"JOSM již nepodporuje styly mappaint zapsané v starém formátu XML.\n"
+"Aktualizujte, prosím, ''{0}'' na MapCSS"
msgid "loading style ''{0}''..."
msgstr "nahrávám styl ''{0}''..."
@@ -10846,13 +10853,6 @@ msgstr "Znovu spustit kroky automatické autorizace"
msgid "Test Access Token"
msgstr "Otestovat přístupový token"
-msgid "Please enter your OSM user name"
-msgstr "Prosím zadejte své uživatelské jméno pro OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Uživatelské jméno nemůže být prázdné. Zadejte své uživatelské jméno pro OSM"
-
msgid "Please enter your OSM password"
msgstr "Prosím zadejte své heslo pro OSM"
@@ -13063,6 +13063,13 @@ msgstr "Nastavení připojení"
msgid "Connection Settings for the OSM server."
msgstr "Nastavení připojení k OSM serveru."
+msgid "Please enter your OSM user name"
+msgstr "Prosím zadejte své uživatelské jméno pro OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Uživatelské jméno nemůže být prázdné. Zadejte své uživatelské jméno pro OSM"
+
msgid "Action"
msgstr "Akce"
@@ -13612,6 +13619,16 @@ msgstr ""
"Neplatná hodnota atributu ''{0}'' prvku ''{1}'' ve schopnostech serveru. "
"Dostal jsem ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Chyba při přidávání certifikátu {0} - nesedí otisk prstu certifikátu. "
+"Očekáváno {1}, bylo {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Přidávám certifikát pro spojení TLS: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Nepodařilo se rozklíčovat datum ''{0}'' z odpovědi serveru."
@@ -14984,78 +15001,6 @@ msgstr "nespecifikovaný důvod"
msgid "Error playing sound"
msgstr "Chyba přehrávání zvuku"
-msgid "Do nothing"
-msgstr "Pokračovat"
-
-msgid "Report Bug"
-msgstr "Nahlásit chybu"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Nastala neočekávaná výjimka.<br>Tato chyba vždy znamená chybu v kódu. Pokud "
-"používáte poslední<verzi>verzi této aplikace, oznamte prosím tuto chybu "
-"autorům."
-
-msgid "Update JOSM"
-msgstr "Aktualizujte JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Došlo k neočekávané výjimce. Toto je vždy programátorská chyba. "
-"<br><br>Používáte nicméně starou verzi JOSM ({0})<br>místo současné "
-"otestované verze (<b>{1}</b>).<br><br><b>Prosím aktualizujte JOSM</b>, než "
-"nahlásíte tuto chybu."
-
-msgid "Unexpected Exception"
-msgstr "Neočekávaná výjimka"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Potlačit další chybová hlášení v tomto sezení."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Narazil(a) jste na chybu v JOSM. Než nahlásíte chybu, ověřte si na "
-"následující adrese že používáte nejnovější verzi JOSM:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Bylo by taktéž vhodné aktualizovat doplňky. Pokud žádný z těchto postupů "
-"nepomůže, nahlaste, prosím, chybu na této adrese:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Níže uvedené podrobné informace o chybě by již měly být předvyplněné. "
-"Přidejte k nim také informaci, jak k chybě došlo a jak ji lze zreprodukovat "
-"(pokud to víte) a co nejvíce dalších podrobností."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"V případě, že toto nebude fungovat, můžete ručně vyplnit níže uvedené údaje "
-"na následující URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Text již byl zkopírován do schránky.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Narazili jste na chybu v JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15458,9 +15403,6 @@ msgstr "Stahování přesměrováno na ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Detekováno příliš mnoho přesměrování URL. Přerušení akce."
-msgid "Fetching content..."
-msgstr "Načítám obsah..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Nelze najít překlad do jazyka {0}. Vracím se k {1}."
@@ -15681,6 +15623,84 @@ msgstr "Ignoruji zdeformovanou geometrii: {0}"
msgid "Failed to load XML schema."
msgstr "Nepodařilo se načíst XML schéma."
+msgid "Do nothing"
+msgstr "Pokračovat"
+
+msgid "Report Bug"
+msgstr "Nahlásit chybu"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Nastala neočekávaná výjimka.<br>Tato chyba vždy znamená chybu v kódu. Pokud "
+"používáte poslední<verzi>verzi této aplikace, oznamte prosím tuto chybu "
+"autorům."
+
+msgid "Update JOSM"
+msgstr "Aktualizujte JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Došlo k neočekávané výjimce. Toto je vždy programátorská chyba. "
+"<br><br>Používáte nicméně starou verzi JOSM ({0})<br>místo současné "
+"otestované verze (<b>{1}</b>).<br><br><b>Prosím aktualizujte JOSM</b>, než "
+"nahlásíte tuto chybu."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Potlačit další chybová hlášení v tomto sezení."
+
+msgid "Unexpected Exception"
+msgstr "Neočekávaná výjimka"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Narazili jste na chybu v JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Narazil(a) jste na chybu v JOSM. Než nahlásíte chybu, ověřte si na "
+"následující adrese že používáte nejnovější verzi JOSM:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Bylo by taktéž vhodné aktualizovat doplňky. Pokud žádný z těchto postupů "
+"nepomůže, nahlaste, prosím, chybu na této adrese:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Níže uvedené podrobné informace o chybě by již měly být předvyplněné. "
+"Přidejte k nim také informaci, jak k chybě došlo a jak ji lze zreprodukovat "
+"(pokud to víte) a co nejvíce dalších podrobností."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"V případě, že toto nebude fungovat, můžete ručně vyplnit níže uvedené údaje "
+"na následující URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Text již byl zkopírován do schránky.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Založení hlášení chyby se nezdařilo. Prosím, nahlaste to ručně na této "
+"stránce:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16027,14 +16047,14 @@ msgstr "Mapbox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap trasy GPS"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Standardní vrstva)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik, černobíle)"
@@ -16042,8 +16062,14 @@ msgstr "OpenStreetMap (Mapnik, černobíle)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, bez popisek)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (French Style)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (německý styl)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap trasy GPS"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16054,15 +16080,12 @@ msgstr "Veřejná doprava (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (německý styl)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam dvojjazyčně"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (překryv)"
@@ -16159,6 +16182,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (základní mapa)"
@@ -16183,14 +16209,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: Echtfarbenbild 2015 (10cm)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (model terénu)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (model povrchu)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: Höhen und Gelände"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -16336,11 +16362,11 @@ msgstr "Géolittoral V2 - Orthophotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16394,6 +16420,15 @@ msgstr "Bavaria (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Berlin aerial photograph 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Berlin aerial photograph 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Berlin aerial photograph 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (aerial imagery"
@@ -16409,17 +16444,6 @@ msgstr "Stará mapa Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Stará mapa Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Physical map (natural regions"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Physical map (natural regions)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16465,6 +16489,9 @@ msgstr "Törökbálint ortophoto 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 "Danube flood ortophoto 2013"
msgstr "Danube flood ortophoto 2013"
@@ -16525,6 +16552,9 @@ msgstr "OSMIE T.ie Land not in Counties"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Lombardia - Italy (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardia - Italy (CTR DBT)"
@@ -16561,11 +16591,8 @@ msgstr "1.cikla ortofotokarte - Latvia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Railway"
@@ -16666,6 +16693,9 @@ msgstr "Powiat poznański: Budynki (buildings)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (Aerial image)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (buildings)"
@@ -16675,6 +16705,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (Aerial image)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (buildings)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (buildings)"
@@ -17376,6 +17409,13 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr "Tento doplněk zjednodušuje mapování a úpravy vnitřních chodeb."
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Asistuje při mapování vnitřních prostor budov v OSM. Obsahuje validátor a "
+"styl vykreslení mapy pro data z vnitřních prostor."
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18809,6 +18849,12 @@ msgstr "Silnice a ulice"
msgid "Motorway"
msgstr "Dálnice"
+msgid "Destination"
+msgstr "Cíl"
+
+msgid "Destination reference"
+msgstr "Reference cíle"
+
msgid "Placement"
msgstr "Umístění"
@@ -19402,9 +19448,6 @@ msgstr "Dálniční sjezd (exit)"
msgid "Number"
msgstr "Číslo"
-msgid "Exit to"
-msgstr "Výjezd do"
-
msgid "Services"
msgstr "Služby motoristům (odpočívadla)"
@@ -19886,6 +19929,15 @@ msgstr "přílivová oblast"
msgid "mangrove"
msgstr "mangrove"
+msgid "wet_meadow"
+msgstr "vlhká louka"
+
+msgid "string_bog"
+msgstr "string bog"
+
+msgid "saltern"
+msgstr "salina"
+
msgid "Mud"
msgstr "Bahno"
@@ -21037,6 +21089,9 @@ msgstr "Ohniště"
msgid "Fishing"
msgstr "Rybaření"
+msgid "Bird Hide"
+msgstr "Pozorovatelna ptactva"
+
msgid "Night Club"
msgstr "Noční klub"
@@ -22305,6 +22360,10 @@ msgid "transformer_tower"
msgstr "budova trafostanice"
msgctxt "building"
+msgid "public"
+msgstr "veřejná"
+
+msgctxt "building"
msgid "Levels"
msgstr "Patra"
@@ -23894,7 +23953,7 @@ msgstr "sáčky na výkaly"
msgid "food"
msgstr "jídlo"
-msgid "news_papers"
+msgid "newspapers"
msgstr "noviny"
msgid "parking_tickets"
@@ -23909,8 +23968,8 @@ msgstr "plány městské hromadné dopravy"
msgid "public_transport_tickets"
msgstr "lístky na městskou hromadnou dopravu"
-msgid "SIM-cards"
-msgstr "SIM-karty"
+msgid "SIM_cards"
+msgstr "SIM karty"
msgid "stamps"
msgstr "známky"
@@ -25182,6 +25241,21 @@ msgstr "příroda"
msgid "Walking Route"
msgstr "Trasa pěší turistiky"
+msgid "Riding Route"
+msgstr "Trasa pro jezdce na koni"
+
+msgid "ihn"
+msgstr "ihn"
+
+msgid "nhn"
+msgstr "nhn"
+
+msgid "rhn"
+msgstr "rhn"
+
+msgid "lhn"
+msgstr "lhn"
+
msgid "Piste Route"
msgstr "Sjezdovka"
@@ -25206,9 +25280,6 @@ msgstr "sjezdové lyžování (alpine)"
msgid "Detour Route"
msgstr "Objížďka"
-msgid "Destination"
-msgstr "Cíl"
-
msgid "Ref of the way this is a detour to"
msgstr "Reference trasy, kterou objížďka nahrazuje"
@@ -25368,8 +25439,14 @@ msgstr "Tábořiště"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "V interpolaci adres se čísla domů snižují"
+msgid "Even housenumber in odd address interpolation."
+msgstr "Sudé číslo domu v interpolaci lichých adres."
+
+msgid "Odd housenumber in even address interpolation."
+msgstr "Liché číslo domu v interpolaci sudých adres."
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr "Cesta s {0}. Označte, je-li to možné, každé číslo domu zvlášť."
msgid "{0} without {1}"
msgstr "{0} bez {1}"
@@ -25458,6 +25535,13 @@ msgstr ""
"Špatné použití značky {0}. Odstraňte {1}, protože je jasné, že název chybí i "
"bez přidané značky."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+"{0} je nekonkrétní. Použijte spíše klíč fixme s informací, co má být "
+"opraveno, v hodnotě fixme."
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} je zastaralé. Použite, prosím, místo toho multipolygon."
@@ -25561,6 +25645,9 @@ msgstr "{0} musí být připojen k cestě"
msgid "node connects waterway and bridge"
msgstr "uzel spojuje vodní cestu a most"
+msgid "{0} node connected to a highway"
+msgstr "{0} uzel připojený k silnici"
+
msgid "suspicious roundabout direction"
msgstr "podezřelý směr kruhového objezdu"
@@ -25570,6 +25657,16 @@ msgstr "{0} na velké ploše"
msgid "{0} on a small area"
msgstr "{0} na malé ploše"
+msgid "Too large building"
+msgstr "Příliš velká budova"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+"Uzel spojuje vedení napětí nebo kabel s objektem, který nesouvisí s "
+"infrastrukturou napájení."
+
msgid "abbreviated street name"
msgstr "zkrácený název ulice"
@@ -28957,10 +29054,10 @@ msgid "Please open or create data layer before importing"
msgstr "Před importem, prosím, otevřete nebo vytvořte datovou vrstvu"
msgid "Concourse wizard ..."
-msgstr ""
+msgstr "Pomocník pro chodby..."
msgid "Opens up a wizard to create a concourse"
-msgstr ""
+msgstr "Otevře pomocníka pro vytváření chodeb"
msgid "Vertical layer:"
msgstr "Vertikální vrstva:"
@@ -28969,7 +29066,70 @@ msgid "Structure type:"
msgstr "Typ stavby:"
msgid "Offset into background:"
+msgstr "Ofset do pozadí:"
+
+msgid "Indoor Mapping Helper"
+msgstr "Pomocník mapování vnitřních prostor"
+
+msgid "POWER"
+msgstr "NAPÁJENÍ"
+
+msgid "Activates the plug-in"
+msgstr "Aktivuje doplněk"
+
+msgid "Working Level"
+msgstr "Pracovní úroveň"
+
+msgid "Selects the working level."
+msgstr "Zvolí pracovní úroveň"
+
+msgid "Level Name"
+msgstr "Název úrovně"
+
+msgid "Optional name-tag for a level."
+msgstr "Volitelná značka názvu úrovně."
+
+msgid "The object preset you want to tag."
+msgstr "Předvolba objektu, který chcete označit."
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr "Nastaví značku name, když je vybrán objekt místnost."
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr "Nastaví značku ref, když je vybrán objekt místnost."
+
+msgid "Apply Tags"
+msgstr "Aplikovat značky"
+
+msgid "Fitting"
+msgstr "Přizpůsobení"
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
msgstr ""
+"<html>Prosím, začněte přizpůsobovat vaše plány budovy.<br>Chcete-li to "
+"udělat, použijte doplněk PicLayer, který můžete nainstalovat<br>za pomocí "
+"správce doplňků JOSM.</html>"
+
+msgid "Level Selection"
+msgstr "Výběr úrovně"
+
+msgid "Lowest Level"
+msgstr "Nejnižší úroveň"
+
+msgid "The lowest level of your building."
+msgstr "Nejnižší úroveň vaší budovy."
+
+msgid "Highest Level"
+msgstr "Nejvyšší úroveň"
+
+msgid "The highest level of your building."
+msgstr "Nejvyšší úroveň vaší budovy."
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr "Panel nástrojů pro mapování vnitřních prostor"
msgid "InfoMode"
msgstr "InfoMode"
@@ -31405,6 +31565,15 @@ msgstr "Veřejná doprava: Povolit body trasy"
msgid "Public Transport: Edit waypoint name"
msgstr "Hromadná doprava: Upravit název bodu trasy"
+msgid "Distance between stops"
+msgstr "Vzdálenost mezi zastávkami"
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr "Je vyžadována platná trasa public_transport:version=2"
+
+msgid "Invalid selection"
+msgstr "Neplatný výběr"
+
msgid "Public transport routes"
msgstr "Trasy veřejné dopravy"
@@ -32223,9 +32392,6 @@ msgstr "Rozdělit budovu na jednotlivé řadové domy"
msgid "Creates individual buildings from a long building."
msgstr "Vytvoří jednotlivé budovy z dlouhého bloku budov."
-msgid "Invalid selection"
-msgstr "Neplatný výběr"
-
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 "
@@ -34157,21 +34323,3 @@ msgstr "Vyjet"
msgid "Drive a race car on this layer"
msgstr "Řídit závodní speciál na této vrstvě"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Selhalo zpracování stylů kreslení mapy z ''{0}''. Došlo k chybě: [{1}:{2}] "
-#~ "{3}"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr ""
-#~ "Nesprávný formát vykreslení přerušované čáry, hodnoty musí být kladné"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "Nesprávný formát vykreslení přerušované čáry, alespoň jedna hodnota musí být "
-#~ "> 0"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 1bfde5e..8790fed 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:10+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:08+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -149,9 +149,6 @@ msgstr ""
msgid "Homepage"
msgstr "Tudalen Cartref"
-msgid "Bug Reports"
-msgstr "Adroddiadau nam"
-
msgid "Info"
msgstr "Gwybodaeth"
@@ -173,6 +170,12 @@ msgstr "Ategynnau"
msgid "About JOSM..."
msgstr "Ynglyn JOSM..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -575,9 +578,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1167,9 +1167,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1779,6 +1776,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1928,9 +1949,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2246,8 +2264,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3028,9 +3046,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3050,27 +3065,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4128,6 +4122,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4773,19 +4770,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5758,6 +5755,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6245,51 +6266,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6312,12 +6288,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6740,15 +6710,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6854,9 +6815,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7008,14 +6966,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7100,15 +7050,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7126,6 +7067,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7441,10 +7451,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9100,9 +9110,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9905,12 +9912,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11918,6 +11919,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12428,6 +12435,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13669,62 +13684,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13976,9 +13935,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14163,6 +14119,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14497,13 +14513,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14512,7 +14528,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14524,15 +14546,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14629,6 +14648,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14653,13 +14675,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14806,10 +14828,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14862,29 +14884,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14932,6 +14953,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14992,6 +15016,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15028,10 +15055,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15133,6 +15157,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15142,6 +15169,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15797,6 +15827,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17154,6 +17189,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17730,9 +17771,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18211,6 +18249,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19359,6 +19406,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20627,6 +20677,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22214,7 +22268,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22229,7 +22283,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23484,6 +23538,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23508,9 +23577,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23670,7 +23736,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23754,6 +23826,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23852,6 +23929,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23861,6 +23941,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26960,6 +27048,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29281,6 +29429,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30065,9 +30222,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 9a2ce91..f1b18be 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-12 08:44+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-28 14:41+0000\n"
"Last-Translator: Jørn <joern.map at gmail.com>\n"
"Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:39+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:39+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -153,9 +153,6 @@ msgstr "Java-version {0}"
msgid "Homepage"
msgstr "Hjemmeside"
-msgid "Bug Reports"
-msgstr "Fejlrapporter"
-
msgid "Info"
msgstr "Information"
@@ -177,6 +174,12 @@ msgstr "Udvidelser"
msgid "About JOSM..."
msgstr "Om JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Anmeld fejl"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Kunne ikke finde ressource ''{0}''."
@@ -604,9 +607,6 @@ msgstr "Juster positionen af dette billedlag"
msgid "Adjust imagery offset"
msgstr "Justerer forskydningen for billedlaget"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1258,9 +1258,6 @@ msgstr "Omdøb også filen"
msgid "Could not rename file ''{0}''"
msgstr "Kunne ikke omdøbe filen \"{0}\""
-msgid "Report bug"
-msgstr "Anmeld fejl"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Opret en sag i JOSM fejlrapporteringssystem."
@@ -1910,6 +1907,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Langsommere fremad"
+msgid "Downloading changeset content"
+msgstr "Downloader indhold af rettesæt"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Downloader rettesæt {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Downloader indhold af rettesæt {2}..."
+
+msgid "Download changesets"
+msgstr "Download rettesæt"
+
+msgid "Querying and downloading changesets"
+msgstr "Forespørger og downloader rettesæt"
+
+msgid "Determine user id for current user..."
+msgstr "Bestem brugerID for nuværende bruger..."
+
+msgid "Query and download changesets ..."
+msgstr "Forespørg og download rettesæt ..."
+
+msgid "Errors during download"
+msgstr "Fejl under download"
+
msgid "Download GPS"
msgstr "Download GPS"
@@ -1977,7 +1998,7 @@ msgid ""
msgstr "Ignorerer fejlen da download blev annulleret. Fejlen var: {0}"
msgid "No data found in this area."
-msgstr "Intet data fundet i dette område"
+msgstr "Ingen data fundet i dette område"
msgid "OSM Server URL:"
msgstr "OSM server-URL:"
@@ -2070,9 +2091,6 @@ msgstr "Slettede eller flyttede objekter"
msgid "The following errors occurred during mass download: {0}"
msgstr "Følgende fejl opstod under masse-download: {0}"
-msgid "Errors during download"
-msgstr "Fejl under download"
-
msgid "Error during download"
msgstr "Fejl under download"
@@ -2420,11 +2438,11 @@ msgid "Add selection to relation"
msgstr "Tilføj markering til relation"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Tilføj valget til relation</strong>: Kontrollere hver eneste "
-"relation for at undgå skader!"
+"{0}Tilføj markering til relation{1}: Kontroller hver enkelt relation for at "
+"undgå beskadigelser!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3260,9 +3278,6 @@ msgstr "Løs konflikter i liste over punkter for vej {0}"
msgid "Main dataset does not include node {0}"
msgstr "Hoveddatasæt inkluderer ikke punkt {0}"
-msgid "Apply?"
-msgstr "Udfør?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3290,27 +3305,6 @@ msgstr ""
"Når denne vejs retning vendes, foreslås de følgende ændringer for at bevare "
"datakonsistens."
-msgid "Relation"
-msgstr "Relation"
-
-msgid "Old role"
-msgstr "Gammel rolle"
-
-msgid "New role"
-msgstr "Ny rolle"
-
-msgid "Old key"
-msgstr "Gammel nøgle"
-
-msgid "Old value"
-msgstr "Gammel værdi"
-
-msgid "New key"
-msgstr "Ny nøgle"
-
-msgid "New value"
-msgstr "Ny værdi"
-
msgid "Apply selected changes"
msgstr "Udfør valgte ændringer"
@@ -3989,7 +3983,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "E-mailadresse indeholder et ugyldigt domæne: {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Email tjekker"
msgid "URL is invalid"
msgstr "URL er ugyldig"
@@ -4010,7 +4004,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "URL indeholder et ugyldigt fragment: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "URL tjekker"
msgid "Addresses"
msgstr "Adresser"
@@ -4118,7 +4112,7 @@ msgstr ""
"hinanden i det samme lag, uden at være forbundet med et punkt."
msgid "Duplicated nodes"
-msgstr "Dublet-punkter"
+msgstr "Duplikerede punkter"
msgid "This test checks that there are no nodes at the very same location."
msgstr ""
@@ -4175,7 +4169,7 @@ msgid "Delete duplicate relations"
msgstr "Slet duplikerede relationer"
msgid "Duplicated ways"
-msgstr "Dublet-veje"
+msgstr "Duplikerede veje"
msgid ""
"This test checks that there are no ways with same node coordinates and "
@@ -4191,7 +4185,7 @@ msgid "Delete duplicate ways"
msgstr "Slet duplikerede veje"
msgid "Duplicated way nodes"
-msgstr "Dublet-vejpunkter"
+msgstr "Duplikerede vejpunkter"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Tjekker for veje med identiske på hinanden følgende punkter."
@@ -4447,6 +4441,9 @@ msgstr "Rute relation indeholder en ''{0}'' rolle"
msgid "Route relation contains a gap"
msgstr "Rute relation indeholder et hul"
+msgid "Stop position not part of route"
+msgstr "Stopposition er ikke en del af rute"
+
msgid "Role verification problem"
msgstr "Rolle-verificeringsproblem"
@@ -4825,7 +4822,7 @@ msgid "One node ways"
msgstr "Enkeltpunktsveje"
msgid "Way connected to Area"
-msgstr "Vej forbundet til Område"
+msgstr "Vej forbundet til område"
msgid "Checks for ways connected to areas."
msgstr "Leder efter veje der er forbundet til områder."
@@ -5114,6 +5111,12 @@ msgstr "Aktivere detaljeret debug niveau (trace)"
msgid "Initializing"
msgstr "Initialiserer"
+msgid "Setting defaults"
+msgstr "Sætter standardværdier"
+
+msgid "Creating main GUI"
+msgstr "Opretter hovedgrænseflade"
+
msgid "Updating plugins"
msgstr "Opdaterer udvidelser"
@@ -5123,12 +5126,6 @@ msgstr "Installerer opdaterede udvidelser"
msgid "Loading early plugins"
msgstr "Henter indledende udvidelser"
-msgid "Setting defaults"
-msgstr "Sætter standardværdier"
-
-msgid "Creating main GUI"
-msgstr "Opretter hovedgrænseflade"
-
msgid "Loading plugins"
msgstr "Henter udvidelser"
@@ -6197,6 +6194,30 @@ msgstr "Vis kun tags med konflikter"
msgid "Show tags with multiple values only"
msgstr "Vis kun tags med mange værdier"
+msgid "Apply?"
+msgstr "Udfør?"
+
+msgid "Relation"
+msgstr "Relation"
+
+msgid "Old role"
+msgstr "Gammel rolle"
+
+msgid "New role"
+msgstr "Ny rolle"
+
+msgid "Old key"
+msgstr "Gammel nøgle"
+
+msgid "Old value"
+msgstr "Gammel værdi"
+
+msgid "New key"
+msgstr "Ny nøgle"
+
+msgid "New value"
+msgstr "Ny værdi"
+
msgid "For selected objects only"
msgstr "Kun for de valgte elementer"
@@ -6724,51 +6745,6 @@ msgstr "Vælg synlighed for laget: {0}"
msgid "Open a list of all loaded layers."
msgstr "Åbn en liste over alle hentede lag."
-msgid "Delete the selected layers."
-msgstr "Slet de markerede lag."
-
-msgid "Show/hide"
-msgstr "Vis/skjul"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Slå synligheden for det valgte lag til/fra"
-
-msgid "Show/hide layer"
-msgstr "Vis/skjul lag"
-
-msgid "Opacity"
-msgstr "Gennemsigtighed"
-
-msgid "Adjust opacity of the layer."
-msgstr "Juster lagets gennemsigtighed"
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Juster gammaværdien for laget."
-
-msgid "Activate"
-msgstr "Aktiver"
-
-msgid "Activate the selected layer"
-msgstr "Aktiver de markerede lag"
-
-msgid "Activate layer"
-msgstr "Aktiver lag"
-
-msgid "Merge this layer into another layer"
-msgstr "Flet dette lag ind i et andet lag"
-
-msgid "Duplicate this layer"
-msgstr "Duplikér dette lag"
-
-msgid "Copy of {0}"
-msgstr "Kopi af {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopi {1} af {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "Laget er synligt i øjeblikket (klik for at skjule lag)"
@@ -6793,12 +6769,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "dette lag har ingen oprindelige opløsning"
-msgid "Move the selected layer one row up."
-msgstr "Flyt det valgte lag en række op."
-
-msgid "Move the selected layer one row down."
-msgstr "Flyt det valgte lag en række ned."
-
msgid "Information about layer"
msgstr "Information om lag"
@@ -7230,15 +7200,6 @@ msgstr "Lukket"
msgid "Discussions"
msgstr "Diskussioner"
-msgid "Downloading changeset content"
-msgstr "Downloader indhold af rettesæt"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Downloader rettesæt {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Downloader indhold af rettesæt {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7352,9 +7313,6 @@ msgstr "Opdatere rettesæt diskussionen fra OSM serveren"
msgid "Date"
msgstr "Dato"
-msgid "Download changesets"
-msgstr "Download rettesæt"
-
msgid "{0} [incomplete]"
msgstr "{0} [ufuldstændig]"
@@ -7523,16 +7481,6 @@ msgid "Please enter an integer value > 0"
msgstr "Indtast en heltalsværdi > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Den nuværende værdi er ikke et gyldigt brugernavn.<br>Indtast et ikke-"
-"tomt brugernavn.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Indtast et ikke-tomt brugernavn"
-
-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 ""
@@ -7634,15 +7582,6 @@ msgstr "Ulovlig rettesætsforespørgselsURL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Luk dialogen og afbryd forespørgsel af rettesæt"
-msgid "Querying and downloading changesets"
-msgstr "Forespørger og downloader rettesæt"
-
-msgid "Determine user id for current user..."
-msgstr "Bestem brugerID for nuværende bruger..."
-
-msgid "Query and download changesets ..."
-msgstr "Forespørg og download rettesæt ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7662,6 +7601,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Denne rettesætsforespørgselsURL er ugyldig"
+msgid "Activate"
+msgstr "Aktiver"
+
+msgid "Activate the selected layer"
+msgstr "Aktiver de markerede lag"
+
+msgid "Activate layer"
+msgstr "Aktiver lag"
+
+msgid "Delete the selected layers."
+msgstr "Slet de markerede lag."
+
+msgid "Duplicate this layer"
+msgstr "Duplikér dette lag"
+
+msgid "Copy of {0}"
+msgstr "Kopi af {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopi {1} af {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Skift synligheden af det valgte lag."
+
+msgid "Show layer"
+msgstr "Vis lag"
+
+msgid "Adjust opacity of the layer."
+msgstr "Juster lagets gennemsigtighed"
+
+msgid "Opacity"
+msgstr "Gennemsigtighed"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Juster gammaværdien for laget."
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Juster skarphed/sløring værdi for laget."
+
+msgid "Sharpness"
+msgstr "Skarphed"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Juster farvemætning for laget."
+
+msgid "Colorfulness"
+msgstr "Farvemætning"
+
+msgid "Merge this layer into another layer"
+msgstr "Flet dette lag ind i et andet lag"
+
+msgid "Move the selected layer one row down."
+msgstr "Flyt det valgte lag en række ned."
+
+msgid "Move the selected layer one row up."
+msgstr "Flyt det valgte lag en række op."
+
+msgid "Show/hide"
+msgstr "Vis/skjul"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Slå synligheden for det valgte lag til/fra"
+
+msgid "Show/hide layer"
+msgstr "Vis/skjul lag"
+
msgid "Discardable key: selection Foreground"
msgstr "Kasserbar nøgle: markering forgrund"
@@ -7981,12 +7989,12 @@ msgstr "Forældrerelationer"
msgid "Child Relations"
msgstr "Barnerelationer"
-msgid "Apply Role:"
-msgstr "Anvend rolle:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Indtast en rolle og brug den med de markerede relationsmedlemmer"
+msgid "Apply Role:"
+msgstr "Anvend rolle:"
+
msgid "New Relation"
msgstr "Ny relation"
@@ -9837,9 +9845,6 @@ msgstr "Billed-toning"
msgid "Unsupported imagery type: {0}"
msgstr "Billedelagstype ikke understøttet: {0}"
-msgid "ERROR"
-msgstr "FEJL"
-
msgid "Next marker"
msgstr "Næste markør"
@@ -10730,12 +10735,6 @@ msgstr "Kør automatisk godkendelsesguiden igen"
msgid "Test Access Token"
msgstr "Test adgangsudtryk"
-msgid "Please enter your OSM user name"
-msgstr "Indtast dit OSM-brugernavn"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "Brugernavnet kan ikke være tomt. Indtast dit OSM-brugernavn"
-
msgid "Please enter your OSM password"
msgstr "Indtast din OSM-adgangskode"
@@ -12940,6 +12939,12 @@ msgstr "Indstillinger for forbindelse"
msgid "Connection Settings for the OSM server."
msgstr "Indstillinger for forbindelse til OSM-serveren"
+msgid "Please enter your OSM user name"
+msgstr "Indtast dit OSM-brugernavn"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "Brugernavnet kan ikke være tomt. Indtast dit OSM-brugernavn"
+
msgid "Action"
msgstr "Handling"
@@ -13490,6 +13495,16 @@ msgstr ""
"Ulovlig værdi af attribut ''{0}'' af elementet ''{1}'' i server kapaciteter. "
"Fik ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Fejl ved tilføjelse af certifikat {0} - aftryk stemmer ikke. Forventede {1}, "
+"var {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Tilføjer certifikat for TLS-forbindelser: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Kunne ikke fortolke dato \"{0}\" meldt tilbage af serveren."
@@ -14855,77 +14870,6 @@ msgstr "uoplyst årsag"
msgid "Error playing sound"
msgstr "Fejl ved lydafspilning"
-msgid "Do nothing"
-msgstr "Foretag intet"
-
-msgid "Report Bug"
-msgstr "Rapporter fejl"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Der opstod en uventet handling.<br>Dette er altid en kodefejl. Hvis du "
-"bruger den nyeste<br>version af JOSM, overvej da at indsende en fejlrapport."
-
-msgid "Update JOSM"
-msgstr "Opdater JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Der opstod en uventet handling. Dette er altid en kodefejl.<br>Men, du "
-"bruger en ældre version af JOSM ({0}),<br> i stedet for den aktuelle testede "
-"version (<b>{1}</b>).<br><br><b>Opdater JOSM</b> før indsendelse af en "
-"fejlrapport."
-
-msgid "Unexpected Exception"
-msgstr "Uventet handling"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Undertryk yderligere fejldialoger for denne session."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Du har oplevet en fejl i JOSM. Inden du indberetter en fejlrapport, skal du "
-"være sikker på, at du har opdateret til den seneste version af JOSM her:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Du bør også opdatere dine udvidelser. Hvis intet af dette hjælper, så opret "
-"en fejlrapport i vores fejlrapporteringssystem ved hjælp af dette link:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Her burde fejl-informationen nedenunder allerede være udfyldt for dig. "
-"Tilføj informationer om hvordan, fejlen kan reproduceres, og giv så mange "
-"detaljer som muligt."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Alternativt, hvis det ikke virker for dig, kan du manuelt udfylde "
-"informationerne nedenunder på denne URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Teksten er allerede kopieret til din udklipsholder.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Du er stødt på en fejl i JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15294,9 +15238,6 @@ msgstr "Download omdirigeret til \"{0}\""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Opdagede for mange omdirigeringer til download URL’en. Afbryder."
-msgid "Fetching content..."
-msgstr "Henter indhold..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Kan ikke finde nogen oversættelse for sprogvalget {0}. Benytter i stedet {1}."
@@ -15514,6 +15455,83 @@ msgstr "Ignorerer misdannet geometri: {0}"
msgid "Failed to load XML schema."
msgstr "Kunne ikke indlæse XML skemaet."
+msgid "Do nothing"
+msgstr "Foretag intet"
+
+msgid "Report Bug"
+msgstr "Rapporter fejl"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Der opstod en uventet handling.<br>Dette er altid en kodefejl. Hvis du "
+"bruger den nyeste<br>version af JOSM, overvej da at indsende en fejlrapport."
+
+msgid "Update JOSM"
+msgstr "Opdater JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Der opstod en uventet handling. Dette er altid en kodefejl.<br>Men, du "
+"bruger en ældre version af JOSM ({0}),<br> i stedet for den aktuelle testede "
+"version (<b>{1}</b>).<br><br><b>Opdater JOSM</b> før indsendelse af en "
+"fejlrapport."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Undertryk yderligere fejldialoger for denne session."
+
+msgid "Unexpected Exception"
+msgstr "Uventet handling"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Du er stødt på en fejl i JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Du har oplevet en fejl i JOSM. Inden du indberetter en fejlrapport, skal du "
+"være sikker på, at du har opdateret til den seneste version af JOSM her:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Du bør også opdatere dine udvidelser. Hvis intet af dette hjælper, så opret "
+"en fejlrapport i vores fejlrapporteringssystem ved hjælp af dette link:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Her burde fejl-informationen nedenunder allerede være udfyldt for dig. "
+"Tilføj informationer om hvordan, fejlen kan reproduceres, og giv så mange "
+"detaljer som muligt."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Alternativt, hvis det ikke virker for dig, kan du manuelt udfylde "
+"informationerne nedenunder på denne URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Teksten er allerede kopieret til din udklipsholder.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Åbning af fejlrapport mislykkedes. Rapporter venligst manuelt ved hjælp af "
+"denne hjemmeside:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15861,14 +15879,14 @@ msgstr "Mapbox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr "OpenStreetMap Carto (Standard layer)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Black & White)"
@@ -15876,8 +15894,14 @@ msgstr "OpenStreetMap (Mapnik Black & White)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, no labels)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (French Style)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (German Style)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS Traces"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -15888,15 +15912,12 @@ msgstr "Public Transport (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (German Style)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -15993,6 +16014,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -16017,14 +16041,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: Echtfarbenbild 2015 (10cm)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Terrain model)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: Höhen und Gelände"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -16170,11 +16194,11 @@ msgstr "Géolittoral V2 - Orthophotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16228,6 +16252,15 @@ msgstr "Bavaria (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Berlin aerial photograph 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Berlin aerial photograph 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Berlin aerial photograph 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (aerial imagery)"
@@ -16243,17 +16276,6 @@ msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Physical map (natural regions)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Physical map (natural regions)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16299,6 +16321,9 @@ msgstr "Törökbálint ortophoto 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 "Danube flood ortophoto 2013"
msgstr "Danube flood ortophoto 2013"
@@ -16359,6 +16384,9 @@ msgstr "OSMIE T.ie Land not in Counties"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Lombardia - Italy (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardia - Italy (CTR DBT)"
@@ -16395,11 +16423,8 @@ msgstr "1.cikla ortofotokarte - Latvia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr "geoportail.lu"
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Railway"
@@ -16500,6 +16525,9 @@ msgstr "Powiat poznański: Budynki (buildings)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (Aerial image)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (buildings)"
@@ -16509,6 +16537,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (Aerial image)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (buildings)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr "Poznań: Ortofotomapa 2014 (aerial image)"
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (buildings)"
@@ -17217,6 +17248,13 @@ msgstr ""
"Denne udvidelse forenkler kortlægning og redigering af indendørs gange."
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Giver støtte ved kortlægningen af indendørs OSM bygningsdata. Indeholder en "
+"tjekker og en korttegningsstil til indendørs-data."
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18655,6 +18693,12 @@ msgstr "Gader"
msgid "Motorway"
msgstr "Motorvej"
+msgid "Destination"
+msgstr "Destination"
+
+msgid "Destination reference"
+msgstr "Destination reference"
+
msgid "Placement"
msgstr "Placering"
@@ -19246,9 +19290,6 @@ msgstr "Motorvejsafkørsel"
msgid "Number"
msgstr "Nummer"
-msgid "Exit to"
-msgstr "Afkørsel til"
-
msgid "Services"
msgstr "Motorvejsrasteplads"
@@ -19732,6 +19773,15 @@ msgstr "vadehavsområde"
msgid "mangrove"
msgstr "mangrove"
+msgid "wet_meadow"
+msgstr "våd eng"
+
+msgid "string_bog"
+msgstr "streng mose"
+
+msgid "saltern"
+msgstr "saltudvinding"
+
msgid "Mud"
msgstr "Mudder"
@@ -20885,6 +20935,9 @@ msgstr "Bålplads"
msgid "Fishing"
msgstr "Fiskeri"
+msgid "Bird Hide"
+msgstr "Fugleskjul"
+
msgid "Night Club"
msgstr "Natklub"
@@ -22153,6 +22206,10 @@ msgid "transformer_tower"
msgstr "transformatortårn"
msgctxt "building"
+msgid "public"
+msgstr "offentlig"
+
+msgctxt "building"
msgid "Levels"
msgstr "Etager"
@@ -23742,7 +23799,7 @@ msgstr "høm-høm-pose"
msgid "food"
msgstr "mad"
-msgid "news_papers"
+msgid "newspapers"
msgstr "aviser"
msgid "parking_tickets"
@@ -23757,7 +23814,7 @@ msgstr "køreplaner"
msgid "public_transport_tickets"
msgstr "transportbilletter"
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr "SIM-kort"
msgid "stamps"
@@ -25033,6 +25090,21 @@ msgstr "naturlig"
msgid "Walking Route"
msgstr "Gårute"
+msgid "Riding Route"
+msgstr "Riderute"
+
+msgid "ihn"
+msgstr "international ride netværk"
+
+msgid "nhn"
+msgstr "national ride netværk"
+
+msgid "rhn"
+msgstr "regional ride netværk"
+
+msgid "lhn"
+msgstr "lokal ride netværk"
+
msgid "Piste Route"
msgstr "Pisterute"
@@ -25057,9 +25129,6 @@ msgstr "alpint"
msgid "Detour Route"
msgstr "Omkørselsrute"
-msgid "Destination"
-msgstr "Destination"
-
msgid "Ref of the way this is a detour to"
msgstr "Ref på vejen dette er en omvej til"
@@ -25219,8 +25288,14 @@ msgstr "Camping"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Faldende husnumre i adresse interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr "Lige husnummer i ulige adresse interpolation."
+
+msgid "Odd housenumber in even address interpolation."
+msgstr "Ulige husnummer i selv adresse interpolation."
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr "Vej med {0}. Tag hver husnummer separat, hvis det er muligt."
msgid "{0} without {1}"
msgstr "{0} uden {1}"
@@ -25309,6 +25384,13 @@ msgstr ""
"Forkert brug af {0} tag. Fjern {1}, fordi det er klart at betegnelsen "
"mangler selv uden en ekstra tag."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+"{0} er uspecifik. Brug i stedet nøglen fixme, oplysninger om hvad der "
+"præcist skal rettes skal være i værdien af fixme."
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} er forældet. Brug i stedet en multipolygon."
@@ -25410,6 +25492,9 @@ msgstr "{0} skal være forbundet til en vej"
msgid "node connects waterway and bridge"
msgstr "node forbinder vandløb og bro"
+msgid "{0} node connected to a highway"
+msgstr "{0} punkt forbundet til en vej"
+
msgid "suspicious roundabout direction"
msgstr "rundkørsel med mistænkelig retning"
@@ -25419,6 +25504,16 @@ msgstr "{0} på et stort område"
msgid "{0} on a small area"
msgstr "{0} på et lille område"
+msgid "Too large building"
+msgstr "For stor bygning"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+"Punkt forbinder en højspændingsledning eller kabel med en genstand, der ikke "
+"er relateret til el infrastruktur."
+
msgid "abbreviated street name"
msgstr "forkortet gadenavn"
@@ -28091,7 +28186,7 @@ msgid "imported data from {0}"
msgstr "importerede data fra {0}"
msgid "No data found on device."
-msgstr "Intet data fundet på enheden."
+msgstr "Ingen data fundet på enheden."
msgid "Connection failed."
msgstr "Forbindelse fejlede."
@@ -28786,10 +28881,10 @@ msgid "Please open or create data layer before importing"
msgstr "Åbn eller skab datalag før importering"
msgid "Concourse wizard ..."
-msgstr ""
+msgstr "Guide til forhal ..."
msgid "Opens up a wizard to create a concourse"
-msgstr ""
+msgstr "Åbner en guide til at oprette en forhal"
msgid "Vertical layer:"
msgstr "Lodret lag:"
@@ -28800,6 +28895,69 @@ msgstr "Strukturtype:"
msgid "Offset into background:"
msgstr "Forskydning i baggrund:"
+msgid "Indoor Mapping Helper"
+msgstr "Indendørs Kortlægnings Helper"
+
+msgid "POWER"
+msgstr "TÆND"
+
+msgid "Activates the plug-in"
+msgstr "Aktiverer udvidelsen"
+
+msgid "Working Level"
+msgstr "Arbejds niveau"
+
+msgid "Selects the working level."
+msgstr "Vælg arbejds niveau."
+
+msgid "Level Name"
+msgstr "Niveau navn"
+
+msgid "Optional name-tag for a level."
+msgstr "Valgfri navne tag for et niveau."
+
+msgid "The object preset you want to tag."
+msgstr "Forudindstillet objektet du vil tag."
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr "Angiver navne tag når rum-objektet er valgt."
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr "Angiver ref tag når rum-objektet er valgt."
+
+msgid "Apply Tags"
+msgstr "Anvend tags"
+
+msgid "Fitting"
+msgstr "Montering"
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+"<html>Du kan begynde at montere dine bygningsplaner nu.<br>For at gøre "
+"dette, brug BilledLag udvidelsen, som du kan installere<br>ved hjælp af JOSM "
+"udvidelse styringen.</html>"
+
+msgid "Level Selection"
+msgstr "Niveau valg"
+
+msgid "Lowest Level"
+msgstr "Laveste niveau"
+
+msgid "The lowest level of your building."
+msgstr "Det laveste niveau af din bygning."
+
+msgid "Highest Level"
+msgstr "Højeste niveau"
+
+msgid "The highest level of your building."
+msgstr "Det højeste niveau af din bygning."
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr "Værktøjskasse til indendørs kortlægnings assistance"
+
msgid "InfoMode"
msgstr "Infotilstand"
@@ -31211,6 +31369,15 @@ msgstr "Offentlig transport: Aktiver waypoints"
msgid "Public Transport: Edit waypoint name"
msgstr "Offentlig transport: Rediger waypoint-navn"
+msgid "Distance between stops"
+msgstr "Afstand mellem stop"
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr "En gyldig public_transport:version=2 rute kræves"
+
+msgid "Invalid selection"
+msgstr "Ugyldigt valg"
+
msgid "Public transport routes"
msgstr "Offentlig transportrute"
@@ -32031,9 +32198,6 @@ msgstr "Lav bygning til rækkehuse"
msgid "Creates individual buildings from a long building."
msgstr "Opretter individuelle bygninger fra en aflang bygning"
-msgid "Invalid selection"
-msgstr "Ugyldigt valg"
-
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 "
@@ -33947,17 +34111,3 @@ msgstr "Kør afsted"
msgid "Drive a race car on this layer"
msgstr "Kør en racerbil på dette lag"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Ulovligt streg-mønster. Værdierne skal være positive."
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Ulovligt streg-mønster. Mindst en værdi skal være over > 0"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Kunne ikke fortolke korttegningsstile fra ''{0}''. Fejl var: [{1}: {2}] {3}"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index f531d32..22b5054 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-12 19:13+0000\n"
-"Last-Translator: holger (lp) <Unknown>\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-28 18:42+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore at googlemail.com>\n"
"Language-Team: JOSM\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:44+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:43+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -87,7 +87,7 @@ msgid "Initializing OSM API"
msgstr "OSM-API wird initialisiert"
msgid "Initializing validator"
-msgstr "Datenüberprüfung wird initialisiert"
+msgstr "Prüfer wird initialisiert"
msgid "Initializing presets"
msgstr "Objektvorlagen werden initialisiert"
@@ -156,9 +156,6 @@ msgstr "Java-Version {0}"
msgid "Homepage"
msgstr "Internetseite"
-msgid "Bug Reports"
-msgstr "Fehler melden"
-
msgid "Info"
msgstr "Info"
@@ -180,6 +177,12 @@ msgstr "Erweiterungen"
msgid "About JOSM..."
msgstr "Über JOSM …"
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Fehler melden"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Ressource ''{0}'' wurde nicht gefunden."
@@ -615,9 +618,6 @@ msgstr "Position der Hintergrundbildebene anpassen"
msgid "Adjust imagery offset"
msgstr "Hintergrundbildversatz anpassen"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1296,9 +1296,6 @@ msgstr "Die Datei auch umbenennen"
msgid "Could not rename file ''{0}''"
msgstr "Datei »{0}« konnte nicht umbenannt werden"
-msgid "Report bug"
-msgstr "Fehler melden"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Fehler im JOSM-Bugtracker melden"
@@ -1971,6 +1968,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Langsamer abspielen"
+msgid "Downloading changeset content"
+msgstr "Änderungssatzinhalt wird heruntergeladen"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Änderungssatz {2} wird heruntergeladen …"
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Inhalt von Änderungssatz {2} wird heruntergeladen …"
+
+msgid "Download changesets"
+msgstr "Änderungssätze herunterladen"
+
+msgid "Querying and downloading changesets"
+msgstr "Änderungssätze werden gesucht und heruntergeladen"
+
+msgid "Determine user id for current user..."
+msgstr "Benzuterkennung des aktuellen Benutzers herausfinden …"
+
+msgid "Query and download changesets ..."
+msgstr "Änderungssätze abfragen und herunterladen …"
+
+msgid "Errors during download"
+msgstr "Fehler beim Herunterladen"
+
msgid "Download GPS"
msgstr "GPS herunterladen"
@@ -2140,9 +2161,6 @@ msgstr ""
"Die folgenden Fehler sind während des kombinierten Herunterladens "
"aufgetreten: {0}"
-msgid "Errors during download"
-msgstr "Fehler beim Herunterladen"
-
msgid "Error during download"
msgstr "Fehler beim Herunterladen"
@@ -2500,11 +2518,11 @@ msgid "Add selection to relation"
msgstr "Auswahl zur Relation hinzufügen"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Auswahl zur Relation hinzufügen</strong>: Kontrollieren Sie "
-"jede Relation, um Schäden durch kaputte Relationen zu vermeiden!"
+"{0}Auswahl zur Relation hinzufügen{1}: Überprüfe jede einzelne Relation, um "
+"Schaden zu vermeiden!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3347,9 +3365,6 @@ msgstr "Konflikte in der Punktliste der Linie {0} auflösen"
msgid "Main dataset does not include node {0}"
msgstr "Hauptdatensatz enthält Punkt {0} nicht"
-msgid "Apply?"
-msgstr "Anwenden?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3377,27 +3392,6 @@ msgstr ""
"Beim Umkehren der Richtung dieses Weges werden folgende Änderungen "
"vorgeschlagen, um die Datenkonsistenz zu erhalten."
-msgid "Relation"
-msgstr "Relation"
-
-msgid "Old role"
-msgstr "Alte Rolle"
-
-msgid "New role"
-msgstr "Neue Rolle"
-
-msgid "Old key"
-msgstr "Alter Schlüssel"
-
-msgid "Old value"
-msgstr "Alter Wert"
-
-msgid "New key"
-msgstr "Neuer Schlüssel"
-
-msgid "New value"
-msgstr "Neuer Wert"
-
msgid "Apply selected changes"
msgstr "Ausgewählte Änderungen anwenden"
@@ -4575,6 +4569,9 @@ msgstr "Routenrelation enthält ''{0}'' Rolle"
msgid "Route relation contains a gap"
msgstr "Routenrelation enthält eine Lücke"
+msgid "Stop position not part of route"
+msgstr "Halteposition nicht Teil der Route"
+
msgid "Role verification problem"
msgstr "Problem bei Rollenprüfung"
@@ -5109,7 +5106,7 @@ msgid "Click to close the dialog"
msgstr "Klicken, um den Dialog zu schließen"
msgid "Imagery offset"
-msgstr "Hintergrundbild-Versatz"
+msgstr "Hintergrundbildversatz"
msgctxt "menu"
msgid "Imagery"
@@ -5177,7 +5174,7 @@ msgid "Print debugging messages to console"
msgstr "Debug-Nachrichten werden auf der Konsole ausgegeben"
msgid "Skip loading plugins"
-msgstr "Laden von Plugins überspringen"
+msgstr "Laden von Erweiterungen überspringen"
msgid "Disable access to the given resource(s), separated by comma"
msgstr "Zugriff zu folgende/n Ressource/n verweigern (kommagetrennt)"
@@ -5249,7 +5246,7 @@ msgid "Printing debugging messages to console"
msgstr "Debug-Nachrichten werden auf der Konsole ausgegeben"
msgid "Plugin loading skipped"
-msgstr "Plugin-Ladevorgang übersprungen"
+msgstr "Erweiterungen-Ladevorgang übersprungen"
msgid "Enabled detailed debug level (trace)"
msgstr "Detaillierte Debug-Nachrichten aktiviert (trace)"
@@ -5257,23 +5254,23 @@ msgstr "Detaillierte Debug-Nachrichten aktiviert (trace)"
msgid "Initializing"
msgstr "Initialisierungsvorgang"
-msgid "Updating plugins"
-msgstr "Plugins werden aktualisiert"
-
-msgid "Installing updated plugins"
-msgstr "Aktualisierte Plugins werden installiert"
-
-msgid "Loading early plugins"
-msgstr "Frühzeitige Plugins werden geladen"
-
msgid "Setting defaults"
msgstr "Voreinstellungen werden festgelegt"
msgid "Creating main GUI"
msgstr "Hauptoberfläche wird erzeugt"
+msgid "Updating plugins"
+msgstr "Erweiterungen werden aktualisiert"
+
+msgid "Installing updated plugins"
+msgstr "Aktualisierte Erweiterungen werden installiert"
+
+msgid "Loading early plugins"
+msgstr "Frühzeitige Erweiterungen werden geladen"
+
msgid "Loading plugins"
-msgstr "Plugins werden geladen"
+msgstr "Erweiterungen werden geladen"
msgid ""
"''{0}'' is not a valid value for argument ''{1}''. Possible values are {2}, "
@@ -5586,7 +5583,7 @@ msgstr ""
"einer festen Zoomstufe.</html>"
msgid "Zoom level:"
-msgstr "Vergrößerungsstufe:"
+msgstr "Zoomstufe:"
msgid "from tile"
msgstr "von Kachel"
@@ -6350,6 +6347,30 @@ msgstr "Nur Merkmale mit Konflikten anzeigen"
msgid "Show tags with multiple values only"
msgstr "Nur Merkmale mit mehreren Werten anzeigen"
+msgid "Apply?"
+msgstr "Anwenden?"
+
+msgid "Relation"
+msgstr "Relation"
+
+msgid "Old role"
+msgstr "Alte Rolle"
+
+msgid "New role"
+msgstr "Neue Rolle"
+
+msgid "Old key"
+msgstr "Alter Schlüssel"
+
+msgid "Old value"
+msgstr "Alter Wert"
+
+msgid "New key"
+msgstr "Neuer Schlüssel"
+
+msgid "New value"
+msgstr "Neuer Wert"
+
msgid "For selected objects only"
msgstr "Nur für ausgewählte Objekte"
@@ -6888,51 +6909,6 @@ msgstr "Ebenensichtbarkeit festlegen: {0}"
msgid "Open a list of all loaded layers."
msgstr "Liste aller geladenen Ebenen öffnen."
-msgid "Delete the selected layers."
-msgstr "Ausgewählte Ebenen löschen."
-
-msgid "Show/hide"
-msgstr "Anzeigen/Ausblenden"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Sichtbarkeit der Ebene umschalten."
-
-msgid "Show/hide layer"
-msgstr "Ebene anzeigen/ausblenden"
-
-msgid "Opacity"
-msgstr "Transparenz"
-
-msgid "Adjust opacity of the layer."
-msgstr "Deckkraft der Ebene anpassen."
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Gammawert der Ebene anpassen."
-
-msgid "Activate"
-msgstr "Aktivieren"
-
-msgid "Activate the selected layer"
-msgstr "Die ausgewählte Ebene aktivieren"
-
-msgid "Activate layer"
-msgstr "Aktivitätsebene"
-
-msgid "Merge this layer into another layer"
-msgstr "Aktuelle Ebene mit einer anderen Ebene verbinden"
-
-msgid "Duplicate this layer"
-msgstr "Diese Ebene verdoppeln"
-
-msgid "Copy of {0}"
-msgstr "Kopie von {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopie {1} von {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "Ebene ist zur Zeit sichtbar (klicken Sie, um die Ebene auszublenden)"
@@ -6958,12 +6934,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "diese Ebene hat keine native Auflösung"
-msgid "Move the selected layer one row up."
-msgstr "Gewählte Ebene eine Zeile nach oben verschieben."
-
-msgid "Move the selected layer one row down."
-msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
-
msgid "Information about layer"
msgstr "Ebeneninformation"
@@ -7132,7 +7102,7 @@ msgid ""
"<i>node</i>, {2} for <i>way</i>, and {3} for <i>relation</i>)"
msgstr ""
"Geben Sie Objekte im gemischten Modus so an: {0}<br/>({1} steht für "
-"<i>Knotenpunkt</i>, {2} für <i>Weg</i>, und {3} für <i>Relation</i>)"
+"<i>Punkt</i>, {2} für <i>Weg</i>, und {3} für <i>Relation</i>)"
msgid "Ranges of object IDs are specified with a hyphen, for instance: {0}"
msgstr ""
@@ -7410,15 +7380,6 @@ msgstr "Geschlossen am"
msgid "Discussions"
msgstr "Diskussionen"
-msgid "Downloading changeset content"
-msgstr "Änderungssatzinhalt wird heruntergeladen"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Änderungssatz {2} wird heruntergeladen …"
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Inhalt von Änderungssatz {2} wird heruntergeladen …"
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7536,9 +7497,6 @@ msgstr "Änderungssatzdiskussion vom OSM-Server aktualisieren"
msgid "Date"
msgstr "Datum"
-msgid "Download changesets"
-msgstr "Änderungssätze herunterladen"
-
msgid "{0} [incomplete]"
msgstr "{0} [unvollständig]"
@@ -7708,16 +7666,6 @@ msgid "Please enter an integer value > 0"
msgstr "Bitte geben Sie eine positive Ganzzahl ein"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Der Wert ist kein gültiger Benutzername.<br />Bitte geben Sie einen "
-"Benutzernamen ein.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Bitte einen Nutzernamen angeben"
-
-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 ""
@@ -7822,15 +7770,6 @@ msgstr "Ungültige Adresse für Änderungssatzanfrage"
msgid "Close the dialog and abort querying of changesets"
msgstr "Dialog schließen und Laden der Änderungssätze abbrechen"
-msgid "Querying and downloading changesets"
-msgstr "Änderungssätze werden gesucht und heruntergeladen"
-
-msgid "Determine user id for current user..."
-msgstr "Benzuterkennung des aktuellen Benutzers herausfinden …"
-
-msgid "Query and download changesets ..."
-msgstr "Änderungssätze abfragen und herunterladen …"
-
msgid "URL: "
msgstr "Adresse: "
@@ -7852,6 +7791,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Diese Adresse ist keine gültige Änderungssatzanfrage."
+msgid "Activate"
+msgstr "Aktivieren"
+
+msgid "Activate the selected layer"
+msgstr "Die ausgewählte Ebene aktivieren"
+
+msgid "Activate layer"
+msgstr "Aktivitätsebene"
+
+msgid "Delete the selected layers."
+msgstr "Ausgewählte Ebenen löschen."
+
+msgid "Duplicate this layer"
+msgstr "Diese Ebene verdoppeln"
+
+msgid "Copy of {0}"
+msgstr "Kopie von {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopie {1} von {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Sichtbarkeit der ausgewählten Ebene ändern."
+
+msgid "Show layer"
+msgstr "Ebene anzeigen"
+
+msgid "Adjust opacity of the layer."
+msgstr "Deckkraft der Ebene anpassen."
+
+msgid "Opacity"
+msgstr "Transparenz"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Gammawert der Ebene anpassen."
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Schärfe-/Weichzeichnungswert der Ebene anpassen."
+
+msgid "Sharpness"
+msgstr "Schärfe"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Farbsättigung der Ebene anpassen."
+
+msgid "Colorfulness"
+msgstr "Farbsättigung"
+
+msgid "Merge this layer into another layer"
+msgstr "Aktuelle Ebene mit einer anderen Ebene verbinden"
+
+msgid "Move the selected layer one row down."
+msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
+
+msgid "Move the selected layer one row up."
+msgstr "Gewählte Ebene eine Zeile nach oben verschieben."
+
+msgid "Show/hide"
+msgstr "Anzeigen/Ausblenden"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Sichtbarkeit der Ebene umschalten."
+
+msgid "Show/hide layer"
+msgstr "Ebene anzeigen/ausblenden"
+
msgid "Discardable key: selection Foreground"
msgstr "Überflüssiger Schlüssel: Auswahl-Vordergrund"
@@ -8181,13 +8189,13 @@ msgstr "Eltern-Relationen"
msgid "Child Relations"
msgstr "Kind-Relationen"
-msgid "Apply Role:"
-msgstr "Rolle anwenden:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
"Eine Rolle eingeben und diese auf die gewählten Relationselemente anwenden"
+msgid "Apply Role:"
+msgstr "Rolle anwenden:"
+
msgid "New Relation"
msgstr "Neue Relation"
@@ -10119,9 +10127,6 @@ msgstr "Hintergrundbild überblenden"
msgid "Unsupported imagery type: {0}"
msgstr "Nicht unterstützer Bildtyp: {0}"
-msgid "ERROR"
-msgstr "FEHLER"
-
msgid "Next marker"
msgstr "Nächste Markierung"
@@ -10261,7 +10266,7 @@ msgid "Invalid timezone"
msgstr "Ungültige Zeitzone"
msgid "Invalid offset"
-msgstr "Ungültiger Offset"
+msgstr "Ungültiger Versatz"
msgid "Correlate images with GPX track"
msgstr "Bilder mit GPS-Spur korrelieren"
@@ -10361,7 +10366,7 @@ msgid "Timezone: "
msgstr "Zeitzone: "
msgid "Offset:"
-msgstr "Offset:"
+msgstr "Versatz"
msgid "Correlate"
msgstr "Korrelieren"
@@ -10402,7 +10407,7 @@ msgid "Matching photos to track failed"
msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen."
msgid "Adjust timezone and offset"
-msgstr "Zeitzone und Offset anpassen"
+msgstr "Zeitzone und Versatz anpassen"
msgid "The selected photos do not contain time information."
msgstr "Die gewählten Bilder enthalten keine Zeitinformation."
@@ -10437,7 +10442,7 @@ msgid ""
"Error while parsing offset.\n"
"Expected format: {0}"
msgstr ""
-"Fehler beim Einlesen des Offsets.\n"
+"Fehler beim Einlesen des Versatzes.\n"
"Erwartetes Format: {0}"
msgid "Geotagged Images"
@@ -10780,8 +10785,8 @@ msgstr[1] "{0} besteht aus {1} Wegpunkten"
msgid "No existing audio markers in this layer to offset from."
msgstr ""
-"Keine bestehenden Audio-Marken in dieser Ebene gefunden, von denen der "
-"Offset abgeleitet werden könnte."
+"Keine bestehenden Audiomarken in dieser Ebene gefunden, von denen der "
+"Versatz abgeleitet werden könnte."
msgid "Show Text/Icons"
msgstr "Text/Symbole anzeigen"
@@ -11024,14 +11029,6 @@ msgstr "Die automatischen Autorisierungsschritte erneut starten"
msgid "Test Access Token"
msgstr "Zugriffskennung testen"
-msgid "Please enter your OSM user name"
-msgstr "Bitte geben Sie Ihren OSM-Benutzernamen ein"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Der Benutzername darf nicht leer sein. Bitte geben Sie Ihren OSM-"
-"Benutzernamen ein."
-
msgid "Please enter your OSM password"
msgstr "Bitte geben Sie Ihr OSM-Passwort ein"
@@ -11422,7 +11419,7 @@ msgid "Would you like to restart now?"
msgstr "Möchten Sie jetzt neu starten?"
msgid "Download plugins"
-msgstr "Plugins herunterladen"
+msgstr "Erweiterungen herunterladen"
msgid "Icon paths:"
msgstr "Bild-Verzeichnisse"
@@ -11464,7 +11461,7 @@ msgid "Preset definition file (*.xml, *.zip)"
msgstr "Objektvorlagen-Datei (*.xml, *.zip)"
msgid "Tag checker rule (*.validator.mapcss, *.zip)"
-msgstr "Eigenschaftsprüfer-Regel (*.validator.mapcss, *.zip)"
+msgstr "Merkmalsprüferregel (*.validator.mapcss, *.zip)"
msgid "Edit source entry:"
msgstr "Datenquelle ändern:"
@@ -11643,7 +11640,7 @@ msgid ""
"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
"Es sollen alle Einstellungen auf die Standardwerte zurückgesetzt "
-"werden.<br/>Alle Ihre Einstellungen werden gelöscht: Plugins, "
+"werden.<br/>Alle Ihre Einstellungen werden gelöscht: Erweiterungen, "
"Hintergrundbilder, Filter, Werkzeugleisteneinträge, Tastaturkürzel, "
"…<br/>Wollen Sie wirklich fortfahren?"
@@ -11976,7 +11973,7 @@ msgid "Everything"
msgstr "Alles"
msgid "Name or offset"
-msgstr "Name oder Offset"
+msgstr "Name oder Versatz"
msgid "None"
msgstr "Keine"
@@ -12686,14 +12683,14 @@ msgid "The default preset for JOSM"
msgstr "Die Standardvorlage von JOSM"
msgid "Plugin bundled with JOSM"
-msgstr "Plugin mit JOSM ausgeliefert"
+msgstr "Erweiterung mit JOSM ausgeliefert"
msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available plugins."
msgstr ""
"Klicken Sie auf <strong>Liste herunterladen</strong>, um die aktuelle "
-"Pluginliste herunterzuladen und anzuzeigen."
+"Erweiterungsliste herunterzuladen und anzuzeigen."
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
@@ -12707,36 +12704,38 @@ msgid " (requires: {0})"
msgstr " (erfordert: {0})"
msgid "Configure available plugins."
-msgstr "Verfügbare Plugins bearbeiten."
+msgstr "Verfügbare Erweiterungen konfigurieren."
msgid ""
"The following plugin has been downloaded <strong>successfully</strong>:"
msgid_plural ""
"The following {0} plugins have been downloaded <strong>successfully</strong>:"
msgstr[0] ""
-"Das folgende Plugin wurde <strong>erfolgreich</strong> heruntergeladen:"
+"Die folgende Erweiterung wurde <strong>erfolgreich</strong> heruntergeladen:"
msgstr[1] ""
-"Die folgenden {0} Plugins wurden <strong>erfolgreich</strong> "
+"Die folgenden {0} Erweiterungen wurden <strong>erfolgreich</strong> "
"heruntergeladen:"
msgid "Downloading the following plugin has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} plugins has <strong>failed</strong>:"
msgstr[0] ""
-"Das folgende Plugin konnte <strong>nicht</strong> heruntergeladen werden:"
-msgstr[1] ""
-"Die folgenden {0} Plugins konnten <strong>nicht</strong> heruntergeladen "
+"Die folgende Erweiterung konnte <strong>nicht</strong> heruntergeladen "
"werden:"
+msgstr[1] ""
+"Die folgenden {0} Erweiterungen konnten <strong>nicht</strong> "
+"heruntergeladen werden:"
msgid "<br>Error message(untranslated): {0}"
msgstr "<br>Fehlermeldung (englisch): {0}"
msgid "Please restart JOSM to activate the downloaded plugins."
msgstr ""
-"Bitte starten Sie JOSM neu, um die heruntergeladenen Plugins zu aktivieren."
+"Bitte starten Sie JOSM neu, um die heruntergeladenen Erweiterungen zu "
+"aktivieren."
msgid "Update plugins"
-msgstr "Plugins aktualisieren"
+msgstr "Erweiterungen aktualisieren"
msgid "Search:"
msgstr "Suche:"
@@ -12745,43 +12744,43 @@ msgid "Enter a search expression"
msgstr "Suchbegriff eingeben"
msgid "Plugin update policy"
-msgstr "Plugin-Aktualisierungsstrategie"
+msgstr "Erweiterungs-Aktualisierungsrichtlinie"
msgid "Accept the new plugin sites and close the dialog"
-msgstr "Neue Pluginseiten annehmen und Dialog schließen"
+msgstr "Neue Erweiterungensseiten annehmen und Dialog schließen"
msgid "Configure Plugin Sites"
-msgstr "Pluginquellen bearbeiten"
+msgstr "Erweiterungsquellen konfigurieren"
msgid "Download list"
msgstr "Liste herunterladen"
msgid "Download the list of available plugins"
-msgstr "Liste aller verfügbaren Plugins herunterladen"
+msgstr "Liste aller verfügbaren Erweiterungen herunterladen"
msgid "Update the selected plugins"
-msgstr "Ausgewählte Plugins aktualisieren"
+msgstr "Ausgewählte Erweiterungen aktualisieren"
msgid ""
"All installed plugins are up to date. JOSM does not have to download newer "
"versions."
msgstr ""
-"Alle installierten Plugins sind aktuell. JOSM muss keine neueren Versionen "
-"herunterladen."
+"Alle installierten Erweiterungen sind auf dem neuesten Stand. JOSM muss "
+"keine neueren Versionen herunterladen."
msgid "Plugins up to date"
-msgstr "Plugins sind aktuell"
+msgstr "Erweiterungen sind auf dem neuesten Stand"
msgid "Configure sites..."
msgstr "Quellen konfigurieren …"
msgid "Configure the list of sites where plugins are downloaded from"
msgstr ""
-"Konfiguration der Liste der Quellen, von denen Plugins heruntergeladen "
-"werden sollen"
+"Konfigurieren Sie die Liste der Quellen, von denen Erweiterungen "
+"heruntergeladen werden sollen"
msgid "Add JOSM Plugin description URL."
-msgstr "JOSM-Pluginbeschreibungsdatei hinzufügen."
+msgstr "JOSM-Erweiterungsbeschreibungs-URL hinzufügen."
msgid "Enter URL"
msgstr "Adresse eingeben"
@@ -12790,10 +12789,10 @@ msgid "Please select an entry."
msgstr "Bitte einen Eintrag wählen."
msgid "Edit JOSM Plugin description URL."
-msgstr "JOSM-Pluginbeschreibungsdatei ändern."
+msgstr "JOSM-Erweiterungsbeschreibungs-URL bearbeiten."
msgid "JOSM Plugin description URL"
-msgstr "URL der JOSM Plugin Beschreibung"
+msgstr "JOSM-Erweiterungsbeschreibungs-URL"
msgid "Ask before updating"
msgstr "Vor Aktualisierung fragen"
@@ -12808,8 +12807,8 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins at "
"startup after an update of JOSM itself."
msgstr ""
-"Bitte entscheiden, ob JOSM aktive Plugins nach der Aktualisierung von JOSM "
-"beim Start automatisch aktualisieren soll."
+"Bitte entscheiden Sie, ob JOSM aktive Erweiterungen nach der Aktualisierung "
+"von JOSM beim Start automatisch aktualisieren soll."
msgid "Update interval (in days):"
msgstr "Aktualisierungsintervall (in Tagen):"
@@ -12818,7 +12817,7 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins after a "
"certain period of time."
msgstr ""
-"Bitte entscheiden, ob JOSM aktive Plugins nach einer gewissen Zeit "
+"Bitte entscheiden Sie, ob JOSM aktive Erweiterungen nach einer gewissen Zeit "
"automatisch aktualisieren soll."
msgid "By Code (EPSG)"
@@ -13315,6 +13314,14 @@ msgstr "Verbindungseinstellungen"
msgid "Connection Settings for the OSM server."
msgstr "Verbindungseinstellungen für den OSM-Server."
+msgid "Please enter your OSM user name"
+msgstr "Bitte geben Sie Ihren OSM-Benutzernamen ein"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Der Benutzername darf nicht leer sein. Bitte geben Sie Ihren OSM-"
+"Benutzernamen ein."
+
msgid "Action"
msgstr "Aktion"
@@ -13343,7 +13350,7 @@ msgid "Changing keyboard shortcuts manually."
msgstr "Tastenkürzel manuell anpassen."
msgid "Data validator"
-msgstr "Datenprüfungs-Plugin"
+msgstr "Datenprüfer"
msgid ""
"An OSM data validator that checks for common errors made by users and editor "
@@ -13886,6 +13893,16 @@ msgstr ""
"Ungültiger Wert des Attributs ''{0}'' von Element ''{1}'' der "
"Servermöglichkeiten. ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Fehler beim Hinzufügen des Zertifikats {0} - Zertifikatsfingerabdruck stimmt "
+"nicht überein. {1} erwartet, aber war {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Zertifikat für TLS-Verbindungen hinzufügen: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
"Die Zeichenkette ''{0}'' konnte nicht in ein Datum umgewandelt werden."
@@ -14922,13 +14939,13 @@ msgid "Skip download"
msgstr "Herunterladen überspringen"
msgid "Download Plugin"
-msgstr "Plugin herunterladen"
+msgstr "Erweiterung herunterladen"
msgid "Skip Download"
msgstr "Herunterladen überspringen"
msgid "JOSM version {0} required for plugin {1}."
-msgstr "Für Plugin {1} wird JOSM-Version {0} benötigt."
+msgstr "Für Erweiterung {1} wird JOSM-Version {0} benötigt."
msgid "Download skipped"
msgstr "Herunterladen übersprungen"
@@ -14937,30 +14954,30 @@ msgid ""
"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
"download."
msgstr ""
-"Das Plugin {0} kann nicht heruntergeladen werden, da der Link unbekannt ist. "
-"Das Herunterladen wird übersprungen."
+"Die Erweiterung {0} kann nicht heruntergeladen werden, da der Link unbekannt "
+"ist. Das Herunterladen wird übersprungen."
msgid ""
"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
"URL. Skipping download."
msgstr ""
-"Das Plugin {0} kann nicht heruntergeladen werden, da der Link ''{1}'' keine "
-"gültige URL ist. Das Herunterladen wird übersprungen."
+"Die Erweiterung {0} kann nicht heruntergeladen werden, da der Link ''{1}'' "
+"keine gültige URL ist. Das Herunterladen wird übersprungen."
msgid "Failed to create plugin directory ''{0}''"
-msgstr "Erstellen des Plugin-Verzeichnisses ''{0}'' fehlgeschlagen"
+msgstr "Erstellen des Erweiterungsverzeichnisses ''{0}'' fehlgeschlagen"
msgid "Downloading Plugin {0}..."
-msgstr "Plugin {0} wird heruntergeladen …"
+msgstr "Erweiterung {0} wird heruntergeladen..."
msgid "An error occurred in plugin {0}"
-msgstr "Ein Fehler ist in dem Plugin {0} aufgetreten."
+msgstr "In der Erweiterung {0} ist ein Fehler aufgetreten."
msgid "integrated into main program"
msgstr "In Hauptprogramm integriert"
msgid "replaced by new {0} plugin"
-msgstr "ersetzt durch das neue Plugin {0}"
+msgstr "ersetzt durch die neue Erweiterung {0}"
msgid "no longer required"
msgstr "nicht länger benötigt"
@@ -14969,59 +14986,61 @@ 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:"
msgstr[0] ""
-"Das folgende Plugin wird nicht mehr benötigt und wurde abgeschaltet:"
+"Die folgende Erweiterung wird nicht mehr benötigt und wurde deaktiviert:"
msgstr[1] ""
-"Die folgenden Plugins werden nicht mehr benötigt und wurden abgeschaltet:"
+"Die folgenden Erweiterungen werden nicht mehr benötigt und wurden "
+"deaktiviert:"
msgid ""
"<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>"
msgstr ""
-"<html>Laden des Plugins \"{0}\" wurde angefordert.<br>Das Plugin wird nicht "
-"mehr gewartet und es ist sehr wahrscheinlich, dass es Fehler "
+"<html>Laden der Erweiterung \"{0}\" wurde angefordert.<br>Die Erweiterung "
+"wird nicht mehr gewartet und es ist sehr wahrscheinlich, dass es Fehler "
"verursacht.<br>Bitte deaktivieren Sie es.<br>Soll es aus den Einstellungen "
"entfernt werden?</html>"
msgid "Plugin update"
-msgstr "Plugin-Aktualisierung"
+msgstr "Erweiterungsaktualisierung"
msgid ""
"You updated your JOSM software.<br>To prevent problems the plugins should be "
"updated as well.<br><br>Update plugins now?"
msgstr ""
"Sie haben JOSM aktualisiert.<br>Zur Vermeidung von Problemen sollten die "
-"Plugins ebenfalls aktualisiert werden.<br><br>Plugins jetzt aktualisieren?"
+"Erweiterungen ebenfalls aktualisiert werden.<br><br>Erweiterungen jetzt "
+"aktualisieren?"
msgid "Last plugin update more than {0} days ago."
-msgstr "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen."
+msgstr "Letzte Aktualisierung der Erweiterungen vor mehr als {0} Tagen."
msgid ""
"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
"disabled."
msgstr ""
-"Plugin-Aktualisierung wird nach JOSM-Aktualisierung übersprungen. "
+"Erweiterungsaktualisierung wird nach JOSM-Aktualisierung übersprungen. "
"Automatische Aktualisierung beim Start ist deaktiviert."
msgid ""
"Skipping plugin update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
-"Plugin-Aktualisierung wird nach abgelaufenem Aktualisierungsintervall "
+"Erweiterungsaktualisierung wird nach abgelaufenem Aktualisierungsintervall "
"übersprungen. Automatische Aktualisierung beim Start ist deaktiviert."
msgid ""
"Running plugin update after JOSM upgrade. Automatic update at startup is "
"enabled."
msgstr ""
-"Plugin-Aktualisierung nach JOSM-Aktualisierung läuft. Automatische "
+"Erweiterungsaktualisierung nach JOSM-Aktualisierung läuft. Automatische "
"Aktualisierung beim Start ist aktiviert."
msgid ""
"Running plugin update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
-"Plugin-Aktualisierung nach abgelaufenem Aktualisierungsintervall läuft. "
+"Erweiterungsaktualisierung nach abgelaufenem Aktualisierungsintervall läuft. "
"Automatische Aktualisierung beim Start ist deaktiviert."
msgid ""
@@ -15031,21 +15050,24 @@ msgstr ""
"an."
msgid "Click to update the activated plugins"
-msgstr "Klicken Sie, um aktivierte Plugins zu aktualisieren"
+msgstr "Klicken Sie, um aktivierte Erweiterungen zu aktualisieren"
msgid "Skip update"
msgstr "Aktualisierung überspringen"
msgid "Click to skip updating the activated plugins"
-msgstr "Die Aktualisierung der aktivierten Plugins auslassen"
+msgstr ""
+"Klicken Sie, um das Aktualisieren der aktivierten Erweiterungen zu "
+"überspringen"
msgid ""
"Plugin {0} requires a plugin which was not found. The missing plugin is:"
msgid_plural ""
"Plugin {0} requires {1} plugins which were not found. The missing plugins "
"are:"
-msgstr[0] "Das Plugin {0} benötigt zusätzlich das folgende Plugin:"
-msgstr[1] "Das Plugin {0} benötigt zusätzlich die folgenden {1} Plugins:"
+msgstr[0] "Die Erweiterung {0} benötigt zusätzlich die folgende Erweiterung:"
+msgstr[1] ""
+"Die Erweiterung {0} benötigt zusätzlich die folgenden {1} Erweiterungen:"
msgid "Download and restart"
msgstr "Herunterladen und Neustarten"
@@ -15053,70 +15075,73 @@ msgstr "Herunterladen und Neustarten"
msgid "Click to download missing plugin and restart JOSM"
msgid_plural "Click to download missing plugins and restart JOSM"
msgstr[0] ""
-"Klicke, um das fehlende Plugin herunterzuladen und JOSM neuzustarten."
+"Klicken Sie, um die fehlende Erweiterung herunterzuladen und JOSM neu zu "
+"starten."
msgstr[1] ""
-"Klicke, um die fehlenden Plugins herunterzuladen und JOSM neuzustarten."
+"Klicken Sie, um die fehlenden Erweiterungen herunterzuladen und JOSM neu zu "
+"starten."
msgid "Click to continue without this plugin"
msgid_plural "Click to continue without these plugins"
-msgstr[0] "Klicke, um ohne dieses Plugin fortzufahren."
-msgstr[1] "Klicke, um ohne diese Plugins fortzufahren."
+msgstr[0] "Klicken Sie, um ohne diese Erweiterung fortzufahren."
+msgstr[1] "Klicken Sie, um ohne diese Erweiterungen fortzufahren."
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>Das Plugin {0} erfordert JOSM Version {1}. Die aktuelle JOSM-Version "
-"ist {2}.<br>Um dieses Plugin verwenden zu können, muss JOSM aktualisiert "
-"werden.</html>"
+"<html>Die Erweiterung {0} erfordert JOSM Version {1}. Die aktuelle JOSM-"
+"Version ist {2}.<br>Um diese Erweiterung verwenden zu können, muss JOSM "
+"aktualisiert werden.</html>"
msgid "Could not load plugin {0}. Delete from preferences?"
msgstr ""
-"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
+"Erweiterung {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
msgid "loading plugin ''{0}'' (version {1})"
-msgstr "Plugin ''{0}'' wird geladen (Version {1})"
+msgstr "Erweiterung ''{0}'' wird geladen (Version {1})"
msgid ""
"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
"not found.<br>Delete from preferences?</html>"
msgstr ""
-"<html>Plugin {0} konnte nicht geladen werden, da die <br>Hauptklasse ''{1}'' "
-"nicht gefunden wurde.<br>Aus den Einstellungen entfernen?</html>"
+"<html>Erweiterung {0} konnte nicht geladen werden, da die <br>Hauptklasse "
+"''{1}'' nicht gefunden wurde.<br>Aus den Einstellungen entfernen?</html>"
msgid "Loading plugins ..."
-msgstr "Plugins werden geladen …"
+msgstr "Erweiterung werden geladen …"
msgid "Checking plugin preconditions..."
-msgstr "Plugin-Anforderungen werden geprüft…"
+msgstr "Erweiterungsanforderungen werden geprüft…"
msgid "Loading plugin ''{0}''..."
-msgstr "Plugin {0} wird geladen …"
+msgstr "Erweiterung {0} wird geladen …"
msgid "JOSM could not find information about the following plugin:"
msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] "JOSM konnte keine Informationen über das folgende Plugin finden:"
+msgstr[0] ""
+"JOSM konnte keine Informationen über die folgende Erweiterung finden:"
msgstr[1] ""
-"JOSM konnte keine Informationen über die folgenden Plugins finden:"
+"JOSM konnte keine Informationen über die folgenden Erweiterungen finden:"
msgid "The plugin is not going to be loaded."
msgid_plural "The plugins are not going to be loaded."
-msgstr[0] "Dieses Plugin wird nicht geladen."
-msgstr[1] "Diese Plugins werden nicht geladen."
+msgstr[0] "Diese Erweiterung wird nicht geladen."
+msgstr[1] "Diese Erweiterungen werden nicht geladen."
msgid "Determine plugins to load..."
-msgstr "Herausfinden, welche Plugins geladen werden sollen …"
+msgstr "Zu ladene Erweiterungen ermitteln..."
msgid "Removing deprecated plugins..."
-msgstr "Veraltete Plugins entfernen …"
+msgstr "Veraltete Erweiterungen werden entfernt …"
msgid "Removing unmaintained plugins..."
-msgstr "Nicht mehr gepflegte Plugins werden entfernt…"
+msgstr "Nicht mehr gepflegte Erweiterungen werden entfernt..."
msgid "Updating the following plugin has failed:"
msgid_plural "Updating the following plugins has failed:"
-msgstr[0] "Das folgende Plugin konnte nicht aktualisiert werden:"
-msgstr[1] "Die folgenden Plugins konnten nicht aktualisiert werden:"
+msgstr[0] "Die folgende Erweiterung konnte nicht aktualisiert werden:"
+msgstr[1] "Die folgenden Erweiterungen konnten nicht aktualisiert werden:"
msgid ""
"Please open the Preference Dialog after JOSM has started and try to update "
@@ -15132,48 +15157,48 @@ msgstr[1] ""
"Sie deren Aktualisierung manuell durch."
msgid "Plugin update failed"
-msgstr "Plugin-Aktualisierung fehlgeschlagen"
+msgstr "Erweiterungsaktualisierung fehlgeschlagen"
msgid "Failed to find plugin {0}"
-msgstr "Plugin {0} konnte nicht gefunden werden"
+msgstr "Finden der Erweiterung {0} fehlgeschlagen"
msgid "Failed to download plugin information list"
-msgstr "Plugin-Informationen konnten nicht herunter geladen werden"
+msgstr "Herunterladen der Erweiterungsinformationsliste ist fehlgeschlagen"
msgid "Disable plugin"
-msgstr "Plugin abschalten"
+msgstr "Erweiterung deaktivieren"
msgid "Click to delete the plugin ''{0}''"
-msgstr "Plugin \"{0}\" entfernen"
+msgstr "Klicken Sie, um die Erweiterung \"{0}\" zu entfernen"
msgid "Keep plugin"
-msgstr "Plugin behalten"
+msgstr "Erweiterung behalten"
msgid "Click to keep the plugin ''{0}''"
-msgstr "Plugin \"{0}\" behalten"
+msgstr "Klicken Sie, um die Erweiterung \"{0}\" zu behalten"
msgid "Failed to delete outdated plugin ''{0}''."
-msgstr "Das Entfernen des veralteten Plugins {0} ist fehlgeschlagen."
+msgstr "Entfernen der veralteten Erweiterung {0} ist fehlgeschlagen."
msgid ""
"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
"JOSM is still going to load the old plugin version."
msgstr ""
-"Die Installation des heruntergeladenen Plugins {0} ist fehlgeschlagen. JOSM "
-"wird weiterhin die alte Version des Plugins nutzen."
+"Installation der heruntergeladenen Erweiterung {0} ist fehlgeschlagen. JOSM "
+"wird weiterhin die alte Version der Erweiterung nutzen."
msgid ""
"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
-"Die Installation des Plugins {0} aus der temporären Datei ''{1}'' ist "
+"Installation der Erweiterung {0} aus der temporären Datei ''{1}'' ist "
"fehlgeschlagen. {2}"
msgid ""
"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
"Renaming failed."
msgstr ""
-"Die Installation des Plugins {0} aus der temporären Datei ''{1}'' ist "
-"fehlgeschlagen. Die Datei konnte nicht umbenannt werden."
+"Installation der Erweiterung {0} aus der temporären Datei ''{1}'' ist "
+"fehlgeschlagen. Umbenennen fehlgeschlagen."
msgid "Update plugin"
msgstr "Erweiterung aktualisieren"
@@ -15182,32 +15207,32 @@ msgid "Click to update the plugin ''{0}''"
msgstr "Klicken Sie, um die Erweiterung ''{0}'' zu aktualisieren"
msgid "Click to disable the plugin ''{0}''"
-msgstr "Plugin \"{0}\" deaktivieren"
+msgstr "Klicken Sie, um die Erweiterung \"{0}\" zu deaktivieren"
msgid ""
"An unexpected exception occurred that may have come from the ''{0}'' plugin."
msgstr ""
-"Eine unvorhergesehene Fehlersituation trat auf, die das Plugin \"{0}\" "
+"Eine unvorhergesehene Fehlersituation trat auf, die die Erweiterung \"{0}\" "
"ausgelöst haben könnte."
msgid "According to the information within the plugin, the author is {0}."
-msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}."
+msgstr "Laut den Informationen in der Erweiterung ist der Autor {0}."
msgid ""
"Try updating to the newest version of this plugin before reporting a bug."
msgstr ""
-"Versuchen Sie zuerst eine Aktualisierung auf die neueste Version des "
-"Plugins, bevor Sie den Fehler melden."
+"Versuchen Sie zuerst eine Aktualisierung auf die neueste Version der "
+"Erweiterung, bevor Sie den Fehler melden."
msgid ""
"The plugin has been removed from the configuration. Please restart JOSM to "
"unload the plugin."
msgstr ""
-"Das Plugin wurde aus der Konfiguration entfernt. Bitte starten Sie JOSM neu, "
-"um das Plugin zu entfernen."
+"Die Erweiterung wurde aus der Konfiguration entfernt. Bitte starten Sie JOSM "
+"neu, um die Erweiterung zu entfernen."
msgid "Plugin information"
-msgstr "Plugin-Information"
+msgstr "Erweiterungsinformationen"
msgid "no description available"
msgstr "keine Beschreibung verfügbar"
@@ -15217,25 +15242,25 @@ msgid ""
"change it later)"
msgstr ""
"Nicht wieder fragen und meine Entscheidung merken (unter Einstellungen-"
-">Plugins später änderbar)"
+">Erweiterungen später änderbar)"
msgid "Invalid jar file ''{0}''"
msgstr "Ungültige JAR-Datei ''{0}''"
msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Die Plugin-Datei \"{0}\" enthält kein Manifest."
+msgstr "Die Erweiterungsdatei \"{0}\" enthält kein Manifest."
msgid "Invalid URL ''{0}'' in plugin {1}"
-msgstr "Ungültige URL ''{0}'' im Plugin {1}"
+msgstr "Ungültige URL ''{0}'' in Erweiterung {1}"
msgid "Invalid plugin description ''{0}'' in plugin {1}"
-msgstr "Ungültige Plugin-Beschreibung ''{0}'' im Plugin {1}"
+msgstr "Ungültige Erweiterungsbeschreibung ''{0}'' in Erweiterung {1}"
msgid "Invalid plugin main version ''{0}'' in plugin {1}"
-msgstr "Ungültige Plugin-Hauptversion ''{0}'' im Plugin {1}"
+msgstr "Ungültige Erweiterungs-Hauptversion ''{0}'' in Erweiterung {1}"
msgid "Missing plugin main version in plugin {0}"
-msgstr "Fehlende Plugin-Hauptversion im Plugin {0}"
+msgstr "Fehlende Erweiterungs-Hauptversion in Erweiterung {0}"
msgid "More info..."
msgstr "Weitere Informationen …"
@@ -15250,28 +15275,28 @@ msgstr ""
"»{0}« ist fehlgeschlagen."
msgid "Illegal entry in plugin list."
-msgstr "Nicht gültiger Eintrag in Erweiterungsliste."
+msgstr "Ungültiger Eintrag in Erweiterungsliste."
msgid "Reading local plugin information.."
-msgstr "Lokale Erweiterungsinformationen werden eingelesen …"
+msgstr "Lokale Erweiterungsinformationen werden eingelesen..."
msgid "Processing plugin site cache files..."
msgstr ""
-"Zwischengespeicherte Dateien der Erweiterungsquellen werden verarbeitet …"
+"Zwischengespeicherte Dateien der Erweiterungsquellen werden verarbeitet..."
msgid "Processing file ''{0}''"
msgstr "Datei »{0}« wird verarbeitet …"
msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Das Durchsuchen der Datei »{0}« nach Erweiterungsinformationen ist "
+"Durchsuchen der Datei »{0}« nach Erweiterungsinformationen ist "
"fehlgeschlagen. Datei wird übersprungen."
msgid "Processing plugin files..."
-msgstr "Erweiterungsdateien werden verarbeitet …"
+msgstr "Erweiterungsdateien werden verarbeitet..."
msgid "Download plugin list..."
-msgstr "Erweiterungsliste wird heruntergeladen …"
+msgstr "Erweiterungsliste herunterladen..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Erweiterungsliste wird von »{0}« heruntergeladen"
@@ -15292,7 +15317,7 @@ msgid ""
"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
"plugin site ''{1}''."
msgstr ""
-"Das Anlegen des Erweiterungsverzeichnisses »{0}« ist fehlgeschlagen. Die "
+"Anlegen des Erweiterungsverzeichnisses »{0}« ist fehlgeschlagen. Die "
"Erweiterungsliste der Erweiterungsseite »{1}« kann nicht zwischengespeichert "
"werden."
@@ -15307,11 +15332,11 @@ msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
-"Das Einlesen der Plugin-Liste der Quelle ''{0}'' ist fehlgeschlagen. Quelle "
-"wird ausgelassen. Die Fehlermeldung war: {1}"
+"Einlesen der Erweiterungsliste der Quelle ''{0}'' ist fehlgeschlagen. Seite "
+"wird übersprungen. Fehlermeldung war: {1}"
msgid "Processing plugin list from site ''{0}''"
-msgstr "Plugin-Liste von Seite ''{0}'' wird verarbeitet"
+msgstr "Erweiterungsliste von Seite ''{0}'' wird verarbeitet"
msgid "This is after the end of the recording"
msgstr "Ende der Aufzeichnung überschritten"
@@ -15322,81 +15347,6 @@ msgstr "Unbekannter Grund"
msgid "Error playing sound"
msgstr "Fehler bei der Klangausgabe"
-msgid "Do nothing"
-msgstr "Keine Aktion"
-
-msgid "Report Bug"
-msgstr "Programmfehler melden"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Ein unerwarteter Fehler trat auf.<br>Dies ist immer ein Programmierfehler. "
-"Falls Sie die<br>aktuelle Version von JOSM einsetzen, würden wir<br>uns über "
-"einen Fehlerbericht freuen."
-
-msgid "Update JOSM"
-msgstr "JOSM aktualisieren"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Ein unerwarteter Ausnahmefehler ist aufgetreten. Dies ist immer ein "
-"Programmierfehler. <br><br>Sie verwenden eine ältere Version von JOSM "
-"({0})<br> anstatt die aktuell geteste Version (<b>{1}</b>) zu verwenden: "
-"<br><br><b>Bitte aktualisieren Sie JOSM</b>, bevor Sie einen Fehlerbericht "
-"einreichen."
-
-msgid "Unexpected Exception"
-msgstr "Unerwarteter Fehler"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Weitere Fehlermeldungen für diese Sitzung unterdrücken."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Sie haben einen Fehler in JOSM entdeckt. Bitte stellen Sie sicher, dass Sie "
-"mit der aktuellsten Version von JOSM arbeiten, bevor Sie einen Fehlerbericht "
-"einreichen:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Sie sollten auch Ihre Plugins aktualisieren. Falls auch das nicht hilft, "
-"reichen Sie bitte einen Fehlerbericht mit dem Formular unter der folgenden "
-"Adresse ein:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Informationen über den entdeckten Fehler sollten bereits im Formular "
-"eingetragen sein. Bitte ergänzen Sie es mit Informationen, wie der Fehler "
-"reproduziert werden kann. Beschreiben Sie so detailliert wie möglich."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Falls dies nicht funktionieren sollte, können Sie alternativ dazu den "
-"Fehlerbericht im Formular unter der folgenden Adresse eintragen:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Sie sind auf einen Fehler in JOSM gestoßen."
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15773,9 +15723,6 @@ msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
"Zu viele Weiterleitungen für die URL zum Herunterladen gefunden. Abbruch."
-msgid "Fetching content..."
-msgstr "Inhalt abrufen …"
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Für die Sprache {0} konnte keine Übersetzung gefunden werden. Es wird {1} "
@@ -15999,6 +15946,87 @@ msgstr "Ungültige Geometrie wird ignoriert: {0}"
msgid "Failed to load XML schema."
msgstr "Laden des XML-Schemas fehlgeschlagen."
+msgid "Do nothing"
+msgstr "Keine Aktion"
+
+msgid "Report Bug"
+msgstr "Programmfehler melden"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Ein unerwarteter Fehler trat auf.<br>Dies ist immer ein Programmierfehler. "
+"Falls Sie die<br>aktuelle Version von JOSM einsetzen, würden wir<br>uns über "
+"einen Fehlerbericht freuen."
+
+msgid "Update JOSM"
+msgstr "JOSM aktualisieren"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Ein unerwarteter Ausnahmefehler ist aufgetreten. Dies ist immer ein "
+"Programmierfehler. <br><br>Sie verwenden eine ältere Version von JOSM "
+"({0})<br> anstatt die aktuell geteste Version (<b>{1}</b>) zu verwenden: "
+"<br><br><b>Bitte aktualisieren Sie JOSM</b>, bevor Sie einen Fehlerbericht "
+"einreichen."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Weitere Fehlermeldungen für diese Sitzung unterdrücken."
+
+msgid "Unexpected Exception"
+msgstr "Unerwarteter Fehler"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Sie sind auf einen Fehler in JOSM gestoßen."
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Sie haben einen Fehler in JOSM entdeckt. Bitte stellen Sie sicher, dass Sie "
+"mit der aktuellsten Version von JOSM arbeiten, bevor Sie einen Fehlerbericht "
+"einreichen:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Sie sollten auch Ihre Erweiterungen aktualisieren. Falls auch das nicht "
+"hilft, reichen Sie bitte einen Fehlerbericht mit dem Formular unter der "
+"folgenden Adresse ein:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Informationen über den entdeckten Fehler sollten bereits im Formular "
+"eingetragen sein. Bitte ergänzen Sie es mit Informationen, wie der Fehler "
+"reproduziert werden kann. Beschreiben Sie so detailliert wie möglich."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Falls dies nicht funktionieren sollte, können Sie alternativ dazu den "
+"Fehlerbericht im Formular unter der folgenden Adresse eintragen:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Automatisches Erstellen der Fehlermeldung fehlgeschlagen. Bitte melde den "
+"Fehler manuell mithilfe dieser Seite:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16350,14 +16378,14 @@ msgstr "Mapbox Satellitenbild"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS-Spuren"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Standardebene)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr "OpenStreetMap Carto (Standardebene)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Schwarz&Weiß)"
@@ -16365,8 +16393,14 @@ msgstr "OpenStreetMap (Mapnik Schwarz&Weiß)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, ohne Beschriftungen)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (Französischer Stil)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Deutscher Stil)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS-Spuren"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16377,15 +16411,12 @@ msgstr "Öffentlicher Personennahverkehr (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Deutscher Stil)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Kambodscha, Laos, Thailand, Vietnam zweisprachig"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT-Karte (Einblendung)"
@@ -16482,6 +16513,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte"
@@ -16506,14 +16540,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: Echtfarbenbild 2015 (10cm)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Geländemodell)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Oberflächenmodell)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: Höhen und Gelände"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV (Flandern) Luftbilder (deckt auch die Brüsseler Region mit ab)"
@@ -16659,11 +16693,11 @@ msgstr "Géolittoral V2 - Orthofotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr "Lyon - Orthofoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Lyon - Orthofoto 2012-03 10cm - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr "Lyon - Orthofoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Lyon - Orthofoto 2015-05 8cm - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - Orthofotos 2012 - 20 cm"
@@ -16716,6 +16750,15 @@ msgstr "Bayern (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bayern (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Berlin Luftbild 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Berlin Luftbild 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Berlin Luftbild 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (Luftbild)"
@@ -16732,18 +16775,6 @@ msgstr ""
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Alte Karte von Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Physische Karte (Naturräume)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
-"nutzen)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16789,6 +16820,9 @@ msgstr "Großturwall Orthofoto 2013"
msgid "5 cm resolution bald image"
msgstr "Unbelaubtes Bild in 5 cm-Auflösung"
+msgid "Törökbálint ortophoto 2015"
+msgstr "Törökbálint Orthofoto 2015"
+
msgid "Danube flood ortophoto 2013"
msgstr "Donauhochwasser-Orthofoto 2013"
@@ -16849,6 +16883,9 @@ msgstr "OSMIE Land nicht in Landkreisen"
msgid "Lodi - Italy"
msgstr "Lodi - Italien"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Lombardei - Italien (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardei - Italien (CTR DBT)"
@@ -16885,11 +16922,8 @@ msgstr "1. Version Orthophoto - Litauen"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Litauen)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr "geoportail.lu"
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Railway"
@@ -16919,7 +16953,7 @@ msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Luftbild"
msgid "Geoportal 2: Ortofotomapa (aerial image) WMTS"
-msgstr "Geoportal 2: Luftbildkarte WMTS"
+msgstr "Geoportal 2: Luftbild WMTS"
msgid "Geoportal 2: PRNG (geo names)"
msgstr "Geoportal 2: PRNG (Geonamen)"
@@ -16952,10 +16986,10 @@ msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
msgstr "Częstochowa: Luftbild 2011"
msgid "Częstochowa: Ortofotomapa 2013 (aerial image)"
-msgstr "Tschenstochau: Luftbildkarte 2013"
+msgstr "Tschenstochau: Luftbild 2013"
msgid "Częstochowa: Ortofotomapa 2014 (aerial image)"
-msgstr "Tschenstochau: Luftbildkarte 2014"
+msgstr "Tschenstochau: Luftbild 2014"
msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
msgstr "Gliwice: Luftbild 2013"
@@ -16988,7 +17022,10 @@ msgid "Powiat poznański: Budynki (buildings)"
msgstr "Landkreis Poznański: Gebäude"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
-msgstr "Landkreis Posen: Luftbildkarte"
+msgstr "Landkreis Posen: Luftbild"
+
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Powiat ropczycko-sędziszowski: Budynki (Gebäude)"
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Landkreis Rzeszowski: Gebäude"
@@ -16999,6 +17036,9 @@ msgstr "Landkreis Rzeszowski: Luftbild"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Landkreis Stalowowolski: Gebäude"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr "Posen: Luftbild 2014"
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Gebäude"
@@ -17021,13 +17061,13 @@ msgid "Siemianowice Śląskie: Budynki (buildings)"
msgstr "Siemianowitz: Gebäude (buildings)"
msgid "Świętochłowice: Ortofotomapa 2008 (aerial image)"
-msgstr "Schwientochlowitz: Luftbildkarte 2008"
+msgstr "Schwientochlowitz: Luftbild 2008"
msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
msgstr "Świętochłowice: Luftbild 2009"
msgid "Świętochłowice: Ortofotomapa 2012 (aerial image)"
-msgstr "Schwientochlowitz: Luftbildkarte 2012"
+msgstr "Schwientochlowitz: Luftbild 2012"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Luftbild 2011"
@@ -17036,7 +17076,7 @@ msgid "trail.pl: Szlaki (paths)"
msgstr "trail.pl: Szlaki (Pfade)"
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
-msgstr "Wrocław: Ortofotomapa 2015 (aerial image)"
+msgstr "Breslau: Luftbild 2015"
msgid "ScanEx IRS"
msgstr "ScanEx IRS"
@@ -17530,7 +17570,8 @@ msgstr "Erleichtert das Zeichnen von Gebäuden"
msgid "A special handler for the French land registry WMS server."
msgstr ""
-"Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
+"Eine spezielle Erweiterung für die WMS-Server der französischen "
+"Landesvermessung."
msgid ""
"Overlays the canvec tile grid on the map and prints URL''s to the .zip "
@@ -17597,7 +17638,7 @@ msgid ""
"This plugin directly upload GPS Traces from current active layer in JOSM to "
"openstreetmap.org."
msgstr ""
-"Dieses Plugin lädt GPS-Spuren der aktiven Ebene von JOSM direkt zu "
+"Diese Erweiterung lädt GPS-Spuren der aktiven Ebene von JOSM direkt zu "
"openstreetmap.org hoch."
msgid "Downloads OSM data along a way"
@@ -17686,30 +17727,37 @@ msgstr ""
"einer Schaltfläche."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMS-Plugin ähnlicher Modus zum Kartenverschieben"
+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 "
"matches the filename of an image."
msgstr ""
-"Ein weiteres Plugin, um Wegpunkten in einer GPX-Datei Bilder zuzuordnen. "
-"Eine Übereinstimmung wird gefunden, wenn eines der Attribute ''name'', "
-"''cmt'' oder ''desc'' eines Wegpunktes mit dem Dateinamen des Bildes "
-"übereinstimmt."
+"Eine weitere Erweiterung, um Wegpunkten in einer GPX-Datei Bilder "
+"zuzuordnen. Eine Übereinstimmung wird gefunden, wenn eines der Attribute "
+"''name'', ''cmt'' oder ''desc'' eines Wegpunktes mit dem Dateinamen des "
+"Bildes übereinstimmt."
msgid "Plugin for importing spatial referenced images"
-msgstr "Plugin zum Import georeferenzierter Bilder"
+msgstr "Erweiterung zum Import georeferenzierter Bilder"
msgid "Import vector graphics (SVG)"
msgstr "Vektorgrafiken (SVG) importieren"
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
-"Dieses Plugin erleichtert das Kartieren und Bearbeiten von Fluren in "
+"Diese Erweiterung erleichtert das Kartieren und Bearbeiten von Fluren in "
"Gebäuden."
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Gibt Unterstützung für den Kartierungsprozess von OSM-Innengebäudedaten. "
+"Verfügt über einen Prüfer und einen Kartenstil für Innendaten."
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17757,9 +17805,9 @@ msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
-"Stellt die Log4j-Bibliothek für andere JOSM-Plugins bereit. Nicht bestimmt "
-"zur direkten Installation durch Benutzer, sondern als Abhängigkeit für "
-"andere Erweiterungen."
+"Stellt die Log4j-Bibliothek für andere JOSM-Erweiterungen bereit. Nicht "
+"bestimmt zur direkten Installation durch Benutzer, sondern als Abhängigkeit "
+"für andere Erweiterungen."
msgid ""
"The MapDust Plug-In shows the MapDust bug reports on the map. You can "
@@ -17805,7 +17853,7 @@ msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
"and is hard to rid of)"
msgstr ""
-"Verhindert die Verwendung von JOSM für immer (WARNUNG: Dieses Plugin "
+"Verhindert die Verwendung von JOSM für immer (WARNUNG: Diese Erweiterung "
"verhindert den Start von JOSM und ist schwierig loszuwerden)"
msgid "Convert data from Open Data portals to OSM layer"
@@ -17884,7 +17932,7 @@ msgstr "Ergänzt Projektionen von Proj4J"
msgid ""
"This plugin simplifies the mapping and editing of public transport routes."
msgstr ""
-"Dieses Plugin erleichtert das Erfassen und Editieren von Routen des "
+"Dies Erweiterung erleichtert das Erfassen und Bearbeiten von Routen des "
"öffentlichen Verkehrs."
msgid "Displays stops of selected public transport routes as graph"
@@ -17904,7 +17952,7 @@ msgstr ""
"Werkzeuge zum Erstellen und Ändern von Relationen und Multipolygonen."
msgid "Plugin for reverting changesets"
-msgstr "Plugin zum Umkehren von Änderungssätzen"
+msgstr "Erweiterung zum rückgängig machen von Änderungssätzen"
msgid ""
"Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -17912,7 +17960,7 @@ msgid ""
"properties window. Available country presets: Belgium, Germany, Poland, "
"Slovakia, Spain."
msgstr ""
-"Plugin zum Erfassen von Objekten basierend auf einer Auswahl mittels "
+"Erweiterung zum Erfassen von Objekten basierend auf einer Auswahl mittels "
"Straßenzeichen. Der Dialog kann durch Klicken auf ein kleines Bild in der "
"oberen rechten Ecke des Eigenschaftsdialoges geöffnet werden. Verfügbare "
"Vorlagen für Länder: Belgien, Deutschland, Polen, Slowakei, Spanien."
@@ -17922,7 +17970,7 @@ msgid ""
"defined in routes.xml file in plugin directory"
msgstr ""
"Stellt Routen (Bus, Wanderwege, Fahrradwege, …) dar. Routentypen müssen in "
-"der Datei routes.xml im Pluginverzeichnis definiert sein."
+"der Datei routes.xml im Erweiterungsverzeichnis definiert sein."
msgid "Provides routing capabilities."
msgstr "Bietet Routenführungsmöglichkeiten."
@@ -18013,7 +18061,7 @@ msgstr ""
"laufenden Tracer2Server."
msgid "Plugin to digital sign OSM-Data"
-msgstr "Plugin zum digitalen Signieren von OSM-Daten"
+msgstr "Erweiterung zum digitalen Signieren von OSM-Daten"
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -18025,8 +18073,8 @@ msgid ""
"The turnrestrictions plugin allows to enter maintain information about turn "
"restrictions in the OpenStreetMap database."
msgstr ""
-"Das Plugin für Abbiegeeinschränkungen erlaubt die Erstellung und Pflege von "
-"Abbiegeeinschränkungen in der OpenStreetMap-Datenbank."
+"Die Erweiterung für Abbiegeeinschränkungen erlaubt die Erstellung und Pflege "
+"von Abbiegeeinschränkungen in der OpenStreetMap-Datenbank."
msgid "Allows undeleting object from OSM database"
msgstr "Erlaubt es, Objekte der OSM-Datenbank wiederherzustellen"
@@ -18039,16 +18087,16 @@ msgid ""
"georeferenced video against a GPS track, to use it for identify visible "
"objects."
msgstr ""
-"(Dieses Plugin befindet sich derzeit noch in der Entwicklung!!!) Verbindet "
-"und synchronisiert ein koordinatenbezogenes Video mit einer GPS-Spur, um "
-"sichtbare Objekte zu identifizieren."
+"(Diese Erweiterung befindet sich derzeit noch in der Entwicklung!!!) "
+"Verbindet und synchronisiert ein koordinatenbezogenes Video mit einer GPS-"
+"Spur, um sichtbare Objekte zu identifizieren."
msgid ""
"Supports downloading tiled, scanned maps from walking-papers.org. This "
"plugin is still under early development and may be buggy."
msgstr ""
"Unterstützt das Herunterladen von gescannten Karten von walking-papers.org. "
-"Dieses Plug-in ist noch in einer frühen Entwicklungsphase und kann "
+"Diese Erweiterung ist noch in einer frühen Entwicklungsphase und kann "
"fehlerhaft sein."
msgid "Easy downloading along a long set of interconnected ways"
@@ -18948,7 +18996,7 @@ msgid "Branch operator"
msgstr "Betreiber der Nebenstromleitung"
msgid "Amount of Cables"
-msgstr "Anzahl Leitungen"
+msgstr "Anzahl der Leiter"
msgid "Amount of circuits"
msgstr "Anzahl der Stromkreise"
@@ -19159,6 +19207,12 @@ msgstr "Straßen"
msgid "Motorway"
msgstr "Autobahn"
+msgid "Destination"
+msgstr "Richtung"
+
+msgid "Destination reference"
+msgstr "Zielreferenz"
+
msgid "Placement"
msgstr "Platzierung"
@@ -19753,9 +19807,6 @@ msgstr "Anschlussstelle"
msgid "Number"
msgstr "Nummer"
-msgid "Exit to"
-msgstr "Ausfahrt nach"
-
msgid "Services"
msgstr "Raststätte"
@@ -20241,6 +20292,15 @@ msgstr "Watt"
msgid "mangrove"
msgstr "Mangroven"
+msgid "wet_meadow"
+msgstr "Feuchtwiese"
+
+msgid "string_bog"
+msgstr "Aapamoor"
+
+msgid "saltern"
+msgstr "Saline"
+
msgid "Mud"
msgstr "Schlick & Moor"
@@ -20799,7 +20859,7 @@ msgid "shed"
msgstr "Unterstand"
msgid "stands"
-msgstr "Ständer"
+msgstr "Bügel"
msgid "wall_loops"
msgstr "Metall-Mehrfach"
@@ -20842,7 +20902,7 @@ msgid "Public Transport"
msgstr "Öffentlicher Verkehr"
msgid "Public Transport Route (Rail)"
-msgstr "Öffentliche Verkehrsroute (Eisenbahn)"
+msgstr "Öffentliche Verkehrsroute (Schiene)"
msgid "Route type"
msgstr "Routentyp"
@@ -21394,6 +21454,9 @@ msgstr "Feuerstelle"
msgid "Fishing"
msgstr "Angeln"
+msgid "Bird Hide"
+msgstr "Vogelbeobachtungsturm"
+
msgid "Night Club"
msgstr "Nachtclub"
@@ -22662,6 +22725,10 @@ msgid "transformer_tower"
msgstr "Transformatorenturm"
msgctxt "building"
+msgid "public"
+msgstr "Öffentliches Gebäude"
+
+msgctxt "building"
msgid "Levels"
msgstr "Stockwerke"
@@ -22947,7 +23014,7 @@ msgid "Monitoring:"
msgstr "Beobachtung:"
msgid "Water level"
-msgstr "Pegel/Wasserstand"
+msgstr "Wasserstand"
msgid "Tide Level"
msgstr "Gezeitenhub"
@@ -23668,11 +23735,11 @@ msgstr "Portal"
msgctxt "power"
msgid "portal_two-level"
-msgstr "portal_two-level"
+msgstr "Portal zweistufig"
msgctxt "power"
msgid "portal_three-level"
-msgstr "portal_three-level"
+msgstr "Portal dreistufig"
msgid "Power Tower"
msgstr "Strommast"
@@ -23729,11 +23796,11 @@ msgstr "Mastkonstruktion"
msgctxt "power"
msgid "one-level"
-msgstr "one-level"
+msgstr "einstufig"
msgctxt "power"
msgid "two-level"
-msgstr "two-level"
+msgstr "zweistufig"
msgctxt "power"
msgid "donau"
@@ -23741,7 +23808,7 @@ msgstr "donau"
msgctxt "power"
msgid "three-level"
-msgstr "three-level"
+msgstr "dreistufig"
msgctxt "power"
msgid "barrel"
@@ -23761,19 +23828,19 @@ msgstr "flag"
msgctxt "power"
msgid "donau;one-level"
-msgstr "donau;one-level"
+msgstr "donau;einstufig"
msgctxt "power"
msgid "four-level"
-msgstr "four-level"
+msgstr "vierstufig"
msgctxt "power"
msgid "six-level"
-msgstr "six-level"
+msgstr "sechsstufig"
msgctxt "power"
msgid "nine-level"
-msgstr "nine-level"
+msgstr "neunstufig"
msgctxt "power"
msgid "delta"
@@ -23781,7 +23848,7 @@ msgstr "Delta"
msgctxt "power"
msgid "delta_two-level"
-msgstr "delta_two-level"
+msgstr "Delta zweistufig"
msgctxt "power"
msgid "y-frame"
@@ -23848,7 +23915,7 @@ msgid "minor_line"
msgstr "Freileitung für Nieder- oder Mittelspannung"
msgid "Number of conductors/wires per cable"
-msgstr "Anzahl an Adern/Leitern je Kabel"
+msgstr "Anzahl der Leiterseile pro Leiter"
msgctxt "power"
msgid "single"
@@ -24251,7 +24318,7 @@ msgstr "Hundekot-Tüten"
msgid "food"
msgstr "Essen"
-msgid "news_papers"
+msgid "newspapers"
msgstr "Zeitungen"
msgid "parking_tickets"
@@ -24266,7 +24333,7 @@ msgstr "Pläne des öffentlichen Nahverkehrs"
msgid "public_transport_tickets"
msgstr "Fahrscheine"
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr "SIM-Karten"
msgid "stamps"
@@ -25506,7 +25573,7 @@ msgid "Routes"
msgstr "Routen"
msgid "Bicycle Route"
-msgstr "Fernradweg"
+msgstr "Fahrradroute"
msgid "icn"
msgstr "international"
@@ -25521,10 +25588,10 @@ msgid "lcn"
msgstr "lokal"
msgid "Mountain Biking Route"
-msgstr "Mountainbike-Route"
+msgstr "Mountainbikeroute"
msgid "Hiking Route"
-msgstr "Wanderweg"
+msgstr "Wanderroute"
msgid "iwn"
msgstr "international"
@@ -25545,10 +25612,25 @@ msgid "natural"
msgstr "Natur"
msgid "Walking Route"
-msgstr "Wanderroute"
+msgstr "Wanderweg"
+
+msgid "Riding Route"
+msgstr "Reitroute"
+
+msgid "ihn"
+msgstr "international"
+
+msgid "nhn"
+msgstr "national"
+
+msgid "rhn"
+msgstr "regional"
+
+msgid "lhn"
+msgstr "lokal"
msgid "Piste Route"
-msgstr "Pisten-Route"
+msgstr "Pistenroute"
msgid "link segment"
msgstr "Verbindungs-Abschnitt"
@@ -25563,7 +25645,7 @@ msgid "entry points"
msgstr "Eingangspunkt"
msgid "Ski Route"
-msgstr "Ski-Route"
+msgstr "Skiroute"
msgid "alpine"
msgstr "alpin"
@@ -25571,9 +25653,6 @@ msgstr "alpin"
msgid "Detour Route"
msgstr "Umleitungsstrecke"
-msgid "Destination"
-msgstr "Richtung"
-
msgid "Ref of the way this is a detour to"
msgstr "Ref des Weges, für den dies eine Umleitung ist"
@@ -25581,13 +25660,13 @@ msgid "fork node for alternative routes"
msgstr "Abzweigung für alternative Routen"
msgid "Power Route"
-msgstr "Strom-Route"
+msgstr "Stromroute"
msgid "Railway Route"
-msgstr "Eisenbahn-Route"
+msgstr "Eisenbahnroute"
msgid "Road Route"
-msgstr "Straßen-Route"
+msgstr "Straßenroute"
msgid "Route Network"
msgstr "Netzwerk"
@@ -25733,8 +25812,14 @@ msgstr "Camping"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Absteigende Hausnummern in Adressinterpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr "Gerade Hausnummer in einer ungeraden Adressinterpolation."
+
+msgid "Odd housenumber in even address interpolation."
+msgstr "Ungerade Hausnummer in einer geraden Adressinterpolation."
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr "Linie mit {0}. Erfasse wenn möglich jede Hausnummer einzeln."
msgid "{0} without {1}"
msgstr "{0} ohne {1}"
@@ -25824,6 +25909,13 @@ msgstr ""
"Falsche Verwendung von Merkmal {0}. Entfernen Sie {1}, weil klar ist, dass "
"der Name auch ohne ein zusätzliches Merkmal noch fehlt."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+"{0} ist unspezifisch. Nutze stattdessen den Schlüssel fixme mit der "
+"Information, was genau verbessert werden soll, im Wert von fixme."
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} ist veraltet. Bitte verwenden Sie stattdessen ein Multipolygon."
@@ -25932,6 +26024,9 @@ msgstr "{0} muss mit einer Linie verbunden sein"
msgid "node connects waterway and bridge"
msgstr "Punkt verbindet Wasserstraße und Brücke"
+msgid "{0} node connected to a highway"
+msgstr "{0}-Punkt mit einer Straße verbunden"
+
msgid "suspicious roundabout direction"
msgstr "verdächtige Kreisverkehrrichtung"
@@ -25941,6 +26036,16 @@ msgstr "{0} an einer großen Fläche"
msgid "{0} on a small area"
msgstr "{0} an einer kleinen Fläche"
+msgid "Too large building"
+msgstr "Zu großes Gebäude"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+"Punkt verbindet eine Stromleitung oder Stromkabel mit einem Objekt, welches "
+"nicht zur Strominfrastruktur gehört."
+
msgid "abbreviated street name"
msgstr "Abgekürzter Straßenname"
@@ -27084,13 +27189,13 @@ msgid ""
"...or it rather should be called <br>\n"
"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
msgstr ""
-"Willkommen beim</span><br>\n"
+"Willkommen bei der</span><br>\n"
"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
-"85, 0);\">S</span>-Plugin (Linienausrichten-Plugin)<br>\n"
+"85, 0);\">S</span>-Erweiterung (Linienausrichtungs-Erweiterung<br>\n"
"</span><span style=\"font-size: medium;\"><br>\n"
"… oder besser gesagt sollte es <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span>-Plugin "
-"(Linienabschnittausrichten-Plugin) genannt werden …"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span>-Erweiterung "
+"(Linienabschnittausrichtungs-Erweiterung) genannt werden …"
msgid ""
"<html>\n"
@@ -27596,8 +27701,8 @@ msgid ""
"configuration.\n"
"Layers ''Building'' and ''Parcel'' added by default."
msgstr ""
-"Bitte mindestens zwei WMS-Ebenen in den Einstellungen des Plugins cadastre-"
-"fr wählen.\n"
+"Bitte mindestens zwei WMS-Ebenen in den Einstellungen der Erweiterung "
+"cadastre-fr wählen.\n"
"Die Ebenen ''Building'' (Gebäude) und ''Parcel'' (Grundstück) sind "
"standardmäßig gewählt."
@@ -27612,9 +27717,9 @@ msgid ""
"the current projection to one of the cadastre\n"
"projections and retry"
msgstr ""
-"Um das Kataster-WMS-Plugin zu aktivieren, muss\n"
-"die derzeitige Projektion in eine von Cadastre\n"
-"unterstützte Projektion geändert werden."
+"Um die Kataster-WMS-Erweiterung zu aktivieren,\n"
+"muss die derzeitige Projektion in eine von\n"
+"Cadastre unterstützte Projektion geändert werden."
msgid "Change the current projection"
msgstr "Die aktuelle Projektion ändern"
@@ -27703,7 +27808,7 @@ msgstr ""
"Französisch):<br><a "
"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
"l\">http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</"
-"a><br>bevor Sie Daten, die mit Hilfe dieses Plugins erstellt wurden, "
+"a><br>bevor Sie Daten, die mit Hilfe dieser Erweiterung erstellt wurden, "
"hochladen."
msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
@@ -27952,8 +28057,8 @@ msgstr ""
msgid ""
"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-"Die ausgewählte Datei {0} ist keine Zwischenspeicherdatei dieses Plugins "
-"(ungültige Dateiendung)"
+"Die ausgewählte Datei {0} ist keine Zwischenspeicherdatei von dieser "
+"Erweiterung (ungültige Dateiendung)"
msgid "The location {0} is already on screen. Cache not loaded."
msgstr "Der Ort {0} wird bereits angezeigt. Zwischenspeicher nicht geladen."
@@ -28084,10 +28189,10 @@ msgstr ""
"Bitte eine auswählen und erneut versuchen."
msgid "Reset offset"
-msgstr "Offset zurücksetzen"
+msgstr "Versatz zurücksetzen"
msgid "Reset offset (only vector images)"
-msgstr "Offset zurücksetzen (Nur Vektorbilder)"
+msgstr "Versatz zurücksetzen (Nur Vektorbilder)"
msgid "Blank Layer"
msgstr "Leere Ebene"
@@ -28167,7 +28272,7 @@ msgid "Conflation"
msgstr "Zusammenführung"
msgid "Activates the conflation plugin"
-msgstr "Aktiviert das Zusammenführungs-Plugin"
+msgstr "Aktiviert die Zusammenführungserweiterung"
msgid "Matches"
msgstr "Übereinstimmungen"
@@ -28319,8 +28424,8 @@ msgid ""
"If this plugin is active at startup. This default state will not change when "
"you are toggeling the plugin with the menu option."
msgstr ""
-"Ob diese Erweiterung beim Start aktiv ist. Diese Vorgabe wird durch ein-"
-"/ausschalten der Erweiterung mittels Menüoption nicht verändert."
+"Ob diese Erweiterung beim Start aktiv ist. Diese Vorgabe wird durch Ein-"
+"/Ausschalten der Erweiterung mittels Menüoption nicht verändert."
msgid ""
"Maximum number of threads used for downloading, increasing this will cause "
@@ -28927,7 +29032,7 @@ msgstr "Graphenanzeige"
msgid "Settings for the Graphview plugin that visualizes routing graphs."
msgstr ""
-"Einstellungen für das Graphenanzeige-Plugin, welches Routinggraphen "
+"Einstellungen für die Graphenanzeigeerweiterung, welches Routinggraphen "
"visualisiert."
msgid "Ruleset"
@@ -28995,7 +29100,7 @@ msgid "Choose arrowhead fill color"
msgstr "Füllfarbe für Pfeilspitzen auswählen"
msgid "Routing graph calculated by the GraphView plugin"
-msgstr "Vom Graphenanzeige-Plugin berechneter Routinggraph"
+msgstr "Von Graphenanzeigeerweiterung berechneter Routinggraph"
msgid "GraphView layer is not mergable"
msgstr "Graphenanzeigeebene kann nicht vereinigt werden"
@@ -29091,7 +29196,7 @@ msgid "Change Color"
msgstr "Farbe ändern"
msgid "Deprecate Offset"
-msgstr "Offset verwerfen"
+msgstr "Versatz verwerfen"
msgid "Are you sure this imagery offset is wrong?"
msgstr "Sind Sie sicher, dass der Bildversatz falsch ist?"
@@ -29105,7 +29210,7 @@ msgstr "Achtung: Das Verwerfen ist prinzipiell unumkehrbar!"
msgid "To store imagery offsets you must be a registered OSM user."
msgstr ""
-"Um Bildverschiebungen zu speichern müssen Sie registrierter OSM-Nutzer sein."
+"Sie müssen registrierter OSM-Nutzer sein, um Bildverschiebungen zu speichern."
msgid ""
"Please enter the reason why you mark this imagery offset as deprecated"
@@ -29123,7 +29228,7 @@ msgid "Notifying the server of the deprecation..."
msgstr "Den Server über das Verwerfen informieren …"
msgid "Get Imagery Offset..."
-msgstr "Bildversatz holen …"
+msgstr "Bildversatz holen..."
msgid "Download offsets for current imagery from a server"
msgstr "Versätze des aktuelles Bildes von einem Server herunterladen"
@@ -29162,7 +29267,7 @@ msgid "Calibration geometries"
msgstr "Kalibriergeometrien"
msgid "Deprecated offsets"
-msgstr "Verworfene Verschiebungen"
+msgstr "Verworfene Versätze"
msgid ""
"The topmost imagery layer has been shifted to presumably match\n"
@@ -29189,7 +29294,7 @@ msgid "Created by {0} on {1}"
msgstr "Erstellt von {0} zur Zeit {1}"
msgid "Offset Information"
-msgstr "Versatzinformation"
+msgstr "Versatzinformationen"
msgid "Report this offset"
msgstr "Diesen Versatz melden"
@@ -29198,7 +29303,7 @@ msgid "You are to notify moderators of this offset. Why?"
msgstr "Warum wollen Sie die Moderatoren über diesen Versatz informieren?"
msgid "Reporting the offset..."
-msgstr "Versatz melden …"
+msgstr "Versatz wird gemeldet..."
msgid "An imagery offset of {0}"
msgstr "Ein Bildversatz von {0}"
@@ -29228,14 +29333,14 @@ msgid "Unable to connect to the server"
msgstr "Verbindung mit dem Server nicht möglich"
msgid "Store Imagery Offset..."
-msgstr "Bildversatz abspeichern …"
+msgstr "Bildversatz speichern..."
msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
"server"
msgstr ""
-"Einen Versatz für die aktuelle Bildebene (oder eine Kalibriergeometrie) zum "
-"Server hochladen"
+"Einen Versatz für die aktuelle Bildebene (oder eine "
+"Kalibrierungsobjektgeometrie) zum Server hochladen"
msgid "Store calibration geometry"
msgstr "Speichere Kalibriergeometrie"
@@ -29357,16 +29462,16 @@ msgid "Importing..."
msgstr "Importieren …"
msgid "SVG files [ImportVec plugin] (*.svg)"
-msgstr "SVG-Dateien [ImportVec-Plugin] (*.svg)"
+msgstr "SVG-Dateien [ImportVec-Erweiterung] (*.svg)"
msgid "Please open or create data layer before importing"
msgstr "Bitte vor dem Import Datenebene öffnen oder erzeugen"
msgid "Concourse wizard ..."
-msgstr ""
+msgstr "Hallen-Assistent …"
msgid "Opens up a wizard to create a concourse"
-msgstr ""
+msgstr "Öffnet den Assistenten zum Erstellen von Hallen"
msgid "Vertical layer:"
msgstr "Vertikale Ebene:"
@@ -29377,6 +29482,69 @@ msgstr "Strukturtyp:"
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr "Innenkartierungshelfer"
+
+msgid "POWER"
+msgstr "EIN/AUS"
+
+msgid "Activates the plug-in"
+msgstr "Aktiviert die Erweiterung"
+
+msgid "Working Level"
+msgstr "Arbeitsstockwerk"
+
+msgid "Selects the working level."
+msgstr "Legt das Arbeitsstockwerk fest."
+
+msgid "Level Name"
+msgstr "Stockwerkname"
+
+msgid "Optional name-tag for a level."
+msgstr "Optionales Namensmerkmal für ein Stockwerk."
+
+msgid "The object preset you want to tag."
+msgstr "Die Objektvorlage, die Sie mit Merkmalen versehen möchten."
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr "Legt das Namensmerkmal fest, wenn das Raum-Objekt ausgewählt ist."
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr "Legt das Referenzmerkmal fest, wenn das Raum-Objekt ausgewählt ist."
+
+msgid "Apply Tags"
+msgstr "Merkmale anwenden"
+
+msgid "Fitting"
+msgstr "Anpassung"
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+"<html>Bitte beachten Sie, dass Sie Ihre Gebäudepläne jetzt anpassen "
+"sollten.<br>Verwenden Sie dazu die PicLayer-Erweiterung, welche Sie über "
+"die<br>JOSM-Erweiterungsverwaltung installieren können.</html>"
+
+msgid "Level Selection"
+msgstr "Stockwerkauswahl"
+
+msgid "Lowest Level"
+msgstr "Unterstes Stockwerk"
+
+msgid "The lowest level of your building."
+msgstr "Das unterste Stockwerk Ihres Gebäudes."
+
+msgid "Highest Level"
+msgstr "Oberstes Stockwerk"
+
+msgid "The highest level of your building."
+msgstr "Das oberste Stockwerk Ihres Gebäudes."
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr "Werkzeugkasten für Innenkartierungsunterstützung"
+
msgid "InfoMode"
msgstr "Informationsmodus"
@@ -29450,7 +29618,7 @@ msgid "JunctionChecking"
msgstr "Kreuzungsüberprüfung"
msgid "Open the junctionchecking window."
-msgstr "Das Fenster zur Kreuzungsüberprüfung öffnen."
+msgstr "Öffnen Sie das Fenster zur Kreuzungsüberprüfung."
msgid "junctions"
msgstr "Kreuzungen"
@@ -29630,10 +29798,11 @@ msgid "Source text"
msgstr "Datenquelle"
msgid "Lakewalker Plugin Preferences"
-msgstr "Einstellungen für das LakeWalker-Plugin"
+msgstr "LakeWalker-Erweiterungseinstellungen"
msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Ein Plugin, um Wasserflächen auf Landsat-Bildern zu kennzeichnen."
+msgstr ""
+"Eine Erweiterung, um Wasserflächen auf Landsat-Bildern zu kennzeichnen."
msgid ""
"Maximum number of segments allowed in each generated way. Default 250."
@@ -30229,10 +30398,10 @@ msgstr ""
"Auswahl"
msgid "About Plugin"
-msgstr "Über Plugin"
+msgstr "Über Erweiterung"
msgid "Native password manager plugin"
-msgstr "Passwortverwaltungsplugin"
+msgstr "Native Passwortverwaltungserweiterung"
msgid "No native password manager could be found!"
msgstr "Es konnte keine lokale Passwortverwaltung gefunden werden!"
@@ -30298,7 +30467,7 @@ msgid "JOSM/OAuth/OSM API/Secret"
msgstr "JOSM/OAuth/OSM-API/Geheimnis"
msgid "Native Password Manager Plugin"
-msgstr "Passwortverwaltungsplugin"
+msgstr "Native Passwortverwaltungserweiterung"
msgid "The username and password is protected by {0}."
msgstr "Der Nutzername und das Passwort ist mit {0} geschützt."
@@ -30341,7 +30510,8 @@ msgid "Encrypt data with Windows logon credentials"
msgstr "Daten mit Windows-Anmeldeinformationen verschlüsseln"
msgid "The native password manager plugin detected {0} on your system."
-msgstr "Die lokale Passwortverwaltung {0} wurde auf Ihrem System gefunden."
+msgstr ""
+"Die native Passwortverwaltungserweiterung entdeckte {0} auf Ihrem System."
msgid "Days without mapping: {0}."
msgstr "Tage ohne Mapping: {0}."
@@ -30502,8 +30672,8 @@ msgid ""
"loaded by this plugin."
msgstr ""
"Eine spezielle Schnittstelle für diverse Open-Data-Portale<br/><br/>Bitte "
-"lesen Sie die Nutzungsbedingungen jedes Portals<br/>bevor Sie mit diesem "
-"Plugin heruntergeladene Daten zu OSM hochladen."
+"lesen Sie die Nutzungsbedingungen jedes Portals<br/>bevor Sie die mit dieser "
+"Erweiterung heruntergeladenen Daten zu OSM hochladen."
msgid "General settings"
msgstr "Allgemeine Einstellungen"
@@ -31137,7 +31307,7 @@ msgid "to previous value (unchanged mtime)"
msgstr "auf vorherigen Wert (ungeänderte Modifikationszeit)"
msgid "Photo Geotagging Plugin"
-msgstr "Foto-Geotagging-Plugin"
+msgstr "Foto-Geotagging-Erweiterung"
msgid "Writing position information to image files..."
msgstr "Positionsinformationen werden in Bilddateien gespeichert …"
@@ -31566,7 +31736,7 @@ msgid "Selected: {0}"
msgstr "Ausgewählt: {0}"
msgid "Proj4J Plugin"
-msgstr "Proj4J-Plugin"
+msgstr "Proj4J-Erweiterung"
msgid "Code"
msgstr "Kode"
@@ -31828,6 +31998,15 @@ msgstr "Öffentlicher Verkehr: Wegpunkte aktivieren"
msgid "Public Transport: Edit waypoint name"
msgstr "Öffentlicher Verkehr: Wegpunktname bearbeiten"
+msgid "Distance between stops"
+msgstr "Entfernung zwischen Haltestellen"
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr "Eine gültige public_transport:version=2 Route ist erforderlich"
+
+msgid "Invalid selection"
+msgstr "Ungültige Auswahl"
+
msgid "Public transport routes"
msgstr "Routen des öffentlichen Verkehrs"
@@ -32091,7 +32270,7 @@ msgstr ""
"an der Position ({1},{2}) wird übersprungen."
msgid "Road Sign Plugin"
-msgstr "Verkehrszeichen Plugin"
+msgstr "Verkehrszeichenerweiterung"
msgid "signs"
msgstr "Zeichen"
@@ -32130,7 +32309,7 @@ msgid "Add tags by clicking on road signs"
msgstr "Merkmale durch Klicken auf Verkehrszeichen hinzufügen"
msgid "Roadsigns plugin: open dialog"
-msgstr "Verkehrszeichen Plugin: Dialog öffnen"
+msgstr "Verkehrszeichenerweiterung: Dialog öffnen"
msgid "custom"
msgstr "Angepasst"
@@ -32211,7 +32390,7 @@ msgid "Reconstruct Graph"
msgstr "Graphen rekonstruieren"
msgid "Routing Plugin Preferences"
-msgstr "Einstellungen des Routenführungsplugins"
+msgstr "Routenführungserweiterungs-Einstellungen"
msgid "Configure routing preferences."
msgstr "Routenführung konfigurieren."
@@ -32502,8 +32681,8 @@ msgstr "Doppelte Belegung für Taste »{0}« - Taste wird ignoriert!"
msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
msgstr ""
-"Das Surveyor-Plugin benötigt das LiveGPS-Plugin, welches nicht gefunden "
-"wurde!"
+"Surveyor-Erweiterung benötigt das LiveGPS-Erweiterung, welches nicht "
+"gefunden wurde!"
msgid "Surveyor..."
msgstr "Vermessung …"
@@ -32663,9 +32842,6 @@ msgstr "Gebäude abteilen"
msgid "Creates individual buildings from a long building."
msgstr "Individuelle Gebäude aus einem langen Gebäude erstellen."
-msgid "Invalid selection"
-msgstr "Ungültige Auswahl"
-
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 "
@@ -32724,8 +32900,9 @@ msgid ""
"<html>Something went wrong, please update the plugin or report an issue at "
"<a href=\"\">josm-tofix-plugin/issues</a></html>"
msgstr ""
-"<html>Etwas ging schief, bitte aktualisieren Sie das Plugin oder berichten "
-"Sie das Problem auf <a href=\"\">josm-tofix-plugin/issues</a></html>"
+"<html>Etwas ging schief, bitte aktualisieren Sie die Erweiterung oder "
+"berichten Sie das Problem auf <a href=\"\">josm-tofix-"
+"plugin/issues</a></html>"
msgid "Something went wrong, try again"
msgstr "Etwas ging schief, versuchen Sie es noch einmal"
@@ -33139,9 +33316,9 @@ msgid ""
"<html>An error occurred while constructing the model. Please run the "
"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
msgstr ""
-"<html>Beim Erstellen des Modells ist ein Fehler aufgetreten. Bitte Validator "
-"starten, um sicherzustellen, dass die Daten konsistent sind.<br><br>Fehler: "
-"{0}</html>"
+"<html>Beim Erstellen des Modells ist ein Fehler aufgetreten. Bitte führen "
+"Sie den Prüfer aus, um sicherzustellen, dass die Daten konsistent "
+"sind.<br><br>Fehler: {0}</html>"
msgid "Edit turn relations and lane lengths for selected node."
msgstr ""
@@ -33530,17 +33707,17 @@ msgid "Zoom to the currently selected turn restrictions"
msgstr "Auf die gewählte Abbiegebeschränkung zoomen"
msgid "An OSM plugin for editing turn restrictions."
-msgstr "Ein OSM-Plugin für die Bearbeitung von Abbiegeeinschränkungen."
+msgstr "Eine OSM-Erweiterung für die Bearbeitung von Abbiegeeinschränkungen."
msgid ""
"Development of the turn restriction plugin was sponsored by <a "
"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgstr ""
-"Die Entwicklung des Plugins turnrestrictions wurde durch <a "
+"Entwicklung der Erweiterung turnrestrictions wurde durch <a "
"href=\"http://www.skobbler.de\">skobbler GmbH</a> finanziell unterstützt."
msgid "Configure the preferences for the turnrestrictions plugin"
-msgstr "Einstellungen für das Plugin turnrestrictions konfigurieren"
+msgstr "Einstellungen für die Erweiterung turnrestrictions konfigurieren"
msgid "Sponsor"
msgstr "Sponsor"
@@ -33566,8 +33743,8 @@ msgstr "Verkehrszeichen - Satz B"
msgid "Please select the set of road sign icons to be used in the plugin."
msgstr ""
-"Bitte wählen Sie den Satz von Straßenschildern, die im Plugin verwendet "
-"werden."
+"Bitte wählen Sie den Satz von Straßenschildern aus, die in der Erweiterung "
+"verwendet werden."
msgid ""
"Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
@@ -34649,17 +34826,3 @@ msgstr "Losfahren"
msgid "Drive a race car on this layer"
msgstr "Ein Rennauto auf dieser Ebene fahren"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Ungültiges Strichelungsmuster - Werte müssen positiv sein"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "Ungültiges Strichelungsmuster - mindestens ein Wert muss positiv sein"
-
-#~ msgid "xml"
-#~ msgstr "XML"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr "Kartenstile in ''{0}'' enthalten Fehler: [{1}:{2}] {3}"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 88e5721..bf2f2e1 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:13+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:11+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -149,9 +149,6 @@ msgstr "Java-Version {0}"
msgid "Homepage"
msgstr "Homepage"
-msgid "Bug Reports"
-msgstr "Fehlerberichte"
-
msgid "Info"
msgstr "Info"
@@ -173,6 +170,12 @@ msgstr "Plugins"
msgid "About JOSM..."
msgstr "Über JOSM ..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -583,9 +586,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1175,9 +1175,6 @@ msgstr "Die Datei auch umbenennen"
msgid "Could not rename file ''{0}''"
msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden"
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1787,6 +1784,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1936,9 +1957,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2254,8 +2272,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3036,9 +3054,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3058,27 +3073,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4136,6 +4130,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4781,6 +4778,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Erzeuge Hauptfenster"
+
msgid "Updating plugins"
msgstr ""
@@ -4790,12 +4793,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Erzeuge Hauptfenster"
-
msgid "Loading plugins"
msgstr ""
@@ -5766,6 +5763,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6253,51 +6274,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6320,12 +6296,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6748,15 +6718,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6862,9 +6823,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7016,14 +6974,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7108,15 +7058,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7134,6 +7075,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7449,10 +7459,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9108,9 +9118,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9913,12 +9920,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11926,6 +11927,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12436,6 +12443,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13677,62 +13692,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13984,9 +13943,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14171,6 +14127,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14508,13 +14524,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14523,7 +14539,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14535,15 +14557,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14640,6 +14659,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14664,13 +14686,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14817,10 +14839,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14873,29 +14895,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14943,6 +14964,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15003,6 +15027,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15039,10 +15066,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15144,6 +15168,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15153,6 +15180,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15808,6 +15838,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17165,6 +17200,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17741,9 +17782,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18222,6 +18260,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19370,6 +19417,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20638,6 +20688,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22225,7 +22279,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22240,7 +22294,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23495,6 +23549,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23519,9 +23588,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23681,7 +23747,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23765,6 +23837,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23863,6 +23940,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23872,6 +23952,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26975,6 +27063,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29296,6 +29444,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30080,9 +30237,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/el.po b/i18n/po/el.po
index 9ffdb46..1523eaf 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:46+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:45+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -153,9 +153,6 @@ msgstr "Έκδοση Java {0}"
msgid "Homepage"
msgstr "Ιστοσελίδα"
-msgid "Bug Reports"
-msgstr "Αναφορές σφαλμάτων"
-
msgid "Info"
msgstr "Πληροφορίες"
@@ -177,6 +174,12 @@ msgstr "Πρόσθετα"
msgid "About JOSM..."
msgstr "Περί του JOSM..."
+msgid "OK"
+msgstr "Εντάξει"
+
+msgid "Report bug"
+msgstr "Αναφορά σφάλματος"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -598,9 +601,6 @@ msgstr "Προσαρμογή της θέσης αυτού του επιπέδο
msgid "Adjust imagery offset"
msgstr "Προσαρμογή μετατόπησης υπόβαθρου εικόνων"
-msgid "OK"
-msgstr "Εντάξει"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1260,9 +1260,6 @@ msgstr "Επιπλέον μετονομασία του αρχείου"
msgid "Could not rename file ''{0}''"
msgstr "Αδυναμία μετονομασίας αρχείου ''{0}''"
-msgid "Report bug"
-msgstr "Αναφορά σφάλματος"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1913,6 +1910,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Πιο αργά μπροστά"
+msgid "Downloading changeset content"
+msgstr "Γίνεται λήψη περιεχομένου ομάδας αλλαγών"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Γίνεται λήψη ομάδας αλλαγών {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Γίνεται λήψη περιεχομένου για την ομάδα αλλαγών {2}..."
+
+msgid "Download changesets"
+msgstr "Λήψη ομάδων αλλαγών"
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr "Σφάλματα κατα τη διάρκεια της λήψης"
+
msgid "Download GPS"
msgstr ""
@@ -2074,9 +2095,6 @@ msgstr "Διαγραμμένα ή μετακινημένα αντικείμεν
msgid "The following errors occurred during mass download: {0}"
msgstr "Τα παρακάτω σφάλματα προέκυψαν κατά τη διάρκεια μαζικής λήψης: {0}"
-msgid "Errors during download"
-msgstr "Σφάλματα κατα τη διάρκεια της λήψης"
-
msgid "Error during download"
msgstr "Σφάλμα κατα τη διάρκεια της λήψης"
@@ -2400,8 +2418,8 @@ msgid "Add selection to relation"
msgstr "Προσθήκη της επιλογής σε σχέση"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3210,9 +3228,6 @@ msgstr "Επίλυση συγκρούσεων στη λίστα κόμβων τ
msgid "Main dataset does not include node {0}"
msgstr "Η κύρια συλλογή δεδομένων δεν περιέχει τον κόμβο {0}"
-msgid "Apply?"
-msgstr "Εφαρμογή;"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3232,27 +3247,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Σχέση"
-
-msgid "Old role"
-msgstr "Παλιός ρόλος"
-
-msgid "New role"
-msgstr "Νέος ρόλος"
-
-msgid "Old key"
-msgstr "Παλιό κλειδί"
-
-msgid "Old value"
-msgstr "Παλιά τιμή"
-
-msgid "New key"
-msgstr "Καινούργιο κλειδί"
-
-msgid "New value"
-msgstr "Καινούργια τιμή"
-
msgid "Apply selected changes"
msgstr "Εφαρμογή επιλεγμένων αλλαγών"
@@ -4320,6 +4314,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4989,6 +4986,12 @@ msgstr ""
msgid "Initializing"
msgstr "Αρχικοποίηση"
+msgid "Setting defaults"
+msgstr "Ρύθμιση προκαθορισμένων"
+
+msgid "Creating main GUI"
+msgstr "Δημιουργία κύριου GUI"
+
msgid "Updating plugins"
msgstr "Ενημέρωση προσθέτων"
@@ -4998,12 +5001,6 @@ msgstr "Εγκατάσταση ενημερωμένων πρόσθετων"
msgid "Loading early plugins"
msgstr "Φόρτωση προηγούμενων πρόσθετων"
-msgid "Setting defaults"
-msgstr "Ρύθμιση προκαθορισμένων"
-
-msgid "Creating main GUI"
-msgstr "Δημιουργία κύριου GUI"
-
msgid "Loading plugins"
msgstr "Φόρτωση πρόσθετων"
@@ -5989,6 +5986,30 @@ msgstr "Εμφάνιση ετικετών με συγκρούσεις μόνο"
msgid "Show tags with multiple values only"
msgstr "Εμφάνιση ετικετών με πολλαπλές τιμές μόνο"
+msgid "Apply?"
+msgstr "Εφαρμογή;"
+
+msgid "Relation"
+msgstr "Σχέση"
+
+msgid "Old role"
+msgstr "Παλιός ρόλος"
+
+msgid "New role"
+msgstr "Νέος ρόλος"
+
+msgid "Old key"
+msgstr "Παλιό κλειδί"
+
+msgid "Old value"
+msgstr "Παλιά τιμή"
+
+msgid "New key"
+msgstr "Καινούργιο κλειδί"
+
+msgid "New value"
+msgstr "Καινούργια τιμή"
+
msgid "For selected objects only"
msgstr "Για επιλεγμένα αντικείμενα μόνο"
@@ -6486,51 +6507,6 @@ msgstr "Εναλλαγή ορατότητας του επιπέδου: {0}"
msgid "Open a list of all loaded layers."
msgstr "Άνοιγμα λίστας όλων τον φορτωμένων επιπέδων."
-msgid "Delete the selected layers."
-msgstr "Διαγραφή των επιλεγμένων επιπέδων."
-
-msgid "Show/hide"
-msgstr "Εμφάνιση/απόκρυψη"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου."
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr "Αδιαφάνεια"
-
-msgid "Adjust opacity of the layer."
-msgstr "Ρύθμιση αδιαφάνειας του επιπέδου"
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Ενεργοποίηση"
-
-msgid "Activate the selected layer"
-msgstr "Ενεργοποίηση του επιλεγμένου επιπέδου"
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr "Συγχώνευση αυτού του επιπέδου σε άλλο επίπεδο"
-
-msgid "Duplicate this layer"
-msgstr "Αντιγραφή αυτού του επιπέδου"
-
-msgid "Copy of {0}"
-msgstr "Αντιγραφή του {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Αντιγραφή {1} απο {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "το επίπεδο είναι ορατό (κλικ για απόκρυψη)"
@@ -6553,12 +6529,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
-
-msgid "Move the selected layer one row down."
-msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
-
msgid "Information about layer"
msgstr ""
@@ -6994,15 +6964,6 @@ msgstr "Έκλεισε στις"
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr "Γίνεται λήψη περιεχομένου ομάδας αλλαγών"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Γίνεται λήψη ομάδας αλλαγών {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Γίνεται λήψη περιεχομένου για την ομάδα αλλαγών {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7108,9 +7069,6 @@ msgstr ""
msgid "Date"
msgstr "Ημερομηνία"
-msgid "Download changesets"
-msgstr "Λήψη ομάδων αλλαγών"
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7266,14 +7224,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7358,15 +7308,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr "URL: "
@@ -7384,6 +7325,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr "Ενεργοποίηση"
+
+msgid "Activate the selected layer"
+msgstr "Ενεργοποίηση του επιλεγμένου επιπέδου"
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr "Διαγραφή των επιλεγμένων επιπέδων."
+
+msgid "Duplicate this layer"
+msgstr "Αντιγραφή αυτού του επιπέδου"
+
+msgid "Copy of {0}"
+msgstr "Αντιγραφή του {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Αντιγραφή {1} απο {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Ρύθμιση αδιαφάνειας του επιπέδου"
+
+msgid "Opacity"
+msgstr "Αδιαφάνεια"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Συγχώνευση αυτού του επιπέδου σε άλλο επίπεδο"
+
+msgid "Move the selected layer one row down."
+msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
+
+msgid "Move the selected layer one row up."
+msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
+
+msgid "Show/hide"
+msgstr "Εμφάνιση/απόκρυψη"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου."
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7700,12 +7710,12 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
-msgstr "Εφαρμογή Ρόλου:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
+msgid "Apply Role:"
+msgstr "Εφαρμογή Ρόλου:"
+
msgid "New Relation"
msgstr "Νέα Σχέση"
@@ -9422,9 +9432,6 @@ msgstr "Εξασθένιση υπόβαθρου εικόνων"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "ΣΦΑΛΜΑ"
-
msgid "Next marker"
msgstr "Επόμενος δείκτης"
@@ -10234,12 +10241,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -12278,6 +12279,12 @@ msgstr "Ρυθμίσεις σύνδεσης"
msgid "Connection Settings for the OSM server."
msgstr "Ρυθμίσεις σύνδεσης για τον διακομηστή OSM."
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr "Ενέργεια"
@@ -12791,6 +12798,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -14012,108 +14027,52 @@ msgstr ""
msgid "Processing plugin files..."
msgstr "Επεξεργασία αρχείων προσθέτων..."
-msgid "Download plugin list..."
-msgstr ""
-
-msgid "Downloading plugin list from ''{0}''"
-msgstr "Γίνεται λήψη λίστας πρόσθετων από ''{0}''"
-
-msgid "Unsuccessful HTTP request"
-msgstr ""
-
-msgid "Plugin list download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin list:"
-msgstr ""
-
-msgid "Details:"
-msgstr ""
-
-msgid ""
-"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
-"plugin site ''{1}''."
-msgstr ""
-
-msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
-
-msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
-
-msgid ""
-"Failed to parse plugin list document from site ''{0}''. Skipping site. "
-"Exception was: {1}"
-msgstr ""
-
-msgid "Processing plugin list from site ''{0}''"
-msgstr "Επεξεργασία καταλόγου προσθέτων από τον ιστότοπο ''{0}''"
-
-msgid "This is after the end of the recording"
-msgstr "Αυτό είναι το μετά το τέλος της εγγραφής"
-
-msgid "unspecified reason"
-msgstr ""
-
-msgid "Error playing sound"
-msgstr "Σφάλμα στην αναπαραγωγή ήχου"
-
-msgid "Do nothing"
-msgstr "Καμία ενέργεια"
-
-msgid "Report Bug"
-msgstr "Αναφορά σφάλματος"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
+msgid "Download plugin list..."
msgstr ""
-msgid "Update JOSM"
+msgid "Downloading plugin list from ''{0}''"
+msgstr "Γίνεται λήψη λίστας πρόσθετων από ''{0}''"
+
+msgid "Unsuccessful HTTP request"
msgstr ""
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
+msgid "Plugin list download error"
msgstr ""
-msgid "Unexpected Exception"
-msgstr "Μη Αναμενόμενη Εξαίρεση"
+msgid "JOSM failed to download plugin list:"
+msgstr ""
-msgid "Suppress further error dialogs for this session."
+msgid "Details:"
msgstr ""
msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
+msgid "Writing plugin list to local cache ''{0}''"
msgstr ""
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
+msgid "Parsing plugin list from site ''{0}''"
msgstr ""
msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
msgstr ""
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)"
+msgid "Processing plugin list from site ''{0}''"
+msgstr "Επεξεργασία καταλόγου προσθέτων από τον ιστότοπο ''{0}''"
-msgid "You have encountered a bug in JOSM"
+msgid "This is after the end of the recording"
+msgstr "Αυτό είναι το μετά το τέλος της εγγραφής"
+
+msgid "unspecified reason"
msgstr ""
+msgid "Error playing sound"
+msgstr "Σφάλμα στην αναπαραγωγή ήχου"
+
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14371,9 +14330,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14558,6 +14514,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Καμία ενέργεια"
+
+msgid "Report Bug"
+msgstr "Αναφορά σφάλματος"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Μη Αναμενόμενη Εξαίρεση"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14895,14 +14911,14 @@ msgstr "Δορυφόρος MapBox"
msgid "MapQuest Open Aerial"
msgstr "Ανοιχτές αεροφωτογραφίες MapQuest"
-msgid "OpenStreetMap GPS Traces"
-msgstr "Ίχνη GPS OpenStreetMap"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Μαύρο & Άσπρο)"
@@ -14910,8 +14926,14 @@ msgstr "OpenStreetMap (Mapnik Μαύρο & Άσπρο)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, χωρίς ετικέτες)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (γερμανικό στιλ)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "Ίχνη GPS OpenStreetMap"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -14922,15 +14944,12 @@ msgstr "Δημόσια συγκοινωνία (ÖPNV)"
msgid "Hike & Bike"
msgstr "Ορειβασία & ποδήλατο"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (γερμανικό στιλ)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Καμπότζη, Λάος, Ταϊλάνδη, δίγλωσσο Βιετνάμ"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "Χάρτης OpenPT (επικάλυψη)"
@@ -15027,6 +15046,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15051,13 +15073,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15204,10 +15226,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15260,29 +15282,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15330,6 +15351,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15390,6 +15414,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15426,10 +15453,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15531,6 +15555,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15540,6 +15567,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16195,6 +16225,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17555,6 +17590,12 @@ msgstr "Οδοί"
msgid "Motorway"
msgstr "Αυτοκινητόδρομος"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -18131,9 +18172,6 @@ msgstr "Κόμβος Αυτοκινητοδρόμου"
msgid "Number"
msgstr "Αριθμός"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Υπηρεσίες"
@@ -18612,6 +18650,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Λάσπη"
@@ -19760,6 +19807,9 @@ msgstr ""
msgid "Fishing"
msgstr "Ψάρεμα"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -21028,6 +21078,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Stufen"
@@ -22615,8 +22669,8 @@ msgstr ""
msgid "food"
msgstr "φαγητό"
-msgid "news_papers"
-msgstr "εφημερίδες"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "εισιτήρια Στάθμευσης"
@@ -22630,8 +22684,8 @@ msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
msgid "public_transport_tickets"
msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
-msgid "SIM-cards"
-msgstr "Κάρτες SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "Γραμματόσημα"
@@ -23885,6 +23939,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23909,9 +23978,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -24071,7 +24137,13 @@ msgstr "Κάμπιγκ"
msgid "Test"
msgstr "Δοκιμή"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -24155,6 +24227,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24253,6 +24330,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24262,6 +24342,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27376,6 +27464,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29715,6 +29863,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Μη έγκυρη επιλογή"
+
msgid "Public transport routes"
msgstr ""
@@ -30500,9 +30657,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr "Δημιουργεί ξεχωριστά κτίρια από ένα μακρύ κτίριο."
-msgid "Invalid selection"
-msgstr "Μη έγκυρη επιλογή"
-
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 "
@@ -32287,6 +32441,3 @@ msgstr ""
msgid "Drive a race car on this layer"
msgstr ""
-
-#~ msgid "xml"
-#~ msgstr "xml"
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 7ef2792..8e6f1c1 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:11+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:10+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -151,9 +151,6 @@ msgstr "Java Version {0}"
msgid "Homepage"
msgstr "Homepage"
-msgid "Bug Reports"
-msgstr "Bug Reports"
-
msgid "Info"
msgstr "Info"
@@ -175,6 +172,12 @@ msgstr "Plug-ins"
msgid "About JOSM..."
msgstr "About JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Report bug"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -598,9 +601,6 @@ msgstr "Adjust the position of this imagery layer"
msgid "Adjust imagery offset"
msgstr "Adjust imagery offset"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1250,9 +1250,6 @@ msgstr "Also rename the file"
msgid "Could not rename file ''{0}''"
msgstr "Could not rename file ''{0}''"
-msgid "Report bug"
-msgstr "Report bug"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Report a ticket to JOSM bugtracker"
@@ -1901,6 +1898,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Slower Forwards"
+msgid "Downloading changeset content"
+msgstr "Downloading changeset content"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Downloading changeset {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Downloading content for changeset {2}..."
+
+msgid "Download changesets"
+msgstr "Download changesets"
+
+msgid "Querying and downloading changesets"
+msgstr "Querying and downloading changesets"
+
+msgid "Determine user id for current user..."
+msgstr "Determine user id for current user..."
+
+msgid "Query and download changesets ..."
+msgstr "Query and download changesets ..."
+
+msgid "Errors during download"
+msgstr "Errors during download"
+
msgid "Download GPS"
msgstr "Download GPS"
@@ -2063,9 +2084,6 @@ msgstr "Deleted or moved objects"
msgid "The following errors occurred during mass download: {0}"
msgstr "The following errors occurred during mass download: {0}"
-msgid "Errors during download"
-msgstr "Errors during download"
-
msgid "Error during download"
msgstr "Error during download"
@@ -2410,8 +2428,8 @@ msgid "Add selection to relation"
msgstr "Add selection to relation"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3238,9 +3256,6 @@ msgstr "Resolve conflicts in node list of way {0}"
msgid "Main dataset does not include node {0}"
msgstr "Main dataset does not include node {0}"
-msgid "Apply?"
-msgstr "Apply?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3268,27 +3283,6 @@ msgstr ""
"When reversing this way, the following changes are suggested in order to "
"maintain data consistency."
-msgid "Relation"
-msgstr "Relation"
-
-msgid "Old role"
-msgstr "Old role"
-
-msgid "New role"
-msgstr "New role"
-
-msgid "Old key"
-msgstr "Old key"
-
-msgid "Old value"
-msgstr "Old value"
-
-msgid "New key"
-msgstr "New key"
-
-msgid "New value"
-msgstr "New value"
-
msgid "Apply selected changes"
msgstr "Apply selected changes"
@@ -4406,6 +4400,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Role verification problem"
@@ -5069,6 +5066,12 @@ msgstr "Enabled detailed debug level (trace)"
msgid "Initializing"
msgstr "Initialising"
+msgid "Setting defaults"
+msgstr "Setting defaults"
+
+msgid "Creating main GUI"
+msgstr "Creating main GUI"
+
msgid "Updating plugins"
msgstr "Updating plugins"
@@ -5078,12 +5081,6 @@ msgstr "Installing updated plug-ins"
msgid "Loading early plugins"
msgstr "Loading early plug-ins"
-msgid "Setting defaults"
-msgstr "Setting defaults"
-
-msgid "Creating main GUI"
-msgstr "Creating main GUI"
-
msgid "Loading plugins"
msgstr "Loading plug-ins"
@@ -6130,6 +6127,30 @@ msgstr "Show tags with conflicts only"
msgid "Show tags with multiple values only"
msgstr "Show tags with multiple values only"
+msgid "Apply?"
+msgstr "Apply?"
+
+msgid "Relation"
+msgstr "Relation"
+
+msgid "Old role"
+msgstr "Old role"
+
+msgid "New role"
+msgstr "New role"
+
+msgid "Old key"
+msgstr "Old key"
+
+msgid "Old value"
+msgstr "Old value"
+
+msgid "New key"
+msgstr "New key"
+
+msgid "New value"
+msgstr "New value"
+
msgid "For selected objects only"
msgstr "For selected objects only"
@@ -6643,51 +6664,6 @@ msgstr "Toggle visibility of layer: {0}"
msgid "Open a list of all loaded layers."
msgstr "Open a list of all loaded layers."
-msgid "Delete the selected layers."
-msgstr "Delete the selected layers."
-
-msgid "Show/hide"
-msgstr "Show/hide"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Toggle visible state of the selected layer."
-
-msgid "Show/hide layer"
-msgstr "Show/hide layer"
-
-msgid "Opacity"
-msgstr "Opacity"
-
-msgid "Adjust opacity of the layer."
-msgstr "Adjust opacity of the layer."
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Activate"
-
-msgid "Activate the selected layer"
-msgstr "Activate the selected layer"
-
-msgid "Activate layer"
-msgstr "Activate layer"
-
-msgid "Merge this layer into another layer"
-msgstr "Merge this layer into another layer"
-
-msgid "Duplicate this layer"
-msgstr "Duplicate this layer"
-
-msgid "Copy of {0}"
-msgstr "Copy of {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copy {1} of {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "layer is currently visible (click to hide layer)"
@@ -6710,12 +6686,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Move the selected layer one row up."
-
-msgid "Move the selected layer one row down."
-msgstr "Move the selected layer one row down."
-
msgid "Information about layer"
msgstr "Information about layer"
@@ -7145,15 +7115,6 @@ msgstr "Closed at"
msgid "Discussions"
msgstr "Discussions"
-msgid "Downloading changeset content"
-msgstr "Downloading changeset content"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Downloading changeset {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Downloading content for changeset {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7269,9 +7230,6 @@ msgstr "Update the changeset discussion from the OSM server"
msgid "Date"
msgstr "Date"
-msgid "Download changesets"
-msgstr "Download changesets"
-
msgid "{0} [incomplete]"
msgstr "{0} [incomplete]"
@@ -7438,16 +7396,6 @@ msgid "Please enter an integer value > 0"
msgstr "Please enter an integer value > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Please enter an non-empty user name"
-
-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 ""
@@ -7548,15 +7496,6 @@ msgstr "Illegal changeset query URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Close the dialogue and abort querying of changesets"
-msgid "Querying and downloading changesets"
-msgstr "Querying and downloading changesets"
-
-msgid "Determine user id for current user..."
-msgstr "Determine user id for current user..."
-
-msgid "Query and download changesets ..."
-msgstr "Query and download changesets ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7577,6 +7516,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "This changeset query URL is invalid"
+msgid "Activate"
+msgstr "Activate"
+
+msgid "Activate the selected layer"
+msgstr "Activate the selected layer"
+
+msgid "Activate layer"
+msgstr "Activate layer"
+
+msgid "Delete the selected layers."
+msgstr "Delete the selected layers."
+
+msgid "Duplicate this layer"
+msgstr "Duplicate this layer"
+
+msgid "Copy of {0}"
+msgstr "Copy of {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copy {1} of {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Adjust opacity of the layer."
+
+msgid "Opacity"
+msgstr "Opacity"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Merge this layer into another layer"
+
+msgid "Move the selected layer one row down."
+msgstr "Move the selected layer one row down."
+
+msgid "Move the selected layer one row up."
+msgstr "Move the selected layer one row up."
+
+msgid "Show/hide"
+msgstr "Show/hide"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Toggle visible state of the selected layer."
+
+msgid "Show/hide layer"
+msgstr "Show/hide layer"
+
msgid "Discardable key: selection Foreground"
msgstr "Discardable key: selection Foreground"
@@ -7896,12 +7904,12 @@ msgstr "Parent Relations"
msgid "Child Relations"
msgstr "Child Relations"
-msgid "Apply Role:"
-msgstr "Apply Role:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
+msgstr "Apply Role:"
+
msgid "New Relation"
msgstr "New Relation"
@@ -9732,9 +9740,6 @@ msgstr "Imagery fade"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "ERROR"
-
msgid "Next marker"
msgstr "Next marker"
@@ -10614,12 +10619,6 @@ msgstr "Run the automatic authorisation steps again"
msgid "Test Access Token"
msgstr "Test Access Token"
-msgid "Please enter your OSM user name"
-msgstr "Please enter your OSM user name"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "The user name cannot be empty. Please enter your OSM user name"
-
msgid "Please enter your OSM password"
msgstr "Please enter your OSM password"
@@ -12743,6 +12742,12 @@ msgstr "Connection Settings"
msgid "Connection Settings for the OSM server."
msgstr "Connection Settings for the OSM server."
+msgid "Please enter your OSM user name"
+msgstr "Please enter your OSM user name"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "The user name cannot be empty. Please enter your OSM user name"
+
msgid "Action"
msgstr "Action"
@@ -13273,6 +13278,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Failed to parse date ''{0}'' replied by server."
@@ -14575,74 +14588,6 @@ msgstr ""
msgid "Error playing sound"
msgstr "Error playing sound"
-msgid "Do nothing"
-msgstr "Do nothing"
-
-msgid "Report Bug"
-msgstr "Report Bug"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "Unexpected Exception"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"You should also update your plug-ins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(The text has already been copied to your clipboard.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "You have encountered a bug in JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14924,9 +14869,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15123,6 +15065,78 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Do nothing"
+
+msgid "Report Bug"
+msgstr "Report Bug"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Unexpected Exception"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "You have encountered a bug in JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"You should also update your plug-ins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(The text has already been copied to your clipboard.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15461,13 +15475,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -15476,7 +15490,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -15488,15 +15508,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -15593,6 +15610,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15617,13 +15637,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15770,10 +15790,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15826,29 +15846,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15896,6 +15915,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15956,6 +15978,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15992,10 +16017,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -16097,6 +16119,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -16106,6 +16131,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16772,6 +16800,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18148,6 +18181,12 @@ msgstr "Streets"
msgid "Motorway"
msgstr "Motorway"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -18724,9 +18763,6 @@ msgstr "Motorway Junction"
msgid "Number"
msgstr "Number"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Services"
@@ -19205,6 +19241,15 @@ msgstr "tidalflat"
msgid "mangrove"
msgstr "mangrove"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Mud"
@@ -20353,6 +20398,9 @@ msgstr ""
msgid "Fishing"
msgstr "Fishing"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -21621,6 +21669,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -23208,8 +23260,8 @@ msgstr "excrement_bags"
msgid "food"
msgstr "food"
-msgid "news_papers"
-msgstr "news_papers"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parking_tickets"
@@ -23223,8 +23275,8 @@ msgstr "public_transport_plans"
msgid "public_transport_tickets"
msgstr "public_transport_tickets"
-msgid "SIM-cards"
-msgstr "SIM-cards"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "stamps"
@@ -24478,6 +24530,21 @@ msgstr "natural"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -24502,9 +24569,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -24664,7 +24728,13 @@ msgstr "Camping"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -24748,6 +24818,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24846,6 +24921,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24855,6 +24933,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -28009,6 +28095,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -30346,6 +30492,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -31135,9 +31290,6 @@ msgstr "Terrace a building"
msgid "Creates individual buildings from a long building."
msgstr "Creates individual buildings from a long building."
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -32886,17 +33038,3 @@ msgstr "Go driving"
msgid "Drive a race car on this layer"
msgstr "Drive a race car on this layer"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Illegal dash pattern, values must be positive"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Illegal dash pattern, at least one value must be > 0"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 89dd418..6c007b6 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:13+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:12+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "Java Version {0}"
msgid "Homepage"
msgstr "Home page"
-msgid "Bug Reports"
-msgstr "Bug Reports"
-
msgid "Info"
msgstr "Info"
@@ -172,6 +169,12 @@ msgstr "Plug-ins"
msgid "About JOSM..."
msgstr "About JOSM..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -580,9 +583,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1172,9 +1172,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1784,6 +1781,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1933,9 +1954,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2251,8 +2269,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3033,9 +3051,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3055,27 +3070,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4133,6 +4127,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4778,19 +4775,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5763,6 +5760,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6250,51 +6271,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6317,12 +6293,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6745,15 +6715,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6859,9 +6820,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7013,14 +6971,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7105,15 +7055,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7131,6 +7072,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7446,10 +7456,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9105,9 +9115,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9910,12 +9917,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11923,6 +11924,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12433,6 +12440,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13674,62 +13689,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13981,9 +13940,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14168,6 +14124,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14502,13 +14518,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14517,7 +14533,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14529,15 +14551,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14634,6 +14653,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14658,13 +14680,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14811,10 +14833,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14867,29 +14889,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14937,6 +14958,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14997,6 +15021,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15033,10 +15060,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15138,6 +15162,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15147,6 +15174,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15802,6 +15832,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17159,6 +17194,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17735,9 +17776,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18216,6 +18254,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19364,6 +19411,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20632,6 +20682,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22219,7 +22273,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22234,7 +22288,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23489,6 +23543,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23513,9 +23582,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23675,7 +23741,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23759,6 +23831,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23857,6 +23934,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23866,6 +23946,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26965,6 +27053,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29286,6 +29434,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30070,9 +30227,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index b0a33c9..3195322 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-13 00:31+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-28 14:30+0000\n"
"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: German <josm-dev at openstreetmap.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:11+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:09+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -154,9 +154,6 @@ msgstr "Java Version {0}"
msgid "Homepage"
msgstr "Homepage"
-msgid "Bug Reports"
-msgstr "Bug Reports"
-
msgid "Info"
msgstr "Info"
@@ -178,6 +175,12 @@ msgstr "Plug-ins"
msgid "About JOSM..."
msgstr "About JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Report bug"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Failed to locate resource ''{0}''."
@@ -601,9 +604,6 @@ msgstr "Adjust the position of this imagery layer"
msgid "Adjust imagery offset"
msgstr "Adjust imagery offset"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1253,9 +1253,6 @@ msgstr "Also rename the file"
msgid "Could not rename file ''{0}''"
msgstr "Could not rename file ''{0}''"
-msgid "Report bug"
-msgstr "Report bug"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Report a ticket to JOSM bugtracker"
@@ -1904,6 +1901,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Slower Forwards"
+msgid "Downloading changeset content"
+msgstr "Downloading changeset content"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Downloading changeset {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Downloading content for changeset {2}..."
+
+msgid "Download changesets"
+msgstr "Download changesets"
+
+msgid "Querying and downloading changesets"
+msgstr "Querying and downloading changesets"
+
+msgid "Determine user id for current user..."
+msgstr "Determine user id for current user..."
+
+msgid "Query and download changesets ..."
+msgstr "Query and download changesets ..."
+
+msgid "Errors during download"
+msgstr "Errors during download"
+
msgid "Download GPS"
msgstr "Download GPS"
@@ -2066,9 +2087,6 @@ msgstr "Deleted or moved objects"
msgid "The following errors occurred during mass download: {0}"
msgstr "The following errors occurred during mass download: {0}"
-msgid "Errors during download"
-msgstr "Errors during download"
-
msgid "Error during download"
msgstr "Error during download"
@@ -2415,11 +2433,11 @@ msgid "Add selection to relation"
msgstr "Add selection to relation"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3245,9 +3263,6 @@ msgstr "Resolve conflicts in node list of way {0}"
msgid "Main dataset does not include node {0}"
msgstr "Main dataset does not include node {0}"
-msgid "Apply?"
-msgstr "Apply?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3275,27 +3290,6 @@ msgstr ""
"When reversing this way, the following changes are suggested in order to "
"maintain data consistency."
-msgid "Relation"
-msgstr "Relation"
-
-msgid "Old role"
-msgstr "Old role"
-
-msgid "New role"
-msgstr "New role"
-
-msgid "Old key"
-msgstr "Old key"
-
-msgid "Old value"
-msgstr "Old value"
-
-msgid "New key"
-msgstr "New key"
-
-msgid "New value"
-msgstr "New value"
-
msgid "Apply selected changes"
msgstr "Apply selected changes"
@@ -4420,6 +4414,9 @@ msgstr "Route relation contains a ''{0}'' role"
msgid "Route relation contains a gap"
msgstr "Route relation contains a gap"
+msgid "Stop position not part of route"
+msgstr "Stop position not part of route"
+
msgid "Role verification problem"
msgstr "Role verification problem"
@@ -5083,6 +5080,12 @@ msgstr "Enabled detailed debug level (trace)"
msgid "Initializing"
msgstr "Initialising"
+msgid "Setting defaults"
+msgstr "Setting defaults"
+
+msgid "Creating main GUI"
+msgstr "Creating main GUI"
+
msgid "Updating plugins"
msgstr "Updating plug-ins"
@@ -5092,12 +5095,6 @@ msgstr "Installing updated plug-ins"
msgid "Loading early plugins"
msgstr "Loading early plug-ins"
-msgid "Setting defaults"
-msgstr "Setting defaults"
-
-msgid "Creating main GUI"
-msgstr "Creating main GUI"
-
msgid "Loading plugins"
msgstr "Loading plug-ins"
@@ -6149,6 +6146,30 @@ msgstr "Show tags with conflicts only"
msgid "Show tags with multiple values only"
msgstr "Show tags with multiple values only"
+msgid "Apply?"
+msgstr "Apply?"
+
+msgid "Relation"
+msgstr "Relation"
+
+msgid "Old role"
+msgstr "Old role"
+
+msgid "New role"
+msgstr "New role"
+
+msgid "Old key"
+msgstr "Old key"
+
+msgid "Old value"
+msgstr "Old value"
+
+msgid "New key"
+msgstr "New key"
+
+msgid "New value"
+msgstr "New value"
+
msgid "For selected objects only"
msgstr "For selected objects only"
@@ -6673,51 +6694,6 @@ msgstr "Toggle visibility of layer: {0}"
msgid "Open a list of all loaded layers."
msgstr "Open a list of all loaded layers."
-msgid "Delete the selected layers."
-msgstr "Delete the selected layers."
-
-msgid "Show/hide"
-msgstr "Show/hide"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Toggle visible state of the selected layer."
-
-msgid "Show/hide layer"
-msgstr "Show/hide layer"
-
-msgid "Opacity"
-msgstr "Opacity"
-
-msgid "Adjust opacity of the layer."
-msgstr "Adjust opacity of the layer."
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Adjust gamma value of the layer."
-
-msgid "Activate"
-msgstr "Activate"
-
-msgid "Activate the selected layer"
-msgstr "Activate the selected layer"
-
-msgid "Activate layer"
-msgstr "Activate layer"
-
-msgid "Merge this layer into another layer"
-msgstr "Merge this layer into another layer"
-
-msgid "Duplicate this layer"
-msgstr "Duplicate this layer"
-
-msgid "Copy of {0}"
-msgstr "Copy of {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copy {1} of {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "layer is currently visible (click to hide layer)"
@@ -6741,12 +6717,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "this layer has no native resolution"
-msgid "Move the selected layer one row up."
-msgstr "Move the selected layer one row up."
-
-msgid "Move the selected layer one row down."
-msgstr "Move the selected layer one row down."
-
msgid "Information about layer"
msgstr "Information about layer"
@@ -7178,15 +7148,6 @@ msgstr "Closed at"
msgid "Discussions"
msgstr "Discussions"
-msgid "Downloading changeset content"
-msgstr "Downloading changeset content"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Downloading changeset {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Downloading content for changeset {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7302,9 +7263,6 @@ msgstr "Update the changeset discussion from the OSM server"
msgid "Date"
msgstr "Date"
-msgid "Download changesets"
-msgstr "Download changesets"
-
msgid "{0} [incomplete]"
msgstr "{0} [incomplete]"
@@ -7471,16 +7429,6 @@ msgid "Please enter an integer value > 0"
msgstr "Please enter an integer value > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Please enter an non-empty user name"
-
-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 ""
@@ -7581,15 +7529,6 @@ msgstr "Illegal changeset query URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Close the dialogue and abort querying of changesets"
-msgid "Querying and downloading changesets"
-msgstr "Querying and downloading changesets"
-
-msgid "Determine user id for current user..."
-msgstr "Determine user id for current user..."
-
-msgid "Query and download changesets ..."
-msgstr "Query and download changesets ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7610,6 +7549,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "This changeset query URL is invalid"
+msgid "Activate"
+msgstr "Activate"
+
+msgid "Activate the selected layer"
+msgstr "Activate the selected layer"
+
+msgid "Activate layer"
+msgstr "Activate layer"
+
+msgid "Delete the selected layers."
+msgstr "Delete the selected layers."
+
+msgid "Duplicate this layer"
+msgstr "Duplicate this layer"
+
+msgid "Copy of {0}"
+msgstr "Copy of {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copy {1} of {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Change visibility of the selected layer."
+
+msgid "Show layer"
+msgstr "Show layer"
+
+msgid "Adjust opacity of the layer."
+msgstr "Adjust opacity of the layer."
+
+msgid "Opacity"
+msgstr "Opacity"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Adjust gamma value of the layer."
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Adjust sharpness/blur value of the layer."
+
+msgid "Sharpness"
+msgstr "Sharpness"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Adjust colourfulness of the layer."
+
+msgid "Colorfulness"
+msgstr "Colourfulness"
+
+msgid "Merge this layer into another layer"
+msgstr "Merge this layer into another layer"
+
+msgid "Move the selected layer one row down."
+msgstr "Move the selected layer one row down."
+
+msgid "Move the selected layer one row up."
+msgstr "Move the selected layer one row up."
+
+msgid "Show/hide"
+msgstr "Show/hide"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Toggle visible state of the selected layer."
+
+msgid "Show/hide layer"
+msgstr "Show/hide layer"
+
msgid "Discardable key: selection Foreground"
msgstr "Discardable key: selection Foreground"
@@ -7929,12 +7937,12 @@ msgstr "Parent Relations"
msgid "Child Relations"
msgstr "Child Relations"
-msgid "Apply Role:"
-msgstr "Apply Role:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
+msgstr "Apply Role:"
+
msgid "New Relation"
msgstr "New Relation"
@@ -9774,9 +9782,6 @@ msgstr "Imagery fade"
msgid "Unsupported imagery type: {0}"
msgstr "Unsupported imagery type: {0}"
-msgid "ERROR"
-msgstr "ERROR"
-
msgid "Next marker"
msgstr "Next marker"
@@ -10664,12 +10669,6 @@ msgstr "Run the automatic authorisation steps again"
msgid "Test Access Token"
msgstr "Test Access Token"
-msgid "Please enter your OSM user name"
-msgstr "Please enter your OSM user name"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "The user name cannot be empty. Please enter your OSM user name"
-
msgid "Please enter your OSM password"
msgstr "Please enter your OSM password"
@@ -12858,6 +12857,12 @@ msgstr "Connection Settings"
msgid "Connection Settings for the OSM server."
msgstr "Connection Settings for the OSM server."
+msgid "Please enter your OSM user name"
+msgstr "Please enter your OSM user name"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "The user name cannot be empty. Please enter your OSM user name"
+
msgid "Action"
msgstr "Action"
@@ -13408,6 +13413,16 @@ msgstr ""
"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Adding certificate for TLS connections: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Failed to parse date ''{0}'' replied by server."
@@ -14766,79 +14781,6 @@ msgstr "unspecified reason"
msgid "Error playing sound"
msgstr "Error playing sound"
-msgid "Do nothing"
-msgstr "Do nothing"
-
-msgid "Report Bug"
-msgstr "Report Bug"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-
-msgid "Update JOSM"
-msgstr "Update JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-
-msgid "Unexpected Exception"
-msgstr "Unexpected Exception"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Suppress further error dialogues for this session."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"You should also update your plug-ins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(The text has already been copied to your clipboard.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "You have encountered a bug in JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15206,9 +15148,6 @@ msgstr "Download redirected to ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Too many redirects to the download URL detected. Aborting."
-msgid "Fetching content..."
-msgstr "Fetching content..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15423,6 +15362,84 @@ msgstr "Ignoring malformed geometry: {0}"
msgid "Failed to load XML schema."
msgstr "Failed to load XML schema."
+msgid "Do nothing"
+msgstr "Do nothing"
+
+msgid "Report Bug"
+msgstr "Report Bug"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+
+msgid "Update JOSM"
+msgstr "Update JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Suppress further error dialogues for this session."
+
+msgid "Unexpected Exception"
+msgstr "Unexpected Exception"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "You have encountered a bug in JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"You should also update your plug-ins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(The text has already been copied to your clipboard.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Opening the bug report failed. Please report manually using this website:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15769,14 +15786,14 @@ msgstr "Mapbox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr "OpenStreetMap Carto (Standard layer)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Black & White)"
@@ -15784,8 +15801,14 @@ msgstr "OpenStreetMap (Mapnik Black & White)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, no labels)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (French Style)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (German Style)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS Traces"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -15796,15 +15819,12 @@ msgstr "Public Transport (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (German Style)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -15901,6 +15921,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -15925,14 +15948,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: Echtfarbenbild 2015 (10cm)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Terrain model)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: Höhen und Gelände"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -16078,11 +16101,11 @@ msgstr "Géolittoral V2 - Orthophotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16136,6 +16159,15 @@ msgstr "Bavaria (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Berlin aerial photograph 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Berlin aerial photograph 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Berlin aerial photograph 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (aerial imagery)"
@@ -16151,17 +16183,6 @@ msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Physical map (natural regions)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Physical map (natural regions)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16207,6 +16228,9 @@ msgstr "Törökbálint ortophoto 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 "Danube flood ortophoto 2013"
msgstr "Danube flood ortophoto 2013"
@@ -16267,6 +16291,9 @@ msgstr "OSMIE T.ie Land not in Counties"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Lombardia - Italy (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardia - Italy (CTR DBT)"
@@ -16303,11 +16330,8 @@ msgstr "1.cikla ortofotokarte - Latvia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr "geoportail.lu"
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Railway"
@@ -16408,6 +16432,9 @@ msgstr "Powiat poznański: Budynki (buildings)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (Aerial image)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (buildings)"
@@ -16417,6 +16444,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (Aerial image)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (buildings)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr "Poznań: Ortofotomapa 2014 (aerial image)"
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (buildings)"
@@ -17115,6 +17145,13 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr "This plugin simplifies the mapping and editing of indoor corridors."
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18546,6 +18583,12 @@ msgstr "Streets"
msgid "Motorway"
msgstr "Motorway"
+msgid "Destination"
+msgstr "Destination"
+
+msgid "Destination reference"
+msgstr "Destination reference"
+
msgid "Placement"
msgstr "Placement"
@@ -19137,9 +19180,6 @@ msgstr "Motorway Junction"
msgid "Number"
msgstr "Number"
-msgid "Exit to"
-msgstr "Exit to"
-
msgid "Services"
msgstr "Services"
@@ -19623,6 +19663,15 @@ msgstr "tidalflat"
msgid "mangrove"
msgstr "mangrove"
+msgid "wet_meadow"
+msgstr "wet_meadow"
+
+msgid "string_bog"
+msgstr "string_bog"
+
+msgid "saltern"
+msgstr "saltern"
+
msgid "Mud"
msgstr "Mud"
@@ -20775,6 +20824,9 @@ msgstr "Firepit"
msgid "Fishing"
msgstr "Fishing"
+msgid "Bird Hide"
+msgstr "Bird Hide"
+
msgid "Night Club"
msgstr "Night club"
@@ -22043,6 +22095,10 @@ msgid "transformer_tower"
msgstr "transformer_tower"
msgctxt "building"
+msgid "public"
+msgstr "public"
+
+msgctxt "building"
msgid "Levels"
msgstr "Levels"
@@ -23233,7 +23289,7 @@ msgstr "Number of conductors/wires per cable"
msgctxt "power"
msgid "single"
-msgstr ""
+msgstr "single"
msgctxt "power"
msgid "double"
@@ -23249,15 +23305,15 @@ msgstr "quad"
msgctxt "power"
msgid "fivefold"
-msgstr ""
+msgstr "fivefold"
msgctxt "power"
msgid "sixfold"
-msgstr ""
+msgstr "sixfold"
msgctxt "power"
msgid "eightfold"
-msgstr ""
+msgstr "eightfold"
msgid "Used for data communications"
msgstr "Used for data communications"
@@ -23312,7 +23368,7 @@ msgstr "plaque"
msgctxt "memorial"
msgid "stele"
-msgstr ""
+msgstr "stele"
msgctxt "memorial"
msgid "stone"
@@ -23320,7 +23376,7 @@ msgstr "stone"
msgctxt "memorial"
msgid "war_memorial"
-msgstr ""
+msgstr "war_memorial"
msgid "Inscription"
msgstr "Inscription"
@@ -23336,7 +23392,7 @@ msgstr "Place of worship"
msgctxt "building"
msgid "wayside_shrine"
-msgstr ""
+msgstr "wayside_shrine"
msgid "Boundary Stone"
msgstr "Boundary Stone"
@@ -23474,7 +23530,7 @@ msgid "Kitchen"
msgstr "Kitchen"
msgid "Houseware"
-msgstr ""
+msgstr "Houseware"
msgid "Curtain"
msgstr "Curtain"
@@ -23519,16 +23575,16 @@ msgid "Chemist"
msgstr "Chemist"
msgid "Cosmetics"
-msgstr ""
+msgstr "Cosmetics"
msgid "Perfumery"
-msgstr ""
+msgstr "Perfumery"
msgid "Beauty"
msgstr "Beauty"
msgid "Tobacco"
-msgstr ""
+msgstr "Tobacco"
msgid "Hairdresser/Barber"
msgstr "Hairdresser/Barber"
@@ -23615,7 +23671,7 @@ msgid "animal_food"
msgstr "animal_food"
msgid "bicycle_tube"
-msgstr ""
+msgstr "bicycle_tube"
msgid "cigarettes"
msgstr "cigarettes"
@@ -23632,8 +23688,8 @@ msgstr "excrement_bags"
msgid "food"
msgstr "food"
-msgid "news_papers"
-msgstr "news_papers"
+msgid "newspapers"
+msgstr "newspapers"
msgid "parking_tickets"
msgstr "parking_tickets"
@@ -23647,8 +23703,8 @@ msgstr "public_transport_plans"
msgid "public_transport_tickets"
msgstr "public_transport_tickets"
-msgid "SIM-cards"
-msgstr "SIM-cards"
+msgid "SIM_cards"
+msgstr "SIM_cards"
msgid "stamps"
msgstr "stamps"
@@ -23859,79 +23915,79 @@ msgid "Telecommunication"
msgstr "Telecommunication"
msgid "Craft"
-msgstr ""
+msgstr "Craft"
msgid "Carpenter"
-msgstr ""
+msgstr "Carpenter"
msgid "Shoemaker"
-msgstr ""
+msgstr "Shoemaker"
msgid "Photographer"
-msgstr ""
+msgstr "Photographer"
msgid "Metal construction"
-msgstr ""
+msgstr "Metal construction"
msgid "Electrician"
-msgstr ""
+msgstr "Electrician"
msgid "Brewery"
-msgstr ""
+msgstr "Brewery"
msgid "Plumber"
-msgstr ""
+msgstr "Plumber"
msgid "Sawmill"
-msgstr ""
+msgstr "Sawmill"
msgid "Gardener"
-msgstr ""
+msgstr "Gardener"
msgid "Winery"
-msgstr ""
+msgstr "Winery"
msgid "Hvac"
-msgstr ""
+msgstr "Hvac"
msgid "Painter"
-msgstr ""
+msgstr "Painter"
msgid "Stonemason"
-msgstr ""
+msgstr "Stonemason"
msgid "Handicraft"
-msgstr ""
+msgstr "Handicraft"
msgid "Pottery"
-msgstr ""
+msgstr "Pottery"
msgid "Key cutter"
-msgstr ""
+msgstr "Key cutter"
msgid "Caterer"
-msgstr ""
+msgstr "Caterer"
msgid "Roofer"
-msgstr ""
+msgstr "Roofer"
msgid "Beekeeper"
-msgstr ""
+msgstr "Beekeeper"
msgid "Blacksmith"
-msgstr ""
+msgstr "Blacksmith"
msgid "Locksmith"
-msgstr ""
+msgstr "Locksmith"
msgid "Window construction"
-msgstr ""
+msgstr "Window construction"
msgid "Upholsterer"
-msgstr ""
+msgstr "Upholsterer"
msgid "Tiler"
-msgstr ""
+msgstr "Tiler"
msgid "Geography"
msgstr "Geography"
@@ -23955,10 +24011,10 @@ msgid "Division"
msgstr "Division"
msgid "canton"
-msgstr ""
+msgstr "canton"
msgid "linguistic_community"
-msgstr ""
+msgstr "linguistic_community"
msgid "ward"
msgstr "ward"
@@ -23982,16 +24038,16 @@ msgid "Border type"
msgstr "Border type"
msgid "baseline"
-msgstr ""
+msgstr "baseline"
msgid "territorial"
-msgstr ""
+msgstr "territorial"
msgid "contiguous"
-msgstr ""
+msgstr "contiguous"
msgid "eez"
-msgstr ""
+msgstr "eez"
msgid "Places"
msgstr "Places"
@@ -24083,13 +24139,13 @@ msgid "extinct"
msgstr "extinct"
msgid "stratovolcano"
-msgstr ""
+msgstr "stratovolcano"
msgid "shield"
-msgstr ""
+msgstr "shield"
msgid "scoria"
-msgstr ""
+msgstr "scoria"
msgid "Ridge"
msgstr "Ridge"
@@ -24157,31 +24213,31 @@ msgstr "Cutline"
msgctxt "cutline"
msgid "border"
-msgstr ""
+msgstr "border"
msgctxt "cutline"
msgid "firebreak"
-msgstr ""
+msgstr "firebreak"
msgctxt "cutline"
msgid "hunting"
-msgstr ""
+msgstr "hunting"
msgctxt "cutline"
msgid "loggingmachine"
-msgstr ""
+msgstr "loggingmachine"
msgctxt "cutline"
msgid "pipeline"
-msgstr ""
+msgstr "pipeline"
msgctxt "cutline"
msgid "piste"
-msgstr ""
+msgstr "piste"
msgctxt "cutline"
msgid "section"
-msgstr ""
+msgstr "section"
msgid "Grassland"
msgstr "Grassland"
@@ -24194,22 +24250,22 @@ msgstr ""
"woody) plants. Excludes cultivated areas and wetlands."
msgid "pampas"
-msgstr ""
+msgstr "pampas"
msgid "prairie"
-msgstr ""
+msgstr "prairie"
msgid "puszta"
-msgstr ""
+msgstr "puszta"
msgid "savanna"
-msgstr ""
+msgstr "savanna"
msgid "steppe"
-msgstr ""
+msgstr "steppe"
msgid "veld"
-msgstr ""
+msgstr "veld"
msgid "Nature Reserve"
msgstr "Nature Reserve"
@@ -24303,23 +24359,23 @@ msgstr "Crop"
msgctxt "crop"
msgid "corn"
-msgstr ""
+msgstr "corn"
msgctxt "crop"
msgid "grass"
-msgstr ""
+msgstr "grass"
msgctxt "crop"
msgid "rice"
-msgstr ""
+msgstr "rice"
msgctxt "crop"
msgid "wheat"
-msgstr ""
+msgstr "wheat"
msgctxt "crop"
msgid "hop"
-msgstr ""
+msgstr "hop"
msgid "Meadow"
msgstr "Meadow"
@@ -24328,49 +24384,49 @@ msgid "Orchard"
msgstr "Orchard"
msgid "Trees"
-msgstr ""
+msgstr "Trees"
msgid "olive_trees"
-msgstr ""
+msgstr "olive_trees"
msgid "apple_trees"
-msgstr ""
+msgstr "apple_trees"
msgid "oil_palms"
-msgstr ""
+msgstr "oil_palms"
msgid "orange_trees"
-msgstr ""
+msgstr "orange_trees"
msgid "almond_trees"
-msgstr ""
+msgstr "almond_trees"
msgid "banana_plants"
-msgstr ""
+msgstr "banana_plants"
msgid "coconut_palms"
-msgstr ""
+msgstr "coconut_palms"
msgid "hazel_plants"
-msgstr ""
+msgstr "hazel_plants"
msgid "cherry_trees"
-msgstr ""
+msgstr "cherry_trees"
msgid "persimmon_trees"
-msgstr ""
+msgstr "persimmon_trees"
msgid "walnut_trees"
-msgstr ""
+msgstr "walnut_trees"
msgid "plum_trees"
-msgstr ""
+msgstr "plum_trees"
msgid "peach_trees"
-msgstr ""
+msgstr "peach_trees"
msgid "tea_plants"
-msgstr ""
+msgstr "tea_plants"
msgid "Vineyard"
msgstr "Vineyard"
@@ -24506,166 +24562,166 @@ msgid "State"
msgstr "State"
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 "Address Interpolation"
@@ -24686,13 +24742,13 @@ msgid "Accuracy"
msgstr "Accuracy"
msgid "actual"
-msgstr ""
+msgstr "actual"
msgid "estimate"
-msgstr ""
+msgstr "estimate"
msgid "potential"
-msgstr ""
+msgstr "potential"
msgid "Contact (Common Schema)"
msgstr "Contact (Common Schema)"
@@ -24757,22 +24813,22 @@ msgid "Boundary type"
msgstr "Boundary type"
msgid "administrative"
-msgstr ""
+msgstr "administrative"
msgid "maritime"
msgstr "maritime"
msgid "national_park"
-msgstr ""
+msgstr "national_park"
msgid "political"
-msgstr ""
+msgstr "political"
msgid "postal_code"
-msgstr ""
+msgstr "postal_code"
msgid "protected_area"
-msgstr ""
+msgstr "protected_area"
msgid "Sub area"
msgstr "Sub area"
@@ -24844,19 +24900,19 @@ msgid "Type of enforcement"
msgstr "Type of enforcement"
msgid "maxheight"
-msgstr ""
+msgstr "maxheight"
msgid "maxweight"
-msgstr ""
+msgstr "maxweight"
msgid "maxspeed"
-msgstr ""
+msgstr "maxspeed"
msgid "mindistance"
-msgstr ""
+msgstr "mindistance"
msgid "check"
-msgstr ""
+msgstr "check"
msgid "Max. height (meters, only if enforcement=maxheight)"
msgstr "Max. height (metres, only if enforcement=maxheight)"
@@ -24886,16 +24942,16 @@ msgid "Bicycle Route"
msgstr "Bicycle Route"
msgid "icn"
-msgstr ""
+msgstr "icn"
msgid "ncn"
-msgstr ""
+msgstr "ncn"
msgid "rcn"
-msgstr ""
+msgstr "rcn"
msgid "lcn"
-msgstr ""
+msgstr "lcn"
msgid "Mountain Biking Route"
msgstr "Mountain Biking Route"
@@ -24904,16 +24960,16 @@ msgid "Hiking Route"
msgstr "Hiking Route"
msgid "iwn"
-msgstr ""
+msgstr "iwn"
msgid "nwn"
-msgstr ""
+msgstr "nwn"
msgid "rwn"
-msgstr ""
+msgstr "rwn"
msgid "lwn"
-msgstr ""
+msgstr "lwn"
msgid "infrastructure"
msgstr "infrastructure"
@@ -24922,7 +24978,22 @@ msgid "natural"
msgstr "natural"
msgid "Walking Route"
-msgstr ""
+msgstr "Walking Route"
+
+msgid "Riding Route"
+msgstr "Riding Route"
+
+msgid "ihn"
+msgstr "ihn"
+
+msgid "nhn"
+msgstr "nhn"
+
+msgid "rhn"
+msgstr "rhn"
+
+msgid "lhn"
+msgstr "lhn"
msgid "Piste Route"
msgstr "Piste Route"
@@ -24948,9 +25019,6 @@ msgstr "alpine"
msgid "Detour Route"
msgstr "Detour Route"
-msgid "Destination"
-msgstr "Destination"
-
msgid "Ref of the way this is a detour to"
msgstr "Ref of the way this is a detour to"
@@ -25033,28 +25101,28 @@ msgid "stream"
msgstr "stream"
msgid "drain"
-msgstr ""
+msgstr "drain"
msgid "ditch"
-msgstr ""
+msgstr "ditch"
msgid "Name of river/lake/sea/ocean it runs into"
msgstr "Name of river/lake/sea/ocean it runs into"
msgid "Reference Sandre (FR)"
-msgstr ""
+msgstr "Reference Sandre (FR)"
msgid "Reference FGKZ (DE)"
-msgstr ""
+msgstr "Reference FGKZ (DE)"
msgid "Reference REGINE (NO)"
-msgstr ""
+msgstr "Reference REGINE (NO)"
msgid "Reference GNIS (USA)"
-msgstr ""
+msgstr "Reference GNIS (USA)"
msgid "Reference GNBC (CA)"
-msgstr ""
+msgstr "Reference GNBC (CA)"
msgid "waterways (no riverbank)"
msgstr "waterways (no riverbank)"
@@ -25110,8 +25178,14 @@ msgstr "Camping"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr "Even housenumber in odd address interpolation."
+
+msgid "Odd housenumber in even address interpolation."
+msgstr "Odd housenumber in even address interpolation."
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr "Way with {0}. Tag each housenumber separately if possible."
msgid "{0} without {1}"
msgstr "{0} without {1}"
@@ -25200,6 +25274,13 @@ msgstr ""
"Wrong usage of {0} tag. Remove {1}, because it is clear that the name is "
"missing even without an additional tag."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} is deprecated. Please use a multipolygon instead."
@@ -25303,6 +25384,9 @@ msgstr "{0} must be connected to a way"
msgid "node connects waterway and bridge"
msgstr "node connects waterway and bridge"
+msgid "{0} node connected to a highway"
+msgstr "{0} node connected to a highway"
+
msgid "suspicious roundabout direction"
msgstr "suspicious roundabout direction"
@@ -25312,6 +25396,16 @@ msgstr "{0} on a large area"
msgid "{0} on a small area"
msgstr "{0} on a small area"
+msgid "Too large building"
+msgstr "Too large building"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+
msgid "abbreviated street name"
msgstr "abbreviated street name"
@@ -26604,7 +26698,7 @@ msgid "Various improvements and bugfixes"
msgstr "Various improvements and bugfixes"
msgid "Errr..."
-msgstr ""
+msgstr "Errr..."
msgid "Browser not supported."
msgstr "Browser not supported."
@@ -26860,7 +26954,7 @@ msgid "Helping tool for tag address"
msgstr "Helping tool for tag address"
msgid "CadastreFR - Buildings"
-msgstr ""
+msgstr "CadastreFR - Buildings"
msgid "Next no"
msgstr "Next no"
@@ -27304,10 +27398,10 @@ msgstr ""
"known by www.cadastre.gouv.fr .</html>"
msgid "Departement"
-msgstr ""
+msgstr "Departement"
msgid "<html>Departement number (optional)</html>"
-msgstr ""
+msgstr "<html>Departement number (optional)</html>"
msgid "Add new layer"
msgstr "Add new layer"
@@ -28664,19 +28758,82 @@ msgid "Please open or create data layer before importing"
msgstr "Please open or create data layer before importing"
msgid "Concourse wizard ..."
-msgstr ""
+msgstr "Concourse wizard ..."
msgid "Opens up a wizard to create a concourse"
-msgstr ""
+msgstr "Opens up a wizard to create a concourse"
msgid "Vertical layer:"
-msgstr ""
+msgstr "Vertical layer:"
msgid "Structure type:"
-msgstr ""
+msgstr "Structure type:"
msgid "Offset into background:"
+msgstr "Offset into background:"
+
+msgid "Indoor Mapping Helper"
+msgstr "Indoor Mapping Helper"
+
+msgid "POWER"
+msgstr "POWER"
+
+msgid "Activates the plug-in"
+msgstr "Activates the plug-in"
+
+msgid "Working Level"
+msgstr "Working Level"
+
+msgid "Selects the working level."
+msgstr "Selects the working level."
+
+msgid "Level Name"
+msgstr "Level Name"
+
+msgid "Optional name-tag for a level."
+msgstr "Optional name-tag for a level."
+
+msgid "The object preset you want to tag."
+msgstr "The object preset you want to tag."
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr "Sets the name tag when the room-object is selected."
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr "Sets the ref tag when the room-object is selected."
+
+msgid "Apply Tags"
+msgstr "Apply Tags"
+
+msgid "Fitting"
+msgstr "Fitting"
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
msgstr ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+
+msgid "Level Selection"
+msgstr "Level Selection"
+
+msgid "Lowest Level"
+msgstr "Lowest Level"
+
+msgid "The lowest level of your building."
+msgstr "The lowest level of your building."
+
+msgid "Highest Level"
+msgstr "Highest Level"
+
+msgid "The highest level of your building."
+msgstr "The highest level of your building."
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr "Toolbox for indoor mapping assistance"
msgid "InfoMode"
msgstr "InfoMode"
@@ -28786,7 +28943,7 @@ msgid "Check "
msgstr "Check "
msgid "check the subust for junction properties"
-msgstr ""
+msgstr "check the subust for junction properties"
msgid "Search "
msgstr "Search "
@@ -31087,6 +31244,15 @@ msgstr "Public Transport: Enable waypoints"
msgid "Public Transport: Edit waypoint name"
msgstr "Public Transport: Edit waypoint name"
+msgid "Distance between stops"
+msgstr "Distance between stops"
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr "A valid public_transport:version=2 route is required"
+
+msgid "Invalid selection"
+msgstr "Invalid selection"
+
msgid "Public transport routes"
msgstr "Public transport routes"
@@ -31286,13 +31452,13 @@ msgid "Missing merge target for {0} with id {1}"
msgstr "Missing merge target for {0} with id {1}"
msgid "Objects history"
-msgstr ""
+msgstr "Objects history"
msgid "History reverter"
msgstr "History reverter"
msgid "Tool: Display objects history dialog"
-msgstr ""
+msgstr "Tool: Display objects history dialogue"
msgid "Preparing history data..."
msgstr "Preparing history data..."
@@ -31902,9 +32068,6 @@ msgstr "Terrace a building"
msgid "Creates individual buildings from a long building."
msgstr "Creates individual buildings from a long building."
-msgid "Invalid selection"
-msgstr "Invalid selection"
-
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 "
@@ -32303,7 +32466,7 @@ msgid "Aerial Photography"
msgstr "Aerial Photography"
msgid "Web Recherche"
-msgstr ""
+msgstr "Web Recherche"
msgid "Trusted persons told me"
msgstr "Trusted persons told me"
@@ -33350,20 +33513,22 @@ msgid "Replace geometry for way {0}"
msgstr "Replace geometry for way {0}"
msgid "Replace Membership"
-msgstr ""
+msgstr "Replace Membership"
msgid ""
"In relations where the selected object is member of, replace it with a new "
"one"
msgstr ""
+"In relations where the selected object is member of, replace it with a new "
+"one"
msgid "Replaced ''{0}'' by ''{1}'' in {2} relation"
msgid_plural "Replaced ''{0}'' by ''{1}'' in {2} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Replaced ''{0}'' by ''{1}'' in {2} relation"
+msgstr[1] "Replaced ''{0}'' by ''{1}'' in {2} relations"
msgid "The first selected object ''{0}'' is not part of any relation"
-msgstr ""
+msgstr "The first selected object ''{0}'' is not part of any relation"
msgid "Range of child primitives count"
msgstr "Range of child primitives count"
@@ -33816,17 +33981,3 @@ msgstr "Go driving"
msgid "Drive a race car on this layer"
msgstr "Drive a race car on this layer"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Illegal dash pattern, values must be positive"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Illegal dash pattern, at least one value must be > 0"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 80d1d36..ed5e276 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2012-10-03 21:33+0000\n"
"Last-Translator: Michael Moroni <michael.moroni at openmailbox.org>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:40+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:40+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "Versio de Javo {0}"
msgid "Homepage"
msgstr "Hejmpaĝo"
-msgid "Bug Reports"
-msgstr "Cimaj raportoj"
-
msgid "Info"
msgstr "Informo"
@@ -172,6 +169,12 @@ msgstr "Kromprogramoj"
msgid "About JOSM..."
msgstr "Pri JOSM…"
+msgid "OK"
+msgstr "Bone"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -576,9 +579,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "Bone"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1168,9 +1168,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1780,6 +1777,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1929,9 +1950,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2247,8 +2265,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3029,9 +3047,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3051,27 +3066,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4129,6 +4123,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4774,6 +4771,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Kreado de la Grafika Interfaco (GUI)"
+
msgid "Updating plugins"
msgstr ""
@@ -4783,12 +4786,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Kreado de la Grafika Interfaco (GUI)"
-
msgid "Loading plugins"
msgstr ""
@@ -5759,6 +5756,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6246,51 +6267,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr "Forigi la elektitajn tavolojn."
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "Kopio de {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopio n-ro {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6313,12 +6289,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6741,15 +6711,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6855,9 +6816,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7009,14 +6967,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7101,15 +7051,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7127,6 +7068,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr "Forigi la elektitajn tavolojn."
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "Kopio de {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopio n-ro {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7442,10 +7452,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9101,9 +9111,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9906,12 +9913,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11919,6 +11920,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12429,6 +12436,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13674,62 +13689,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13981,9 +13940,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14168,6 +14124,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14502,13 +14518,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14517,7 +14533,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14529,15 +14551,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14634,6 +14653,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14658,13 +14680,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14811,10 +14833,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14867,29 +14889,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14937,6 +14958,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14997,6 +15021,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15033,10 +15060,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15138,6 +15162,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15147,6 +15174,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15802,6 +15832,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17159,6 +17194,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17735,9 +17776,6 @@ msgstr ""
msgid "Number"
msgstr "Nombro"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18216,6 +18254,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19364,6 +19411,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20632,6 +20682,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22219,7 +22273,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22234,7 +22288,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23489,6 +23543,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23513,9 +23582,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23675,7 +23741,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23759,6 +23831,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23857,6 +23934,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23866,6 +23946,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26965,6 +27053,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29286,6 +29434,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30070,9 +30227,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/es.po b/i18n/po/es.po
index 991379b..c002717 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-11 08:52+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-29 03:19+0000\n"
+"Last-Translator: Omar Vega <ovruni at gnu.org.pe>\n"
"Language-Team: Spanish <es at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:04+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:03+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -153,9 +153,6 @@ msgstr "Versión de Java {0}"
msgid "Homepage"
msgstr "Página principal"
-msgid "Bug Reports"
-msgstr "Informe de errores"
-
msgid "Info"
msgstr "Información"
@@ -177,6 +174,12 @@ msgstr "Complementos"
msgid "About JOSM..."
msgstr "Acerca de JOSM..."
+msgid "OK"
+msgstr "Aceptar"
+
+msgid "Report bug"
+msgstr "Reportar error"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Hubo una falla al ubicar el recurso ''{0}''."
@@ -604,9 +607,6 @@ msgstr "Ajusta la posición de esta capa de imágenes"
msgid "Adjust imagery offset"
msgstr "Ajustar desplazamiento de imágenes"
-msgid "OK"
-msgstr "Aceptar"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1281,9 +1281,6 @@ msgstr "También renombrar el archivo"
msgid "Could not rename file ''{0}''"
msgstr "No se pudo renombrar el archivo ''{0}''"
-msgid "Report bug"
-msgstr "Reportar error"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Reporta un billete para JOSM bugtracker"
@@ -1942,6 +1939,31 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avance lento"
+msgid "Downloading changeset content"
+msgstr "Descargando el contenido de la modificación"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Descargando modificación {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+"({0}/{1}) Descargando el contenido para el conjunto de cambios {2}..."
+
+msgid "Download changesets"
+msgstr "Descargar modificaciones"
+
+msgid "Querying and downloading changesets"
+msgstr "Consultando y descargando modificaciones"
+
+msgid "Determine user id for current user..."
+msgstr "Determinar el ID de usuario para el usuario actual..."
+
+msgid "Query and download changesets ..."
+msgstr "Consultar y descargar modificaciones..."
+
+msgid "Errors during download"
+msgstr "Errores durante la descarga"
+
msgid "Download GPS"
msgstr "Descargar GPS"
@@ -2108,9 +2130,6 @@ msgstr "Objetos movidos o eliminados"
msgid "The following errors occurred during mass download: {0}"
msgstr "Los siguientes errores se produjeron durante la descarga masiva: {0}"
-msgid "Errors during download"
-msgstr "Errores durante la descarga"
-
msgid "Error during download"
msgstr "Error durante la descarga"
@@ -2464,11 +2483,9 @@ msgid "Add selection to relation"
msgstr "Añadir la selección a la relación"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Añadir la selección a la relación</strong>: ¡controle cada "
-"relación por separado para evitar daños!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3314,9 +3331,6 @@ msgstr "Resolver conflictos en la lista de nodos de la vía {0}"
msgid "Main dataset does not include node {0}"
msgstr "El conjunto de datos principal no incluye el nodo {0}"
-msgid "Apply?"
-msgstr "¿Aplicar?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3346,27 +3360,6 @@ msgstr ""
"Al invertir esta vía se sugieren los siguientes cambios con el fin de "
"mantener la coherencia de los datos."
-msgid "Relation"
-msgstr "Relación"
-
-msgid "Old role"
-msgstr "Función antigua"
-
-msgid "New role"
-msgstr "Función nueva"
-
-msgid "Old key"
-msgstr "Clave antigua"
-
-msgid "Old value"
-msgstr "Valor anterior"
-
-msgid "New key"
-msgstr "Clave nueva"
-
-msgid "New value"
-msgstr "Nuevo valor"
-
msgid "Apply selected changes"
msgstr "Aplicar los cambios seleccionados"
@@ -4539,6 +4532,9 @@ msgstr "La relación de la ruta contiene un \"{0}\" rol"
msgid "Route relation contains a gap"
msgstr "Le relación de la ruta contiene una interrupción"
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problema de verificación de función"
@@ -5220,6 +5216,12 @@ msgstr "Activado nivel de depuración detallada (trazas)"
msgid "Initializing"
msgstr "Inicializando"
+msgid "Setting defaults"
+msgstr "Ajuste de predefinidos"
+
+msgid "Creating main GUI"
+msgstr "Creando la interfaz principal de usuario"
+
msgid "Updating plugins"
msgstr "Actualizando componentes"
@@ -5229,12 +5231,6 @@ msgstr "Instalando complementos actualizados"
msgid "Loading early plugins"
msgstr "Cargando los primeros complementos"
-msgid "Setting defaults"
-msgstr "Ajuste de predefinidos"
-
-msgid "Creating main GUI"
-msgstr "Creando la interfaz principal de usuario"
-
msgid "Loading plugins"
msgstr "Cargando los complementos"
@@ -6334,6 +6330,30 @@ msgstr "Mostrar solo etiquetas con conflictos"
msgid "Show tags with multiple values only"
msgstr "Mostrar sólo los atributos con valores múltiples"
+msgid "Apply?"
+msgstr "¿Aplicar?"
+
+msgid "Relation"
+msgstr "Relación"
+
+msgid "Old role"
+msgstr "Función antigua"
+
+msgid "New role"
+msgstr "Función nueva"
+
+msgid "Old key"
+msgstr "Clave antigua"
+
+msgid "Old value"
+msgstr "Valor anterior"
+
+msgid "New key"
+msgstr "Clave nueva"
+
+msgid "New value"
+msgstr "Nuevo valor"
+
msgid "For selected objects only"
msgstr "Sólo para objetos seleccionados"
@@ -6872,51 +6892,6 @@ msgstr "Conmutar visibilidad de la capa: {0}"
msgid "Open a list of all loaded layers."
msgstr "Abrir un listado de todas las capas cargadas."
-msgid "Delete the selected layers."
-msgstr "Suprime las capas seleccionadas"
-
-msgid "Show/hide"
-msgstr "Mostar/Ocultar"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Cambia estado de visibilidad de la capa seleccionada."
-
-msgid "Show/hide layer"
-msgstr "Mostrar/ocultar capa"
-
-msgid "Opacity"
-msgstr "Opacidad"
-
-msgid "Adjust opacity of the layer."
-msgstr "Ajustar opacidad de la capa"
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Ajustar el valor gamma de la capa."
-
-msgid "Activate"
-msgstr "Activar"
-
-msgid "Activate the selected layer"
-msgstr "Activa la capa selecionada"
-
-msgid "Activate layer"
-msgstr "Activar capa"
-
-msgid "Merge this layer into another layer"
-msgstr "Combina esta capa con otra"
-
-msgid "Duplicate this layer"
-msgstr "Duplicar esta capa"
-
-msgid "Copy of {0}"
-msgstr "Copia de {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copia {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "la capa está actualmente visible (haz clic para ocultar la capa)"
@@ -6941,12 +6916,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "esta capa no tiene una resolución nativa"
-msgid "Move the selected layer one row up."
-msgstr "Mover la capa seleccionada una fila arriba"
-
-msgid "Move the selected layer one row down."
-msgstr "Mover la capa seleccionada una fila abajo"
-
msgid "Information about layer"
msgstr "Información de capa"
@@ -7389,16 +7358,6 @@ msgstr "Cerrado el"
msgid "Discussions"
msgstr "Discusiones"
-msgid "Downloading changeset content"
-msgstr "Descargando el contenido de la modificación"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Descargando modificación {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-"({0}/{1}) Descargando el contenido para el conjunto de cambios {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7517,9 +7476,6 @@ msgstr "Actualización de la discusión de cambios desde el servidor de OSM"
msgid "Date"
msgstr "Fecha"
-msgid "Download changesets"
-msgstr "Descargar modificaciones"
-
msgid "{0} [incomplete]"
msgstr "{0} [incompleta]"
@@ -7697,16 +7653,6 @@ msgid "Please enter an integer value > 0"
msgstr "Por favor, introduzca un valor entero > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>El valor actual no es un nombre de usuario válido.<br>Introduzca un "
-"nombre de usuario no vacío.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Por favor, introduzca un nombre de usuario no vacío"
-
-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 ""
@@ -7815,15 +7761,6 @@ msgstr "URL de consulta de modificaciones incorrecta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Cerrar el cuadro de diálogo y abortar la consulta de modificaciones"
-msgid "Querying and downloading changesets"
-msgstr "Consultando y descargando modificaciones"
-
-msgid "Determine user id for current user..."
-msgstr "Determinar el ID de usuario para el usuario actual..."
-
-msgid "Query and download changesets ..."
-msgstr "Consultar y descargar modificaciones..."
-
msgid "URL: "
msgstr "URL: "
@@ -7844,6 +7781,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "La URL de consulta de modificaciones no es válida"
+msgid "Activate"
+msgstr "Activar"
+
+msgid "Activate the selected layer"
+msgstr "Activa la capa selecionada"
+
+msgid "Activate layer"
+msgstr "Activar capa"
+
+msgid "Delete the selected layers."
+msgstr "Suprime las capas seleccionadas"
+
+msgid "Duplicate this layer"
+msgstr "Duplicar esta capa"
+
+msgid "Copy of {0}"
+msgstr "Copia de {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copia {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr "Mostrar capa"
+
+msgid "Adjust opacity of the layer."
+msgstr "Ajustar opacidad de la capa"
+
+msgid "Opacity"
+msgstr "Opacidad"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Ajustar el valor gamma de la capa."
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr "Nitidez"
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr "Colorido"
+
+msgid "Merge this layer into another layer"
+msgstr "Combina esta capa con otra"
+
+msgid "Move the selected layer one row down."
+msgstr "Mover la capa seleccionada una fila abajo"
+
+msgid "Move the selected layer one row up."
+msgstr "Mover la capa seleccionada una fila arriba"
+
+msgid "Show/hide"
+msgstr "Mostar/Ocultar"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Cambia estado de visibilidad de la capa seleccionada."
+
+msgid "Show/hide layer"
+msgstr "Mostrar/ocultar capa"
+
msgid "Discardable key: selection Foreground"
msgstr "Clave descartable: selección de Frente"
@@ -8172,14 +8178,14 @@ msgstr "Relaciones padre"
msgid "Child Relations"
msgstr "Relaciones hijas"
-msgid "Apply Role:"
-msgstr "Aplicar función:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
"Introducir una función y aplicarla a los miembros de la relación "
"seleccionados."
+msgid "Apply Role:"
+msgstr "Aplicar función:"
+
msgid "New Relation"
msgstr "Nueva relación"
@@ -10094,9 +10100,6 @@ msgstr "Transparencia de imágenes"
msgid "Unsupported imagery type: {0}"
msgstr "Tipo de imagen no soportado: {0}"
-msgid "ERROR"
-msgstr "ERROR"
-
msgid "Next marker"
msgstr "Siguiente marcador"
@@ -11000,14 +11003,6 @@ msgstr "Volver a ejecutar los pasos automáticos de autorización"
msgid "Test Access Token"
msgstr "Probar llave de Acceso"
-msgid "Please enter your OSM user name"
-msgstr "Por favor, introduzca su nombre de usuario de OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"El nombre de usuario no puede estar vacío. Por favor, introduzca su nombre "
-"de usuario de OSM"
-
msgid "Please enter your OSM password"
msgstr "Por favor, introduzca su contraseña de OSM"
@@ -13286,6 +13281,14 @@ msgstr "Ajustes de la conexión"
msgid "Connection Settings for the OSM server."
msgstr "Configuración de conexión del servidor OSM."
+msgid "Please enter your OSM user name"
+msgstr "Por favor, introduzca su nombre de usuario de OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"El nombre de usuario no puede estar vacío. Por favor, introduzca su nombre "
+"de usuario de OSM"
+
msgid "Action"
msgstr "Acción"
@@ -13856,6 +13859,14 @@ msgstr ""
"El valor de atributo ''{0}'' del elemento ''{1}'' no está permitido para las "
"posibilidades del servidor. Se obtuvo''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Fallo al verificar la fecha \"{0}\" respondida por el servidor."
@@ -15279,80 +15290,6 @@ msgstr "Razón no especificada"
msgid "Error playing sound"
msgstr "Error reproduciendo sonido"
-msgid "Do nothing"
-msgstr "No hacer nada"
-
-msgid "Report Bug"
-msgstr "Informar del error"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Ocurrió una excepción inesperada.<br> Esto siempre es un error de "
-"codificación. Si está ejecutando la última<br>versión de JOSM, por favor sea "
-"tan amable de presentar un informe de error."
-
-msgid "Update JOSM"
-msgstr "Actualizar JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Un error inesperado ocurrió. Esto es debido siempre a un error de "
-"programación. <br><br> Sin embargo, si estás utilizando una versión antigua "
-"de JOSM ({0}),<br> en vez de usar la versión probada actual "
-"(<b>{1}</b>).<br><br><b>Por favor actualiza JOSM</br> antes de enviar un "
-"informe de error."
-
-msgid "Unexpected Exception"
-msgstr "Excepción inesperada"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Suprimir otros mensajes de error durante esta sesión."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Ha encontrado un error en JOSM. Antes de informar de un fallo asegúrese de "
-"haber actualizado a la última versión de JOSM aquí:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"También debería actualizar sus complementos. Si ninguna opción ayuda, por "
-"favor, presente un informe de erroren nuestro sistema de seguimiento de "
-"fallos en la siguiente dirección:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Allí la información del error ya deberá ser rellenada por usted. Por favor "
-"incluya información de cómo reproducir el error e intente ofrecer tanto "
-"detalle como le sea posible."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Por otra parte, si no funciona, puede rellenar manualmente la información en "
-"esta URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(El texto ya ha sido copiado a tu portapapeles.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Ha encontrado un error en JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15727,9 +15664,6 @@ msgstr "Descarga redirigida a \"{0}\""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Demasiadas redirecciones detectadas a la URL de descarga. Abortando."
-msgid "Fetching content..."
-msgstr "Buscando el contenido..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"No se puede encontrar la traducción para el idioma {0}. Revertiendo a {1}."
@@ -15950,6 +15884,84 @@ msgstr "Ignorando geometría mal formada: {0}"
msgid "Failed to load XML schema."
msgstr "Error al cargar el esquema XML."
+msgid "Do nothing"
+msgstr "No hacer nada"
+
+msgid "Report Bug"
+msgstr "Informar del error"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Ocurrió una excepción inesperada.<br> Esto siempre es un error de "
+"codificación. Si está ejecutando la última<br>versión de JOSM, por favor sea "
+"tan amable de presentar un informe de error."
+
+msgid "Update JOSM"
+msgstr "Actualizar JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Un error inesperado ocurrió. Esto es debido siempre a un error de "
+"programación. <br><br> Sin embargo, si estás utilizando una versión antigua "
+"de JOSM ({0}),<br> en vez de usar la versión probada actual "
+"(<b>{1}</b>).<br><br><b>Por favor actualiza JOSM</br> antes de enviar un "
+"informe de error."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Suprimir otros mensajes de error durante esta sesión."
+
+msgid "Unexpected Exception"
+msgstr "Excepción inesperada"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Ha encontrado un error en JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Ha encontrado un error en JOSM. Antes de informar de un fallo asegúrese de "
+"haber actualizado a la última versión de JOSM aquí:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"También debería actualizar sus complementos. Si ninguna opción ayuda, por "
+"favor, presente un informe de erroren nuestro sistema de seguimiento de "
+"fallos en la siguiente dirección:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Allí la información del error ya deberá ser rellenada por usted. Por favor "
+"incluya información de cómo reproducir el error e intente ofrecer tanto "
+"detalle como le sea posible."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Por otra parte, si no funciona, puede rellenar manualmente la información en "
+"esta URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(El texto ya ha sido copiado a tu portapapeles.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16300,14 +16312,14 @@ msgstr "Imagen Satelital Mapbox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "Trazas de GPS OpenStreetMap"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Capa estándar)"
+msgid "OpenSeaMap"
+msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik blanco y negro)"
@@ -16315,8 +16327,14 @@ msgstr "OpenStreetMap (Mapnik blanco y negro)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sin etiquetas)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (estilo alemán)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "Trazas de GPS OpenStreetMap"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16327,15 +16345,12 @@ msgstr "Transporte Público (ÖPNV)"
msgid "Hike & Bike"
msgstr "Ciclismo & Montañismo"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (estilo alemán)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingüe"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (superposición)"
@@ -16432,6 +16447,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mapa base)"
@@ -16456,14 +16474,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Invierno Echtfarbenbild 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (modelo de terreno)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (modelo de superficie)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr ""
@@ -16610,11 +16628,11 @@ msgstr "Géolittoral V2 - Orthofotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr "Lyon - Orthofoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr "Lyon - Orthofoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlántico - Ortofotos 2012 - 20 cm"
@@ -16667,6 +16685,15 @@ msgstr "Bavaria (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr "Imágenes aéreas de Stuttgart"
@@ -16684,18 +16711,6 @@ msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
"Antiguo mapa de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "DE físico - Mapa físico (regiones naturales)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "DE:Harz físico - Mapa físico (regiones naturales)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"DE:Harz Físico - Superposición para Bing (utiliza una opacidad de entre 20% "
-"y 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16741,6 +16756,9 @@ msgstr "Törökbálint ortofoto 2013"
msgid "5 cm resolution bald image"
msgstr "imagen cruda resolución de 5 cm"
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr "Inundación del Danubio ortofoto de 2013"
@@ -16801,6 +16819,9 @@ msgstr "OSMIE T.ie Tierra que no está en condados"
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardía - Italia (CTR DBT)"
@@ -16837,11 +16858,8 @@ msgstr "1.cikla ortofotokarte - Latvia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lituania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxemburgo Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxemburgo Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Ferrocarril Inspire Luxemburgo"
@@ -16942,6 +16960,9 @@ msgstr "Powiat poznański: Budynki (edificios)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (imagen aérea)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (edificios)"
@@ -16951,6 +16972,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (Imagen aérea)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (edificios)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (edificios)"
@@ -17670,6 +17694,11 @@ msgstr ""
"interiores."
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -19129,6 +19158,12 @@ msgstr "Calles/Carreteras"
msgid "Motorway"
msgstr "Autopista"
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr "Ubicación"
@@ -19726,9 +19761,6 @@ msgstr "Salida de autopista"
msgid "Number"
msgstr "Número"
-msgid "Exit to"
-msgstr "Salida para"
-
msgid "Services"
msgstr "Servicios"
@@ -19823,7 +19855,7 @@ msgid "Traffic Calming"
msgstr "Calmado de tráfico"
msgid "Bump"
-msgstr "Bandas de frenado"
+msgstr "Banda de frenado o badén"
msgid "Chicane"
msgstr "Chicane"
@@ -20214,6 +20246,15 @@ msgstr "superficie mareal"
msgid "mangrove"
msgstr "manglar"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Lodazal"
@@ -20647,7 +20688,7 @@ msgid "Covered (with roof)"
msgstr "Cubierto (con tejado)"
msgid "Parking Entrance"
-msgstr "Entrada al aparcamiento"
+msgstr "Entrada de aparcamiento"
msgid "Fuel"
msgstr "Gasolinera"
@@ -21369,6 +21410,9 @@ msgstr "hoguera"
msgid "Fishing"
msgstr "Pesca"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Club nocturno"
@@ -22641,6 +22685,10 @@ msgid "transformer_tower"
msgstr "torre transformadora"
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Niveles"
@@ -24230,11 +24278,11 @@ msgstr "Bolsas para excrementos"
msgid "food"
msgstr "Alimentación"
-msgid "news_papers"
-msgstr "Periódicos"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
-msgstr "billetes de aparcamiento"
+msgstr "tickets de aparcamiento"
msgid "photos"
msgstr "fotos"
@@ -24245,8 +24293,8 @@ msgstr "abonos de transporte público"
msgid "public_transport_tickets"
msgstr "billetes de de transporte público"
-msgid "SIM-cards"
-msgstr "Tarjetas SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "sellos"
@@ -25533,6 +25581,21 @@ msgstr "espacio natural"
msgid "Walking Route"
msgstr "Ruta peatonal"
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Ruta de pista"
@@ -25557,9 +25620,6 @@ msgstr "alpino"
msgid "Detour Route"
msgstr "Ruta desvío"
-msgid "Destination"
-msgstr "Destino"
-
msgid "Ref of the way this is a detour to"
msgstr "Referencia de la vía en que esta es un desvío hacia"
@@ -25719,8 +25779,14 @@ msgstr "Camping"
msgid "Test"
msgstr "Prueba"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Decrementando números de portal en la interpolación de portales"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} sin {1}"
@@ -25811,6 +25877,11 @@ msgstr ""
"Uso incorrecto de la etiqueta {0}. Elimine {1}, debido a que queda claro que "
"el nombre está ausente incluso sin una etiqueta adicional ."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} está en desuso. Por favor utilice en su lugar un multipolígono."
@@ -25917,6 +25988,9 @@ msgstr "{0} debe estar conectado a una vía"
msgid "node connects waterway and bridge"
msgstr "el nodo conecta a una vía fluvial y puente"
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr "Dirección de rotonda sospechosa"
@@ -25926,6 +26000,14 @@ msgstr "{0} en un área grande"
msgid "{0} on a small area"
msgstr "{0} en un área pequeña"
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nombre de calle abreviado"
@@ -29378,6 +29460,66 @@ msgstr "Tipo de estructura:"
msgid "Offset into background:"
msgstr "Valor de desviación respecto al origen:"
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "ModoInfo"
@@ -31837,6 +31979,15 @@ msgstr "Transporte público: activar puntos de ruta"
msgid "Public Transport: Edit waypoint name"
msgstr "Transporte público: editar nombre del punto de ruta"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Selección no válida"
+
msgid "Public transport routes"
msgstr "Rutas de transporte público"
@@ -32671,9 +32822,6 @@ msgstr "Adosar un edificio"
msgid "Creates individual buildings from a long building."
msgstr "Crea edificios individuales a partir de un gran edificio."
-msgid "Invalid selection"
-msgstr "Selección no válida"
-
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 "
@@ -34657,18 +34805,3 @@ msgstr "Ir a manejar"
msgid "Drive a race car on this layer"
msgstr "Conduce un vehículo de carreras en esta capa"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Patrón de guiones ilegal, por lo menos un valor debe ser > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Patrón de guiones ilegal, los valores deben ser positivos"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Error al analizar los estilos Mappaint desde ''{0}''. El error fue: "
-#~ "[{1}:{2}] {3}"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 9e2970c..eab3da4 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2016-01-02 11:25+0000\n"
"Last-Translator: AivoK <aivo.kuhlberg at hot.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:41+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:40+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -153,9 +153,6 @@ msgstr "Java versioon {0}"
msgid "Homepage"
msgstr "Koduleht"
-msgid "Bug Reports"
-msgstr "Vigadest teatamine"
-
msgid "Info"
msgstr "Info"
@@ -177,6 +174,12 @@ msgstr "Pluginad"
msgid "About JOSM..."
msgstr "JOSMi kohta"
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Teata veast"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -591,9 +594,6 @@ msgstr "Sea selle aluskaardi asukoht"
msgid "Adjust imagery offset"
msgstr "Sea aluskaardi nihe"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1211,9 +1211,6 @@ msgstr "Nimeta fail ka ümber."
msgid "Could not rename file ''{0}''"
msgstr "Faili ''{0}'' ei ole võimalik ümber nimetada."
-msgid "Report bug"
-msgstr "Teata veast"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1842,6 +1839,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Aeglasemalt edasi"
+msgid "Downloading changeset content"
+msgstr "Laadin alla muutustekogumi sisu"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Laadin alla muutustekogumit {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Laadin alla muutustekogumi {2} sisu..."
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr "Muutustekogumite pärimine ja allalaadimine"
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr "Viga allalaadimisel"
+
msgid "Download GPS"
msgstr "GPS allalaadimine"
@@ -1995,9 +2016,6 @@ msgstr "Eemaldatud või liigutatud objektid"
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr "Viga allalaadimisel"
-
msgid "Error during download"
msgstr "Viga allalaadimisel"
@@ -2323,8 +2341,8 @@ msgid "Add selection to relation"
msgstr "Lisa valik relatsioonile"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3124,9 +3142,6 @@ msgstr "Lahenda vastuolud tee {0} sõlmede nimistus"
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3146,27 +3161,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4224,6 +4218,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4869,6 +4866,12 @@ msgstr ""
msgid "Initializing"
msgstr "Lähtestamine"
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Loon kasutajaliidest"
+
msgid "Updating plugins"
msgstr ""
@@ -4878,12 +4881,6 @@ msgstr "Paigaldan uuendatud pluginaid"
msgid "Loading early plugins"
msgstr "Varaste pluginate laadimine"
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Loon kasutajaliidest"
-
msgid "Loading plugins"
msgstr "Pluginate laadimine"
@@ -5855,6 +5852,30 @@ msgstr "Näidatakse ainult konfliktseid silte"
msgid "Show tags with multiple values only"
msgstr "Näidatakse ainult erinevate väärtustega silte"
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr "Ainult valitud objektid"
@@ -6343,51 +6364,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "Ava kõikide laetud kihtide nimekiri."
-msgid "Delete the selected layers."
-msgstr "Kustuta valitud kihid"
-
-msgid "Show/hide"
-msgstr "Näita/peida"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Muuda valitud kihi nähtavust."
-
-msgid "Show/hide layer"
-msgstr "Näita/peida kihti"
-
-msgid "Opacity"
-msgstr "Läbipaistvus"
-
-msgid "Adjust opacity of the layer."
-msgstr "Muuda valitud kihi läbipaistvust"
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Aktiveeri"
-
-msgid "Activate the selected layer"
-msgstr "Aktiveeri valitud kiht"
-
-msgid "Activate layer"
-msgstr "Aktiveeri kiht"
-
-msgid "Merge this layer into another layer"
-msgstr "Liida see kiht teisega"
-
-msgid "Duplicate this layer"
-msgstr "Tee valitud kihist koopia"
-
-msgid "Copy of {0}"
-msgstr "{0} koopia"
-
-msgid "Copy {1} of {0}"
-msgstr "Koopia nr {1} kihist {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "Kiht on praegu nähtav (klõpsa, et see peita)"
@@ -6410,12 +6386,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Liiguta valitud kiht ühe rea võrra üles."
-
-msgid "Move the selected layer one row down."
-msgstr "Liiguta valitud kiht ühe rea võrra alla."
-
msgid "Information about layer"
msgstr "Teave kihi kohta"
@@ -6839,15 +6809,6 @@ msgstr "Suletud"
msgid "Discussions"
msgstr "Arutelud"
-msgid "Downloading changeset content"
-msgstr "Laadin alla muutustekogumi sisu"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Laadin alla muutustekogumit {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Laadin alla muutustekogumi {2} sisu..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6957,9 +6918,6 @@ msgstr "Värskendab OSM serverist antud muutuskogumi arutelu"
msgid "Date"
msgstr "Kuupäev"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr "{0} [lõpetamata]"
@@ -7113,14 +7071,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7213,15 +7163,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr "Muutustekogumite pärimine ja allalaadimine"
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7239,6 +7180,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr "Aktiveeri"
+
+msgid "Activate the selected layer"
+msgstr "Aktiveeri valitud kiht"
+
+msgid "Activate layer"
+msgstr "Aktiveeri kiht"
+
+msgid "Delete the selected layers."
+msgstr "Kustuta valitud kihid"
+
+msgid "Duplicate this layer"
+msgstr "Tee valitud kihist koopia"
+
+msgid "Copy of {0}"
+msgstr "{0} koopia"
+
+msgid "Copy {1} of {0}"
+msgstr "Koopia nr {1} kihist {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Muuda valitud kihi läbipaistvust"
+
+msgid "Opacity"
+msgstr "Läbipaistvus"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Liida see kiht teisega"
+
+msgid "Move the selected layer one row down."
+msgstr "Liiguta valitud kiht ühe rea võrra alla."
+
+msgid "Move the selected layer one row up."
+msgstr "Liiguta valitud kiht ühe rea võrra üles."
+
+msgid "Show/hide"
+msgstr "Näita/peida"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Muuda valitud kihi nähtavust."
+
+msgid "Show/hide layer"
+msgstr "Näita/peida kihti"
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7554,12 +7564,12 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
-msgstr "Määra roll:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
+msgid "Apply Role:"
+msgstr "Määra roll:"
+
msgid "New Relation"
msgstr ""
@@ -9257,9 +9267,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -10080,13 +10087,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr "Palun sisesta oma OSMi kasutajanimi"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Kasutajanime väli ei tohi olla tühi. Palun sisesta oma OSMi kasutajanimi"
-
msgid "Please enter your OSM password"
msgstr "Palun sisesta oma OSMi salasõna"
@@ -12118,6 +12118,13 @@ msgstr "Ühenduse sätted"
msgid "Connection Settings for the OSM server."
msgstr "Ühenduse sätted OSM serveri jaoks."
+msgid "Please enter your OSM user name"
+msgstr "Palun sisesta oma OSMi kasutajanimi"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Kasutajanime väli ei tohi olla tühi. Palun sisesta oma OSMi kasutajanimi"
+
msgid "Action"
msgstr "Toiming"
@@ -12632,6 +12639,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13846,112 +13861,53 @@ msgstr ""
msgid "Processing plugin files..."
msgstr "Plugina failide töötlemine..."
-
-msgid "Download plugin list..."
-msgstr ""
-
-msgid "Downloading plugin list from ''{0}''"
-msgstr "Pluginate nimekirja allalaadimine aadressilt ''{0}''"
-
-msgid "Unsuccessful HTTP request"
-msgstr ""
-
-msgid "Plugin list download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin list:"
-msgstr ""
-
-msgid "Details:"
-msgstr ""
-
-msgid ""
-"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
-"plugin site ''{1}''."
-msgstr ""
-
-msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
-
-msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
-
-msgid ""
-"Failed to parse plugin list document from site ''{0}''. Skipping site. "
-"Exception was: {1}"
-msgstr ""
-
-msgid "Processing plugin list from site ''{0}''"
-msgstr "Saidi ''{0}'' pluginate nimekirja töötlemine"
-
-msgid "This is after the end of the recording"
-msgstr "See jääb peale lindistuse lõppu"
-
-msgid "unspecified reason"
-msgstr ""
-
-msgid "Error playing sound"
-msgstr "Viga heili esitamisel"
-
-msgid "Do nothing"
-msgstr "Ära tee midagi"
-
-msgid "Report Bug"
-msgstr "Teata veast"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
+
+msgid "Download plugin list..."
msgstr ""
-"Aset leidis ootamatu erandkäitumine.<br>See on alati programmi viga. Kui sa "
-"töötad JOSMi viimase<br>versiooniga, siis võiksid kaaluda veaaruande "
-"esitamist."
-msgid "Update JOSM"
+msgid "Downloading plugin list from ''{0}''"
+msgstr "Pluginate nimekirja allalaadimine aadressilt ''{0}''"
+
+msgid "Unsuccessful HTTP request"
msgstr ""
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
+msgid "Plugin list download error"
msgstr ""
-msgid "Unexpected Exception"
-msgstr "Ootamatu erandolukord"
+msgid "JOSM failed to download plugin list:"
+msgstr ""
-msgid "Suppress further error dialogs for this session."
-msgstr "Ära näita rohkem veateateid selle seansi ajal."
+msgid "Details:"
+msgstr ""
msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
+msgid "Writing plugin list to local cache ''{0}''"
msgstr ""
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
+msgid "Parsing plugin list from site ''{0}''"
msgstr ""
msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
msgstr ""
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Tekst on juba kopeeritud lõikepuhvrisse.)"
+msgid "Processing plugin list from site ''{0}''"
+msgstr "Saidi ''{0}'' pluginate nimekirja töötlemine"
-msgid "You have encountered a bug in JOSM"
+msgid "This is after the end of the recording"
+msgstr "See jääb peale lindistuse lõppu"
+
+msgid "unspecified reason"
msgstr ""
+msgid "Error playing sound"
+msgstr "Viga heili esitamisel"
+
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14210,9 +14166,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14411,6 +14364,69 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr "XML-skeemi laadimine ebaõnnestus."
+msgid "Do nothing"
+msgstr "Ära tee midagi"
+
+msgid "Report Bug"
+msgstr "Teata veast"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Aset leidis ootamatu erandkäitumine.<br>See on alati programmi viga. Kui sa "
+"töötad JOSMi viimase<br>versiooniga, siis võiksid kaaluda veaaruande "
+"esitamist."
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Ära näita rohkem veateateid selle seansi ajal."
+
+msgid "Unexpected Exception"
+msgstr "Ootamatu erandolukord"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Tekst on juba kopeeritud lõikepuhvrisse.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14747,13 +14763,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14762,7 +14778,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14774,15 +14796,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14879,6 +14898,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14903,13 +14925,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15056,10 +15078,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15112,29 +15134,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15182,6 +15203,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15242,6 +15266,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15278,10 +15305,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15383,6 +15407,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15392,6 +15419,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16049,6 +16079,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17413,6 +17448,12 @@ msgstr "Tänavad"
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17989,9 +18030,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr "Mahasõit suunale"
-
msgid "Services"
msgstr ""
@@ -18470,6 +18508,15 @@ msgstr "padumeri"
msgid "mangrove"
msgstr "mangroov"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Muda"
@@ -19618,6 +19665,9 @@ msgstr ""
msgid "Fishing"
msgstr "Kalapüük"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Ööklubi"
@@ -20886,6 +20936,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Korruseid"
@@ -22473,8 +22527,8 @@ msgstr ""
msgid "food"
msgstr "toit"
-msgid "news_papers"
-msgstr "ajalehed"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parkimis_pilet"
@@ -22488,8 +22542,8 @@ msgstr "ühistranspordi_plaanid"
msgid "public_transport_tickets"
msgstr "ühistranspordi_piletid"
-msgid "SIM-cards"
-msgstr "SIM-kaardid"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "templid"
@@ -23743,6 +23797,21 @@ msgstr "looduslik"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23767,9 +23836,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23929,7 +23995,13 @@ msgstr "Matkamine"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -24013,6 +24085,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24111,6 +24188,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24120,6 +24200,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27232,6 +27320,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29564,6 +29712,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30348,9 +30505,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index fa0dbe7..995d6e2 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:35+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:35+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -150,9 +150,6 @@ msgstr "{0} Java bertsioa"
msgid "Homepage"
msgstr "Hasiera orria"
-msgid "Bug Reports"
-msgstr "Hutsegiteen txostenak"
-
msgid "Info"
msgstr "Informazioa"
@@ -174,6 +171,12 @@ msgstr "Pluginak"
msgid "About JOSM..."
msgstr "JOSM-i buruz"
+msgid "OK"
+msgstr "Ados"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -585,9 +588,6 @@ msgstr "Doitu irudi-geruza honen kokapena"
msgid "Adjust imagery offset"
msgstr "Doitu irudien desplazamendua"
-msgid "OK"
-msgstr "Ados"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1211,9 +1211,6 @@ msgstr "Fitxategiaren izena ere aldatu"
msgid "Could not rename file ''{0}''"
msgstr "Ezin izan da ''{0}'' fitxategiaren izena aldatu"
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1851,6 +1848,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Mantsoago aurrera"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr "Deskarga iraun duen bitartean errore batzuk detektatu dira"
+
msgid "Download GPS"
msgstr ""
@@ -2007,9 +2028,6 @@ msgid "The following errors occurred during mass download: {0}"
msgstr ""
"Honako errore hauek gertatu dira deskarga handia iraun duen bitartean: {0}"
-msgid "Errors during download"
-msgstr "Deskarga iraun duen bitartean errore batzuk detektatu dira"
-
msgid "Error during download"
msgstr "Errorea deskargatzerakoan"
@@ -2334,8 +2352,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3145,9 +3163,6 @@ msgstr "{0} bidearen nodo zerrendako gatazka konpondu"
msgid "Main dataset does not include node {0}"
msgstr "Datuen multzo nagusiak ez du {0} nodoa bere baitan hartzen"
-msgid "Apply?"
-msgstr "Aplikatu?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3167,27 +3182,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Erlazioa"
-
-msgid "Old role"
-msgstr "Rol zaharra"
-
-msgid "New role"
-msgstr "Rol berria"
-
-msgid "Old key"
-msgstr "Giltz zaharra"
-
-msgid "Old value"
-msgstr "Balio zaharra"
-
-msgid "New key"
-msgstr "Giltz berria"
-
-msgid "New value"
-msgstr "Balio berria"
-
msgid "Apply selected changes"
msgstr "Aplikatu aukeratutako aldaketak"
@@ -4267,6 +4261,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4935,6 +4932,12 @@ msgstr ""
msgid "Initializing"
msgstr "Hasieratzen"
+msgid "Setting defaults"
+msgstr "Hobespen orijinalak ezartzen"
+
+msgid "Creating main GUI"
+msgstr "GUI nagusia sortzen"
+
msgid "Updating plugins"
msgstr ""
@@ -4944,12 +4947,6 @@ msgstr "Eguneratutako pluginak instalatzen"
msgid "Loading early plugins"
msgstr "Hasierako pluginak kargatzen"
-msgid "Setting defaults"
-msgstr "Hobespen orijinalak ezartzen"
-
-msgid "Creating main GUI"
-msgstr "GUI nagusia sortzen"
-
msgid "Loading plugins"
msgstr "Pluginak kargatzen"
@@ -5945,6 +5942,30 @@ msgstr "Gatazkak dituzten etiketak soilik erakutsi"
msgid "Show tags with multiple values only"
msgstr "Balio-anitzak diren etiketak soilik erakutsi"
+msgid "Apply?"
+msgstr "Aplikatu?"
+
+msgid "Relation"
+msgstr "Erlazioa"
+
+msgid "Old role"
+msgstr "Rol zaharra"
+
+msgid "New role"
+msgstr "Rol berria"
+
+msgid "Old key"
+msgstr "Giltz zaharra"
+
+msgid "Old value"
+msgstr "Balio zaharra"
+
+msgid "New key"
+msgstr "Giltz berria"
+
+msgid "New value"
+msgstr "Balio berria"
+
msgid "For selected objects only"
msgstr "Aukeratutako objektuentzat soilik"
@@ -6434,51 +6455,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "Kargatutako geruzen zerrenda ireki"
-msgid "Delete the selected layers."
-msgstr "Aukeratutako geruzak ezabatu."
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Aktibatu"
-
-msgid "Activate the selected layer"
-msgstr "Aukeratutako geruzak aktibatu."
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr "Geruza hau bikoiztu"
-
-msgid "Copy of {0}"
-msgstr "{0}-ren kopia"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopia ezazu {1} hemendik: {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6501,12 +6477,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Aukeratutako geruza lerro bat gorantz mugitu."
-
-msgid "Move the selected layer one row down."
-msgstr "Aukeratutako geruza lerro bat beherantz mugitu."
-
msgid "Information about layer"
msgstr "Geruzari buruzko informazioa"
@@ -6930,15 +6900,6 @@ msgstr "Itxiera data"
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7044,9 +7005,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7198,14 +7156,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7290,15 +7240,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr "URL-a: "
@@ -7316,6 +7257,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr "Aktibatu"
+
+msgid "Activate the selected layer"
+msgstr "Aukeratutako geruzak aktibatu."
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr "Aukeratutako geruzak ezabatu."
+
+msgid "Duplicate this layer"
+msgstr "Geruza hau bikoiztu"
+
+msgid "Copy of {0}"
+msgstr "{0}-ren kopia"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopia ezazu {1} hemendik: {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr "Aukeratutako geruza lerro bat beherantz mugitu."
+
+msgid "Move the selected layer one row up."
+msgstr "Aukeratutako geruza lerro bat gorantz mugitu."
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7631,10 +7641,10 @@ msgstr "Guraso-erlazioak"
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9290,9 +9300,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -10097,12 +10104,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -12110,6 +12111,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12620,6 +12627,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13862,62 +13877,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14169,9 +14128,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14356,6 +14312,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14695,13 +14711,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14710,7 +14726,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14722,15 +14744,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14827,6 +14846,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14851,13 +14873,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15004,10 +15026,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15060,29 +15082,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15130,6 +15151,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15190,6 +15214,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15226,10 +15253,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15331,6 +15355,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15340,6 +15367,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16004,6 +16034,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17392,6 +17427,12 @@ msgstr "Kaleak"
msgid "Motorway"
msgstr "Autobide"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17968,9 +18009,6 @@ msgstr "Autobideko irteera"
msgid "Number"
msgstr "Zenbakia"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Zerbitzuak"
@@ -18449,6 +18487,15 @@ msgstr "marea-gunea"
msgid "mangrove"
msgstr "mangladia"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Lokatza"
@@ -19597,6 +19644,9 @@ msgstr ""
msgid "Fishing"
msgstr "Arrantza"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20865,6 +20915,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22452,8 +22506,8 @@ msgstr "gorotz-poltsa"
msgid "food"
msgstr "Elikadura"
-msgid "news_papers"
-msgstr "egunkariak"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "aparkalekuko txartelak"
@@ -22467,8 +22521,8 @@ msgstr "garraio publikoaren mapak"
msgid "public_transport_tickets"
msgstr "garraio publikoko txartelak"
-msgid "SIM-cards"
-msgstr "SIM txartelak"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "seiluak"
@@ -23722,6 +23776,21 @@ msgstr "natura-gune"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23746,9 +23815,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23908,7 +23974,13 @@ msgstr "Kanpin"
msgid "Test"
msgstr "Proba"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23992,6 +24064,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24090,6 +24167,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24099,6 +24179,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27198,6 +27286,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29524,6 +29672,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30308,9 +30465,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 138bc9c..7892176 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:58+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:57+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "نسخه جاوا {0}"
msgid "Homepage"
msgstr "صفحه اصلی"
-msgid "Bug Reports"
-msgstr "گزارش ایرادات"
-
msgid "Info"
msgstr "اطلاعات"
@@ -172,6 +169,12 @@ msgstr "افزونهها"
msgid "About JOSM..."
msgstr "درباره JOSM ..."
+msgid "OK"
+msgstr "تایید"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -584,9 +587,6 @@ msgstr "تنظیم کردن موقعیت این لایه تصویری"
msgid "Adjust imagery offset"
msgstr "تنظیم انحراف تصویری"
-msgid "OK"
-msgstr "تایید"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1235,9 +1235,6 @@ msgstr "همچنین تغییر نام پرونده"
msgid "Could not rename file ''{0}''"
msgstr "نمی توان پرونده ''{0}'' را تغییر نام داد"
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1847,6 +1844,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1996,9 +2017,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2314,8 +2332,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3096,9 +3114,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3118,27 +3133,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4194,6 +4188,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4840,19 +4837,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5825,6 +5822,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6312,51 +6333,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "رونوشت {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "رونوشت {1} از {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6379,12 +6355,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6807,15 +6777,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6921,9 +6882,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7075,14 +7033,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7167,15 +7117,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7193,6 +7134,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "رونوشت {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "رونوشت {1} از {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7508,10 +7518,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9172,9 +9182,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9977,12 +9984,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11990,6 +11991,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12500,6 +12507,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13741,62 +13756,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14048,9 +14007,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14235,6 +14191,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14569,13 +14585,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14584,7 +14600,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14596,15 +14618,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14701,6 +14720,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14725,13 +14747,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14878,10 +14900,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14934,29 +14956,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15004,6 +15025,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15064,6 +15088,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15100,10 +15127,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15205,6 +15229,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15214,6 +15241,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15869,6 +15899,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17226,6 +17261,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17802,9 +17843,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18283,6 +18321,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19431,6 +19478,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20699,6 +20749,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22286,7 +22340,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22301,7 +22355,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23556,6 +23610,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23580,9 +23649,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23742,7 +23808,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23826,6 +23898,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23924,6 +24001,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23933,6 +24013,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27032,6 +27120,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29353,6 +29501,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30137,9 +30294,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index 2a6d53d..97bd3da 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:42+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:42+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -152,9 +152,6 @@ msgstr "Javan versio {0}"
msgid "Homepage"
msgstr "Kotisivu"
-msgid "Bug Reports"
-msgstr "Virheraportit"
-
msgid "Info"
msgstr "Tietoja"
@@ -176,6 +173,12 @@ msgstr "Liitännäiset"
msgid "About JOSM..."
msgstr "Tietoja JOSM:sta..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Ilmoita ohjelman virheestä"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -597,9 +600,6 @@ msgstr "Säädä tämän kuvatason paikkaa"
msgid "Adjust imagery offset"
msgstr "Säädä kuvatason paikka"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1256,9 +1256,6 @@ msgstr "Nimeä myös tiedosto uudelleen"
msgid "Could not rename file ''{0}''"
msgstr "Ei voitu nimetä uudelleen tiedostoa ''{0}''"
-msgid "Report bug"
-msgstr "Ilmoita ohjelman virheestä"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Luo uusi virhekuvaus JOSM:n virheenseurantajärjestelmään"
@@ -1915,6 +1912,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Hitaammin eteenpäin"
+msgid "Downloading changeset content"
+msgstr "Ladataan muutoskokoelman sisältöä"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Ladataan muutoskokoelmaa {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Ladataan muutoskokoelman {2} sisältöä..."
+
+msgid "Download changesets"
+msgstr "Ladataan muutoskokoelmat"
+
+msgid "Querying and downloading changesets"
+msgstr "Haetaan ja ladataan muutoskokoelmia"
+
+msgid "Determine user id for current user..."
+msgstr "Selvitä nykyisen käyttäjätunnuksen ID ..."
+
+msgid "Query and download changesets ..."
+msgstr "Hae ja lataa muutoskokoelmia..."
+
+msgid "Errors during download"
+msgstr "Virheitä latauksen aikana"
+
msgid "Download GPS"
msgstr "Lataa GPS-pisteet"
@@ -2076,9 +2097,6 @@ msgstr "Poistetut tai siirretyt kohteet"
msgid "The following errors occurred during mass download: {0}"
msgstr "Massalatauksen aikana tapahtui seuraavat virheet: {0}"
-msgid "Errors during download"
-msgstr "Virheitä latauksen aikana"
-
msgid "Error during download"
msgstr "Virhe latauksen aikana"
@@ -2428,8 +2446,8 @@ msgid "Add selection to relation"
msgstr "Lisää valinta relaatioon"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3256,9 +3274,6 @@ msgstr "Ratkaise ristiriidat polun {0} pistelistassa"
msgid "Main dataset does not include node {0}"
msgstr "Päädatajoukossa ei ole pistettä {0}"
-msgid "Apply?"
-msgstr "Toteutav"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3278,27 +3293,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Relaatio"
-
-msgid "Old role"
-msgstr "Vanha rooli"
-
-msgid "New role"
-msgstr "Uusi rooli"
-
-msgid "Old key"
-msgstr "Vanha avain"
-
-msgid "Old value"
-msgstr "Vanha arvo"
-
-msgid "New key"
-msgstr "Uusi avain"
-
-msgid "New value"
-msgstr "Uusi arvo"
-
msgid "Apply selected changes"
msgstr "Toteuta valitut muutokset"
@@ -4414,6 +4408,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Ongelma relaation rooleissa"
@@ -5079,6 +5076,12 @@ msgstr ""
msgid "Initializing"
msgstr "Alustetaan"
+msgid "Setting defaults"
+msgstr "Asetetaan oletuksia"
+
+msgid "Creating main GUI"
+msgstr "Luodaan pääikkuna"
+
msgid "Updating plugins"
msgstr "Päivitetään liitännäisiä"
@@ -5088,12 +5091,6 @@ msgstr "Asennetaan päivitetyt liitännäiset"
msgid "Loading early plugins"
msgstr "Ladataan aikaisia liitännäisiä"
-msgid "Setting defaults"
-msgstr "Asetetaan oletuksia"
-
-msgid "Creating main GUI"
-msgstr "Luodaan pääikkuna"
-
msgid "Loading plugins"
msgstr "Ladataan liitännäisiä"
@@ -6103,6 +6100,30 @@ msgstr "Näytä vain tagit joissa ristiriitoja"
msgid "Show tags with multiple values only"
msgstr "Näytä vain tagit joissa useita arvoja"
+msgid "Apply?"
+msgstr "Toteutav"
+
+msgid "Relation"
+msgstr "Relaatio"
+
+msgid "Old role"
+msgstr "Vanha rooli"
+
+msgid "New role"
+msgstr "Uusi rooli"
+
+msgid "Old key"
+msgstr "Vanha avain"
+
+msgid "Old value"
+msgstr "Vanha arvo"
+
+msgid "New key"
+msgstr "Uusi avain"
+
+msgid "New value"
+msgstr "Uusi arvo"
+
msgid "For selected objects only"
msgstr "Vain valittujen kohteiden"
@@ -6623,51 +6644,6 @@ msgstr "Vaihda tason {0} näkyvyyttä"
msgid "Open a list of all loaded layers."
msgstr "Avaa lista kaikista ladatuista tasoista."
-msgid "Delete the selected layers."
-msgstr "Poista valitut tasot."
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Näytä/piilota valittu taso."
-
-msgid "Show/hide layer"
-msgstr "Näytä/piilota taso"
-
-msgid "Opacity"
-msgstr "Läpinäkyvyys"
-
-msgid "Adjust opacity of the layer."
-msgstr "Säädä tason läpinäkyvyyttä"
-
-msgid "Gamma"
-msgstr "Kirkkaus"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Säädä tason kirkkautta (gamma-arvoa)."
-
-msgid "Activate"
-msgstr "Aktivoi"
-
-msgid "Activate the selected layer"
-msgstr "Aktivoi valittu taso"
-
-msgid "Activate layer"
-msgstr "Aktivoi taso"
-
-msgid "Merge this layer into another layer"
-msgstr "Yhdistä tämä taso toiseen tasoon"
-
-msgid "Duplicate this layer"
-msgstr "Monista tämä taso"
-
-msgid "Copy of {0}"
-msgstr "{0} (Kopio)"
-
-msgid "Copy {1} of {0}"
-msgstr "{0} (Kopio {1})"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "taso on tällä hetkellä näkyvillä (napsauta piilottaaksesi se)"
@@ -6691,12 +6667,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Siirrä valittu taso rivi ylöspäin."
-
-msgid "Move the selected layer one row down."
-msgstr "Siirrä valittu taso rivi alaspäin."
-
msgid "Information about layer"
msgstr "Tietoja tasosta"
@@ -7126,15 +7096,6 @@ msgstr "Suljettu"
msgid "Discussions"
msgstr "Keskustelua"
-msgid "Downloading changeset content"
-msgstr "Ladataan muutoskokoelman sisältöä"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Ladataan muutoskokoelmaa {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Ladataan muutoskokoelman {2} sisältöä..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7250,9 +7211,6 @@ msgstr "Lataa/päivitä muutoskokoelmaan liitetty keskustelu OSM-palvelimelta"
msgid "Date"
msgstr "Päivämäärä"
-msgid "Download changesets"
-msgstr "Ladataan muutoskokoelmat"
-
msgid "{0} [incomplete]"
msgstr "{0} [keskeneräinen]"
@@ -7413,16 +7371,6 @@ msgid "Please enter an integer value > 0"
msgstr "Anna positiivinen kokonaisluku."
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Nykyinen arvo ei ole kelvollinen käyttäjätunnus<br>Ole hyvä ja syötä "
-"ei-tyhjä käyttäjänimi.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Käyttäjätunnus ei voi olla tyhjä"
-
-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 ""
@@ -7525,15 +7473,6 @@ msgstr "Muutoskokoelmien hakuun käytetty URL ei ole kelvollinen"
msgid "Close the dialog and abort querying of changesets"
msgstr "Sulje tämä ikkuna ja keskeytä muutoskokoelmien haku"
-msgid "Querying and downloading changesets"
-msgstr "Haetaan ja ladataan muutoskokoelmia"
-
-msgid "Determine user id for current user..."
-msgstr "Selvitä nykyisen käyttäjätunnuksen ID ..."
-
-msgid "Query and download changesets ..."
-msgstr "Hae ja lataa muutoskokoelmia..."
-
msgid "URL: "
msgstr "URL: "
@@ -7553,6 +7492,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Tämä URL ei ole kelvollinen."
+msgid "Activate"
+msgstr "Aktivoi"
+
+msgid "Activate the selected layer"
+msgstr "Aktivoi valittu taso"
+
+msgid "Activate layer"
+msgstr "Aktivoi taso"
+
+msgid "Delete the selected layers."
+msgstr "Poista valitut tasot."
+
+msgid "Duplicate this layer"
+msgstr "Monista tämä taso"
+
+msgid "Copy of {0}"
+msgstr "{0} (Kopio)"
+
+msgid "Copy {1} of {0}"
+msgstr "{0} (Kopio {1})"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Säädä tason läpinäkyvyyttä"
+
+msgid "Opacity"
+msgstr "Läpinäkyvyys"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Säädä tason kirkkautta (gamma-arvoa)."
+
+msgid "Gamma"
+msgstr "Kirkkaus"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Yhdistä tämä taso toiseen tasoon"
+
+msgid "Move the selected layer one row down."
+msgstr "Siirrä valittu taso rivi alaspäin."
+
+msgid "Move the selected layer one row up."
+msgstr "Siirrä valittu taso rivi ylöspäin."
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Näytä/piilota valittu taso."
+
+msgid "Show/hide layer"
+msgstr "Näytä/piilota taso"
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7874,12 +7882,12 @@ msgstr "Emorelaatiot"
msgid "Child Relations"
msgstr "Lapsirelaatiot"
-msgid "Apply Role:"
-msgstr "Aseta rooli:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Anna rooli ja aseta se valituille relaation jäsenille"
+msgid "Apply Role:"
+msgstr "Aseta rooli:"
+
msgid "New Relation"
msgstr "Uusi relaatio"
@@ -9731,9 +9739,6 @@ msgstr "Kuvatason häivytys"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -10557,12 +10562,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -12664,6 +12663,12 @@ msgstr "Yhteysasetukset"
msgid "Connection Settings for the OSM server."
msgstr "OSM-palvelimen yhteysasetukset."
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr "Toiminto"
@@ -13196,6 +13201,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Luetun päivämäärän \"{0}\" tulkinta ei onnistu."
@@ -14510,77 +14523,6 @@ msgstr ""
msgid "Error playing sound"
msgstr "Virhe soitettaessa ääntä"
-msgid "Do nothing"
-msgstr "Älä tee mitään"
-
-msgid "Report Bug"
-msgstr "Ilmoita ohjelmavirheestä"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Tapahtui odottamaton poikkeus.<br>Kyse on aina ohjelmointivirheestä. Jos "
-"käytät JOSMin uusinta<br>versiota, pyydämme sinua raportoimaan virheestä."
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Ohjelmassa ilmeni odottamaton poikkeus. Tämä johtuu "
-"ohjelmointivirheestä.<br><br>Käyttämäsi JOSM:n versio ({0}) ei ole "
-"uusin<br>ns. tested-versio (<b>{1}</b>).<br><br><b>Ole hyvä ja päivitä "
-"JOSM</b> ennen kuin ilmoitat virheestä JOSM:ssa."
-
-msgid "Unexpected Exception"
-msgstr "Odottamaton poikkeus"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Älä näytä virheilmoituksia enää tämän käyttökerran aikana."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Olet törmännyt virheeseen JOSMissa. Varmista, ennen virheraportin "
-"lähettämistä, että käytät JOSMin uusinta versiota sivulta:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Myös liitännäiset tulisi päivittää. Jos kummastakaan keinosta ei ole hyötyä, "
-"lähetä raportti virheenseurantaamme osoitteessa:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Alla näkyvien virheeseen liittyvien tietojen pitäisi siirtyä valmiiksi "
-"raporttiin. Kerro lisäksi, miten virheen saa tapahtumaan, ja yritä selittää "
-"mahdollisimman yksityiskohtaisesti."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Jos se ei onnistu, voit syöttää alla olevat tiedot vaihtoehtoisesti "
-"seuraavassa osoitteessa:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Teksti on jo kopioitu leikepöydälle)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "JOSMissa on tapahtunut virhe"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14848,9 +14790,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Käännöstä ei löydy: {0}. Käytetään oletusasetusta: {1}."
@@ -15047,6 +14986,81 @@ msgstr "Ohitetaan virheellinen muoto: {0}"
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Älä tee mitään"
+
+msgid "Report Bug"
+msgstr "Ilmoita ohjelmavirheestä"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Tapahtui odottamaton poikkeus.<br>Kyse on aina ohjelmointivirheestä. Jos "
+"käytät JOSMin uusinta<br>versiota, pyydämme sinua raportoimaan virheestä."
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Ohjelmassa ilmeni odottamaton poikkeus. Tämä johtuu "
+"ohjelmointivirheestä.<br><br>Käyttämäsi JOSM:n versio ({0}) ei ole "
+"uusin<br>ns. tested-versio (<b>{1}</b>).<br><br><b>Ole hyvä ja päivitä "
+"JOSM</b> ennen kuin ilmoitat virheestä JOSM:ssa."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Älä näytä virheilmoituksia enää tämän käyttökerran aikana."
+
+msgid "Unexpected Exception"
+msgstr "Odottamaton poikkeus"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "JOSMissa on tapahtunut virhe"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Olet törmännyt virheeseen JOSMissa. Varmista, ennen virheraportin "
+"lähettämistä, että käytät JOSMin uusinta versiota sivulta:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Myös liitännäiset tulisi päivittää. Jos kummastakaan keinosta ei ole hyötyä, "
+"lähetä raportti virheenseurantaamme osoitteessa:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Alla näkyvien virheeseen liittyvien tietojen pitäisi siirtyä valmiiksi "
+"raporttiin. Kerro lisäksi, miten virheen saa tapahtumaan, ja yritä selittää "
+"mahdollisimman yksityiskohtaisesti."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Jos se ei onnistu, voit syöttää alla olevat tiedot vaihtoehtoisesti "
+"seuraavassa osoitteessa:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Teksti on jo kopioitu leikepöydälle)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15385,13 +15399,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -15400,7 +15414,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -15412,15 +15432,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -15517,6 +15534,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15541,13 +15561,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15694,10 +15714,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15750,29 +15770,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15820,6 +15839,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15880,6 +15902,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15916,10 +15941,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Liettua)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -16021,6 +16043,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -16030,6 +16055,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16696,6 +16724,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18081,6 +18114,12 @@ msgstr "Tiet"
msgid "Motorway"
msgstr "Moottoritie"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -18659,9 +18698,6 @@ msgstr "Moottoritien liittymä"
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -19140,6 +19176,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Muta"
@@ -20288,6 +20333,9 @@ msgstr ""
msgid "Fishing"
msgstr "Kalastus"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Yökerho"
@@ -21556,6 +21604,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -23143,8 +23195,8 @@ msgstr "koirankakkapusseja"
msgid "food"
msgstr ""
-msgid "news_papers"
-msgstr "sanomalehtiä"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "pysäköintilippuja"
@@ -23158,8 +23210,8 @@ msgstr "julkisen liikenteen aikatauluja"
msgid "public_transport_tickets"
msgstr "julkisen liikenteen lippuja"
-msgid "SIM-cards"
-msgstr "SIM-kortteja"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "postimerkkejä"
@@ -24414,6 +24466,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -24438,9 +24505,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -24600,7 +24664,13 @@ msgstr "Leirintäpaikka"
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -24686,6 +24756,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24790,6 +24865,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24799,6 +24877,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27949,6 +28035,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -30302,6 +30448,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -31088,9 +31243,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -32892,6 +33044,3 @@ msgstr ""
msgid "Drive a race car on this layer"
msgstr ""
-
-#~ msgid "xml"
-#~ msgstr "xml"
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 82e7b09..7b2bde6 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:14+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:12+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 509202a..c2c14ae 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:42+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:41+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -147,9 +147,6 @@ msgstr "Java útgáva{0}"
msgid "Homepage"
msgstr "Heimasíða"
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr "Kunning"
@@ -171,6 +168,12 @@ msgstr "Ískoytisforrit"
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -573,9 +576,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1165,9 +1165,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1777,6 +1774,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1926,9 +1947,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2244,8 +2262,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3026,9 +3044,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3048,27 +3063,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4126,6 +4120,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4771,19 +4768,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5756,6 +5753,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6243,51 +6264,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6310,12 +6286,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6738,15 +6708,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6852,9 +6813,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7006,14 +6964,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7098,15 +7048,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7124,6 +7065,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7439,10 +7449,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9098,9 +9108,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9903,12 +9910,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11916,6 +11917,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12426,6 +12433,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13667,62 +13682,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13974,9 +13933,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14161,6 +14117,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14495,13 +14511,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14510,7 +14526,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14522,15 +14544,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14627,6 +14646,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14651,13 +14673,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14804,10 +14826,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14860,29 +14882,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14930,6 +14951,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14990,6 +15014,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15026,10 +15053,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15131,6 +15155,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15140,6 +15167,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15795,6 +15825,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17152,6 +17187,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17728,9 +17769,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18209,6 +18247,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19357,6 +19404,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20625,6 +20675,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22212,7 +22266,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22227,7 +22281,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23482,6 +23536,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23506,9 +23575,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23668,7 +23734,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23752,6 +23824,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23850,6 +23927,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23859,6 +23939,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26958,6 +27046,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29279,6 +29427,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30063,9 +30220,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 65869a7..7bb17d8 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-02-27 14:36+0000\n"
-"Last-Translator: Jean-Marc <Unknown>\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-03-29 13:22+0000\n"
+"Last-Translator: Djam <specimail-forums 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: 2016-03-13 04:43+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:42+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -154,9 +154,6 @@ msgstr "Version de Java : {0}"
msgid "Homepage"
msgstr "Page d’accueil"
-msgid "Bug Reports"
-msgstr "Rapports d’anomalies"
-
msgid "Info"
msgstr "Informations"
@@ -178,6 +175,12 @@ msgstr "Greffons"
msgid "About JOSM..."
msgstr "À propos de JOSM"
+msgid "OK"
+msgstr "Valider"
+
+msgid "Report bug"
+msgstr "Signaler une erreur"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Echec de la localisation de la ressource ''{0}''."
@@ -603,9 +606,6 @@ msgstr "Ajuster le décalage d’imagerie"
msgid "Adjust imagery offset"
msgstr "Ajuster le décalage de l’imagerie"
-msgid "OK"
-msgstr "Valider"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1272,9 +1272,6 @@ msgstr "Renommer également le fichier"
msgid "Could not rename file ''{0}''"
msgstr "Impossible de renommer le fichier ''{0}''"
-msgid "Report bug"
-msgstr "Signaler une erreur"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Signaler un ticket sur le site de suivi des problèmes de JOSM"
@@ -1933,6 +1930,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avancer plus lentement"
+msgid "Downloading changeset content"
+msgstr "Téléchargement du contenu du groupe de modification"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Téléchargement du groupe de modifications {2}…"
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Téléchargement du contenu du groupe de modifications {2}…"
+
+msgid "Download changesets"
+msgstr "Télécharger les groupes de modifications"
+
+msgid "Querying and downloading changesets"
+msgstr "Téléchargement des groupes de modifications"
+
+msgid "Determine user id for current user..."
+msgstr "Déterminer l’identifiant de l’utilisateur actuel"
+
+msgid "Query and download changesets ..."
+msgstr "Récupérer et télécharger les groupes de modifications…"
+
+msgid "Errors during download"
+msgstr "Des erreurs sont survenues lors du téléchargement."
+
msgid "Download GPS"
msgstr "Téléchargement GPS"
@@ -2100,9 +2121,6 @@ msgstr "Objets supprimés ou déplacés"
msgid "The following errors occurred during mass download: {0}"
msgstr "Les erreurs suivantes sont survenues lors du téléchargement : {0}"
-msgid "Errors during download"
-msgstr "Des erreurs sont survenues lors du téléchargement."
-
msgid "Error during download"
msgstr "Une erreur est survenue lors du téléchargement."
@@ -2455,11 +2473,9 @@ msgid "Add selection to relation"
msgstr "Ajouter la sélection à la relation"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Ajouter la sélection à la relation</strong>: contrôler toutes "
-"les relations uniques pour éviter les dégâts!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3303,9 +3319,6 @@ msgstr "Résoudre les conflits de la liste des nœuds du chemin {0}"
msgid "Main dataset does not include node {0}"
msgstr "Le jeu de données principal ne contient pas le nœud {0}"
-msgid "Apply?"
-msgstr "Appliquer ?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3335,27 +3348,6 @@ msgstr ""
"En inversant ce chemin, les changements suivants sont conseillés dans "
"l’optique de maintenir une consistance des données."
-msgid "Relation"
-msgstr "Relation"
-
-msgid "Old role"
-msgstr "Ancien rôle"
-
-msgid "New role"
-msgstr "Nouveau rôle"
-
-msgid "Old key"
-msgstr "Ancienne clé"
-
-msgid "Old value"
-msgstr "Ancienne valeur"
-
-msgid "New key"
-msgstr "Nouvelle clé"
-
-msgid "New value"
-msgstr "Nouvelle valeur"
-
msgid "Apply selected changes"
msgstr "Appliquer les modifications"
@@ -4053,7 +4045,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "L’adresse de courriel a un domaine invalide : {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Validateur d''E-mail"
msgid "URL is invalid"
msgstr "L''URL est invalide"
@@ -4074,7 +4066,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "L''URL contient un fragment invalide: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "Validateur d''URL"
msgid "Addresses"
msgstr "Adresses"
@@ -4511,6 +4503,9 @@ msgid "Route relation contains a ''{0}'' role"
msgstr ""
msgid "Route relation contains a gap"
+msgstr "La relation Route contien un vide"
+
+msgid "Stop position not part of route"
msgstr ""
msgid "Role verification problem"
@@ -5192,6 +5187,12 @@ msgstr "Niveau de débogage détaillé activé (trace)"
msgid "Initializing"
msgstr "Initialisation"
+msgid "Setting defaults"
+msgstr "Réglage des valeurs par défaut"
+
+msgid "Creating main GUI"
+msgstr "Création de l’interface graphique"
+
msgid "Updating plugins"
msgstr "Mise à jour des greffons"
@@ -5201,12 +5202,6 @@ msgstr "Installation des greffons mis à jour"
msgid "Loading early plugins"
msgstr "Chargement des premiers greffons"
-msgid "Setting defaults"
-msgstr "Réglage des valeurs par défaut"
-
-msgid "Creating main GUI"
-msgstr "Création de l’interface graphique"
-
msgid "Loading plugins"
msgstr "Chargement des greffons"
@@ -6291,6 +6286,30 @@ msgstr "Afficher les attributs en conflits"
msgid "Show tags with multiple values only"
msgstr "Afficher les attributs avec des valeurs multiples"
+msgid "Apply?"
+msgstr "Appliquer ?"
+
+msgid "Relation"
+msgstr "Relation"
+
+msgid "Old role"
+msgstr "Ancien rôle"
+
+msgid "New role"
+msgstr "Nouveau rôle"
+
+msgid "Old key"
+msgstr "Ancienne clé"
+
+msgid "Old value"
+msgstr "Ancienne valeur"
+
+msgid "New key"
+msgstr "Nouvelle clé"
+
+msgid "New value"
+msgstr "Nouvelle valeur"
+
msgid "For selected objects only"
msgstr "Seulement pour la sélection"
@@ -6816,51 +6835,6 @@ msgstr "Afficher/Masquer le calque: {0}"
msgid "Open a list of all loaded layers."
msgstr "Afficher la liste des calques"
-msgid "Delete the selected layers."
-msgstr "Supprimer le calque"
-
-msgid "Show/hide"
-msgstr "Afficher/masquer"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Afficher/masquer le calque"
-
-msgid "Show/hide layer"
-msgstr "Afficher/masquer le calque"
-
-msgid "Opacity"
-msgstr "Opacité"
-
-msgid "Adjust opacity of the layer."
-msgstr "Ajuster l’opacité du calque"
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Réglez la valeur gamma du calque."
-
-msgid "Activate"
-msgstr "Activer"
-
-msgid "Activate the selected layer"
-msgstr "Activer le calque"
-
-msgid "Activate layer"
-msgstr "Activer le calque"
-
-msgid "Merge this layer into another layer"
-msgstr "Fusionner le calque avec un autre"
-
-msgid "Duplicate this layer"
-msgstr "Dupliquer le calque"
-
-msgid "Copy of {0}"
-msgstr "Copie de {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copie {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "le calque est actuellement affiché (cliquer pour le masquer)"
@@ -6874,20 +6848,16 @@ msgid "this layer is not currently active (click to activate)"
msgstr "ce calque n’est pas le calque actif (cliquer pour l’activer)"
msgid "scale follows native resolution of this layer"
-msgstr ""
+msgstr "l''échelle suit la résolution native de cette couche"
msgid ""
"scale follows native resolution of another layer (click to set this layer)"
msgstr ""
+"l''échelle suit la résolution native d''une autre couche (clic pour "
+"sélectionner cette couche)"
msgid "this layer has no native resolution"
-msgstr ""
-
-msgid "Move the selected layer one row up."
-msgstr "Monter le calque"
-
-msgid "Move the selected layer one row down."
-msgstr "Descendre le calque"
+msgstr "cette couche n''a pas de résolution native"
msgid "Information about layer"
msgstr "Informations sur le calque"
@@ -7328,15 +7298,6 @@ msgstr "Fermé le"
msgid "Discussions"
msgstr "Discussions"
-msgid "Downloading changeset content"
-msgstr "Téléchargement du contenu du groupe de modification"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Téléchargement du groupe de modifications {2}…"
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Téléchargement du contenu du groupe de modifications {2}…"
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7450,9 +7411,6 @@ msgstr ""
msgid "Date"
msgstr "Date"
-msgid "Download changesets"
-msgstr "Télécharger les groupes de modifications"
-
msgid "{0} [incomplete]"
msgstr "{0} [incomplet]"
@@ -7623,16 +7581,6 @@ msgid "Please enter an integer value > 0"
msgstr "Veuillez entrer un entier positif"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>La valeur n’est pas un nom d’utilisateur valide.<br>Veuillez entrer un "
-"nom d’utilisateur non vide.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Veuillez entrer un nom d’utilisateur non vide"
-
-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 ""
@@ -7738,15 +7686,6 @@ msgstr "Cette adresse web est erronée"
msgid "Close the dialog and abort querying of changesets"
msgstr "Abandonner la requête et fermer la fenêtre"
-msgid "Querying and downloading changesets"
-msgstr "Téléchargement des groupes de modifications"
-
-msgid "Determine user id for current user..."
-msgstr "Déterminer l’identifiant de l’utilisateur actuel"
-
-msgid "Query and download changesets ..."
-msgstr "Récupérer et télécharger les groupes de modifications…"
-
msgid "URL: "
msgstr "Adresse web : "
@@ -7768,6 +7707,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Cette adresse web n’est pas valide"
+msgid "Activate"
+msgstr "Activer"
+
+msgid "Activate the selected layer"
+msgstr "Activer le calque"
+
+msgid "Activate layer"
+msgstr "Activer le calque"
+
+msgid "Delete the selected layers."
+msgstr "Supprimer le calque"
+
+msgid "Duplicate this layer"
+msgstr "Dupliquer le calque"
+
+msgid "Copy of {0}"
+msgstr "Copie de {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copie {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Ajuster l’opacité du calque"
+
+msgid "Opacity"
+msgstr "Opacité"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Réglez la valeur gamma du calque."
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Fusionner le calque avec un autre"
+
+msgid "Move the selected layer one row down."
+msgstr "Descendre le calque"
+
+msgid "Move the selected layer one row up."
+msgstr "Monter le calque"
+
+msgid "Show/hide"
+msgstr "Afficher/masquer"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Afficher/masquer le calque"
+
+msgid "Show/hide layer"
+msgstr "Afficher/masquer le calque"
+
msgid "Discardable key: selection Foreground"
msgstr "Clé inutile: sélection dʼavant-plan"
@@ -8098,12 +8106,12 @@ msgstr "Relations parentes"
msgid "Child Relations"
msgstr "Relations enfants"
-msgid "Apply Role:"
-msgstr "Appliquer le rôle :"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Appliquer le rôle au membre"
+msgid "Apply Role:"
+msgstr "Appliquer le rôle :"
+
msgid "New Relation"
msgstr "Nouvelle relation"
@@ -10015,9 +10023,6 @@ msgstr "Effacement de l’imagerie"
msgid "Unsupported imagery type: {0}"
msgstr "Unsupported imagery type: {0}"
-msgid "ERROR"
-msgstr "ERREUR"
-
msgid "Next marker"
msgstr "marqueur suivant"
@@ -10051,7 +10056,7 @@ msgid "Supported projections are: {0}"
msgstr ""
msgid "Change the projection again or remove the layer."
-msgstr ""
+msgstr "Changer à nouveau la projection ou retirer la couche"
msgid "Save Layer"
msgstr "Enregistrer le calque"
@@ -10914,14 +10919,6 @@ msgstr "Relancer la séquence d’autorisation"
msgid "Test Access Token"
msgstr "Tester l’autorisation"
-msgid "Please enter your OSM user name"
-msgstr "Veuillez entrer votre nom d’utilisateur OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Le nom d’utilisateur ne peut pas être vide. Veuillez entrer votre nom "
-"d’utilisateur OSM"
-
msgid "Please enter your OSM password"
msgstr "Veuillez entrer votre mot de passe OSM"
@@ -13158,6 +13155,14 @@ msgstr "Paramètres de connexion"
msgid "Connection Settings for the OSM server."
msgstr "Configurez votre connexion au serveur OSM."
+msgid "Please enter your OSM user name"
+msgstr "Veuillez entrer votre nom d’utilisateur OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Le nom d’utilisateur ne peut pas être vide. Veuillez entrer votre nom "
+"d’utilisateur OSM"
+
msgid "Action"
msgstr "Action"
@@ -13723,6 +13728,14 @@ msgstr ""
"Valeur illégale de lʼattribut ''{0}'' de lʼélément ''{1}'' pour les "
"fonctionnalités du serveur. Actuellement ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "L’analyse de la date ''{0}'' renvoyée par le serveur a échoué."
@@ -15179,75 +15192,6 @@ msgstr "raison non spécifiée"
msgid "Error playing sound"
msgstr "Une erreur est survenue lors de la lecture du son"
-msgid "Do nothing"
-msgstr "Ne rien faire"
-
-msgid "Report Bug"
-msgstr "Rapporter l’erreur"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Une erreur de codage est survenue.<br>Merci de remplir un rapport d’erreur "
-"si vous utilisez la dernière version de JOSM."
-
-msgid "Update JOSM"
-msgstr "Mise à jour de JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Une erreur de codage est survenue.<br><br>Cependant, vous utilisez une "
-"vieille version de JOSM ({0}),<br>au lieu d’utiliser la version stable "
-"courante (<b>{1}</b>).<br><br><b>Veuillez mettre à jour JOSM</b> avant de "
-"considérer de signaler un rapport d’erreur."
-
-msgid "Unexpected Exception"
-msgstr "Exception inattendue"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Masquer les prochaines fenêtres d’erreur pour cette session."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Une erreur est survenue. Avant de remplir le rapport d’erreur, vérifiez que "
-"vous utilisez la dernière version de JOSM :"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Vous devriez mettre à jour vos greffons. Si le problème persiste, merci de "
-"remplir un rapport d’erreur sur notre site :"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Le rapport devrait déjà être rempli. Merci d’ajouter une information sur la "
-"manière de reproduire l’erreur."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Vous pouvez aussi remplir manuellement le rapport à cette adresse web :"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Le rapport a déjà été copié dans votre presse-papier.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Vous avez rencontré une erreur dans JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15619,9 +15563,6 @@ msgstr "Téléchargement redirigé vers ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Trop de redirections ont été détectées. Abandon."
-msgid "Fetching content..."
-msgstr "Récupération du contenu..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Impossible de trouver la traduction pour la langue {0}. Retour à la langue "
@@ -15847,6 +15788,79 @@ msgstr "Géométrie malformée ignorée: {0}"
msgid "Failed to load XML schema."
msgstr "Impossible de charger le schéma XML."
+msgid "Do nothing"
+msgstr "Ne rien faire"
+
+msgid "Report Bug"
+msgstr "Rapporter l’erreur"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Une erreur de codage est survenue.<br>Merci de remplir un rapport d’erreur "
+"si vous utilisez la dernière version de JOSM."
+
+msgid "Update JOSM"
+msgstr "Mise à jour de JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Une erreur de codage est survenue.<br><br>Cependant, vous utilisez une "
+"vieille version de JOSM ({0}),<br>au lieu d’utiliser la version stable "
+"courante (<b>{1}</b>).<br><br><b>Veuillez mettre à jour JOSM</b> avant de "
+"considérer de signaler un rapport d’erreur."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Masquer les prochaines fenêtres d’erreur pour cette session."
+
+msgid "Unexpected Exception"
+msgstr "Exception inattendue"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Vous avez rencontré une erreur dans JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Une erreur est survenue. Avant de remplir le rapport d’erreur, vérifiez que "
+"vous utilisez la dernière version de JOSM :"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Vous devriez mettre à jour vos greffons. Si le problème persiste, merci de "
+"remplir un rapport d’erreur sur notre site :"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Le rapport devrait déjà être rempli. Merci d’ajouter une information sur la "
+"manière de reproduire l’erreur."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Vous pouvez aussi remplir manuellement le rapport à cette adresse web :"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Le rapport a déjà été copié dans votre presse-papier.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16197,14 +16211,14 @@ msgstr "Satellite Mapbox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "Traces GPS OpenStreetMap"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Couche standard)"
+msgid "OpenSeaMap"
+msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik noir et blanc)"
@@ -16212,8 +16226,14 @@ msgstr "OpenStreetMap (Mapnik noir et blanc)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sans étiquettes)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Style allemand)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "Traces GPS OpenStreetMap"
msgid "MapQuest OSM"
msgstr "OSM MapQuest"
@@ -16224,15 +16244,12 @@ msgstr "Transport Public (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Style allemand)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodge, Laos, Thaïlande, Vietnam bilingues"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "Surcouche OpenPT Map"
@@ -16329,6 +16346,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthophoto"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz : Basiskarte (carte de base)"
@@ -16353,14 +16373,14 @@ msgstr "VoGIS : « Couleurs vraies » 2012 (12 cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS : « Couleurs vraies » Hiver 2015 (20 cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS : Plan de zonage"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS : DGM (modèle de terrain)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS : DOM (modèle de surface)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "Imagerie aérienne AGIV(laanderen), couvre la région de Bruxelles"
@@ -16506,10 +16526,10 @@ msgstr "Géolittoral V2 - Orthophotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16564,6 +16584,15 @@ msgstr "Bavière (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavière (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (imagerie aérienne)"
@@ -16581,16 +16610,6 @@ msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
"Vielle carte de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr ""
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr ""
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16636,6 +16655,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16696,6 +16718,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italie"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16732,11 +16757,8 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuanie)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Chemin de fer"
@@ -16837,6 +16859,9 @@ msgstr "Powiat poznański: Budynki (bâtiments)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (bâtiments)"
@@ -16846,6 +16871,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (image aérienne)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (bâtiments)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (bâtiments)"
@@ -17559,6 +17587,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18644,7 +18677,7 @@ msgid "leafless"
msgstr "sans feuilles"
msgid "Cycle"
-msgstr "Vélo"
+msgstr "Cycle"
msgid "deciduous"
msgstr "feuillus"
@@ -19008,6 +19041,12 @@ msgstr "Routes"
msgid "Motorway"
msgstr "Autoroute"
+msgid "Destination"
+msgstr "Destination"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr "Localisation"
@@ -19601,9 +19640,6 @@ msgstr "Échangeur"
msgid "Number"
msgstr "Numéro"
-msgid "Exit to"
-msgstr "Sortie vers"
-
msgid "Services"
msgstr "Aire de service"
@@ -20091,6 +20127,15 @@ msgstr "vasière"
msgid "mangrove"
msgstr "mangrove"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Terrain boueux"
@@ -21250,6 +21295,9 @@ msgstr "Emplacement de feu"
msgid "Fishing"
msgstr "Pêche"
+msgid "Bird Hide"
+msgstr "Observatoire ornithologique"
+
msgid "Night Club"
msgstr "Boîte de nuit"
@@ -22518,6 +22566,10 @@ msgid "transformer_tower"
msgstr "tour de transformateur"
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Niveaux"
@@ -24112,8 +24164,8 @@ msgstr "sacs pour excrément"
msgid "food"
msgstr "alimentation"
-msgid "news_papers"
-msgstr "journaux"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "tickets de parking"
@@ -24127,8 +24179,8 @@ msgstr "schéma de transport public"
msgid "public_transport_tickets"
msgstr "tickets de transport public"
-msgid "SIM-cards"
-msgstr "cartes SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "timbres"
@@ -25406,6 +25458,21 @@ msgstr "nature"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Itinéraire de piste"
@@ -25430,9 +25497,6 @@ msgstr "alpin"
msgid "Detour Route"
msgstr "Itinéraire de déviation"
-msgid "Destination"
-msgstr "Destination"
-
msgid "Ref of the way this is a detour to"
msgstr "Référence du chemin dont ceci est un détour"
@@ -25592,8 +25656,14 @@ msgstr "Camping"
msgid "Test"
msgstr "Essai"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Décroître les numéros de rue dans l’interpolation des adresses"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} sans {1}"
@@ -25684,6 +25754,11 @@ msgstr ""
"Usage incorrect du tag {0}. Supprimez {1} car il est évident que le nom est "
"manquant même sans un tag additionnel."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} est obsolète. Veuillez utiliser un multipolygone à la place."
@@ -25790,6 +25865,9 @@ msgstr "{0} doit être relié à un chemin"
msgid "node connects waterway and bridge"
msgstr "le noeud est à l’intersection d’un cours d’eau et d’un pont"
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr "direction de rond-point douteuse"
@@ -25799,6 +25877,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "abbréviation du nom de rue"
@@ -29252,6 +29338,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "ModeInfo"
@@ -31708,6 +31854,15 @@ msgstr "Transport public : activer les points de chemins"
msgid "Public Transport: Edit waypoint name"
msgstr "Transport public : modifier le nom d’un point de chemin"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "La sélection n’est pas valide"
+
msgid "Public transport routes"
msgstr "Lignes de transport public"
@@ -32550,9 +32705,6 @@ msgstr "Diviser un bâtiment"
msgid "Creates individual buildings from a long building."
msgstr "Créer des bâtiments mitoyens à partir d’un bâtiment."
-msgid "Invalid selection"
-msgstr "La sélection n’est pas valide"
-
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 "
@@ -34569,18 +34721,3 @@ msgstr "En voiture !"
msgid "Drive a race car on this layer"
msgstr "Conduire une voiture de course sur ce calque"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Le motif est erroné, au moins une valeur doit être positive"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Le motif est erroné, les valeurs doivent être positives"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Echec de lʼanalyse des styles Mappaint de ''{0}''. Les erreurs étaient: "
-#~ "[{1}:{2}] {3}"
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index c87ecf8..8f43e9b 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:44+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:44+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -147,9 +147,6 @@ msgstr "Leagan Java {0}"
msgid "Homepage"
msgstr "Leathanach Baile"
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr "Eolas"
@@ -171,6 +168,12 @@ msgstr "Breiseáin"
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -573,9 +576,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1165,9 +1165,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1777,6 +1774,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1926,9 +1947,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2244,8 +2262,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3026,9 +3044,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3048,27 +3063,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4126,6 +4120,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4771,19 +4768,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5756,6 +5753,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6243,51 +6264,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6310,12 +6286,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6738,15 +6708,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6852,9 +6813,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7006,14 +6964,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7098,15 +7048,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7124,6 +7065,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7439,10 +7449,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9098,9 +9108,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9903,12 +9910,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11916,6 +11917,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12426,6 +12433,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13667,62 +13682,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13974,9 +13933,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14161,6 +14117,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14495,13 +14511,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14510,7 +14526,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14522,15 +14544,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14627,6 +14646,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14651,13 +14673,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14804,10 +14826,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14860,29 +14882,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14930,6 +14951,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14990,6 +15014,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15026,10 +15053,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15131,6 +15155,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15140,6 +15167,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15795,6 +15825,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17152,6 +17187,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17728,9 +17769,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18209,6 +18247,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19357,6 +19404,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20625,6 +20675,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22212,7 +22266,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22227,7 +22281,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23482,6 +23536,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23506,9 +23575,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23668,7 +23734,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23752,6 +23824,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23850,6 +23927,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23859,6 +23939,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26958,6 +27046,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29279,6 +29427,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30063,9 +30220,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 8e6f2b7..f45053d 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:45+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:44+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -156,9 +156,6 @@ msgstr "Versión Java {0}"
msgid "Homepage"
msgstr "Páxina de incio"
-msgid "Bug Reports"
-msgstr "Informes de fallos"
-
msgid "Info"
msgstr "Información"
@@ -180,6 +177,12 @@ msgstr "Complementos"
msgid "About JOSM..."
msgstr "Sobre JOSM…"
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Informar do fallo"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -604,9 +607,6 @@ msgstr "Axustar a posición desta capa de imaxes"
msgid "Adjust imagery offset"
msgstr "Axustar o desprazamento de imaxes"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1279,9 +1279,6 @@ msgstr "Renomear tamén o ficheiro"
msgid "Could not rename file ''{0}''"
msgstr "Non é posíbel renomear o ficheiro «{0}»"
-msgid "Report bug"
-msgstr "Informar do fallo"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1925,6 +1922,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avance máis lento"
+msgid "Downloading changeset content"
+msgstr "Descargando o contido do conxunto de cambios"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Descargando conxunto de cambios {2}…"
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Descargandocontido para o conxunto de cambios {2}…"
+
+msgid "Download changesets"
+msgstr "Descargar conxuntos de cambios"
+
+msgid "Querying and downloading changesets"
+msgstr "Consultando e descargando conxuntos de cambios"
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr "Pedir e descargar conxuntos de cambios…"
+
+msgid "Errors during download"
+msgstr "Erros durante a descarga"
+
msgid "Download GPS"
msgstr ""
@@ -2079,9 +2100,6 @@ msgstr "Elementos eliminados ou ignorados"
msgid "The following errors occurred during mass download: {0}"
msgstr "Os seguintes erros ocurriron durante a descarga masiva: {0}"
-msgid "Errors during download"
-msgstr "Erros durante a descarga"
-
msgid "Error during download"
msgstr "Erro durante a descarga"
@@ -2405,8 +2423,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3210,9 +3228,6 @@ msgstr "Resolver conflitos para a lista de nodos da vía {0}"
msgid "Main dataset does not include node {0}"
msgstr "O conxunto de datos principal non inclúe o nodo {0}"
-msgid "Apply?"
-msgstr "Aplicar?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3232,27 +3247,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Relación"
-
-msgid "Old role"
-msgstr "Antigo rol"
-
-msgid "New role"
-msgstr "Novo rol"
-
-msgid "Old key"
-msgstr "Clave antiga"
-
-msgid "Old value"
-msgstr "Valor antigo"
-
-msgid "New key"
-msgstr "Nova clave"
-
-msgid "New value"
-msgstr "Novo valor"
-
msgid "Apply selected changes"
msgstr "Aplicar os cambios seleccionados"
@@ -4341,6 +4335,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problema de verificación de rol"
@@ -4997,6 +4994,12 @@ msgstr ""
msgid "Initializing"
msgstr "Inicializando"
+msgid "Setting defaults"
+msgstr "Estabelecendo os valores predeterminados"
+
+msgid "Creating main GUI"
+msgstr "Creando Interface (GUI) principal"
+
msgid "Updating plugins"
msgstr ""
@@ -5006,12 +5009,6 @@ msgstr "Instalando os complementos actualizados"
msgid "Loading early plugins"
msgstr "Cargando os complementos iniciais"
-msgid "Setting defaults"
-msgstr "Estabelecendo os valores predeterminados"
-
-msgid "Creating main GUI"
-msgstr "Creando Interface (GUI) principal"
-
msgid "Loading plugins"
msgstr "Cargando os complementos"
@@ -6027,6 +6024,30 @@ msgstr "Amosar só as etiquetas con conflitos"
msgid "Show tags with multiple values only"
msgstr "Amosar só as etiquetas con multiples valores"
+msgid "Apply?"
+msgstr "Aplicar?"
+
+msgid "Relation"
+msgstr "Relación"
+
+msgid "Old role"
+msgstr "Antigo rol"
+
+msgid "New role"
+msgstr "Novo rol"
+
+msgid "Old key"
+msgstr "Clave antiga"
+
+msgid "Old value"
+msgstr "Valor antigo"
+
+msgid "New key"
+msgstr "Nova clave"
+
+msgid "New value"
+msgstr "Novo valor"
+
msgid "For selected objects only"
msgstr "Soamente para os obxectos escollidos"
@@ -6533,51 +6554,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "Abrir unha lista de todas as capas cargadas."
-msgid "Delete the selected layers."
-msgstr "Eliminar as capas seleccionadas."
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Cambiar o estado visíbel da capa seleccionada."
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Activar"
-
-msgid "Activate the selected layer"
-msgstr "Activar a capa escollida"
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr "Combinar esta capa con outra"
-
-msgid "Duplicate this layer"
-msgstr "Duplicar esta capa"
-
-msgid "Copy of {0}"
-msgstr "Copia de {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copia {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "a capa é actualmente visíbel (premer para agochala)"
@@ -6600,12 +6576,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Mover a capa seleccionada unha fila cara arriba."
-
-msgid "Move the selected layer one row down."
-msgstr "Mover a capa seleccionada unha fila cara abaixo."
-
msgid "Information about layer"
msgstr "Información da capa"
@@ -7036,15 +7006,6 @@ msgstr "Pechado en"
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr "Descargando o contido do conxunto de cambios"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Descargando conxunto de cambios {2}…"
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Descargandocontido para o conxunto de cambios {2}…"
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7153,9 +7114,6 @@ msgstr ""
msgid "Date"
msgstr "Data"
-msgid "Download changesets"
-msgstr "Descargar conxuntos de cambios"
-
msgid "{0} [incomplete]"
msgstr "{0}[incompleto]"
@@ -7326,14 +7284,6 @@ msgid "Please enter an integer value > 0"
msgstr "Introduza un enteiro de valor > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-msgstr "Introduza un nome de usuario non valeiro"
-
-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 ""
@@ -7425,15 +7375,6 @@ msgstr "URL de consulta de conxuntos de cambios incorrecto"
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr "Consultando e descargando conxuntos de cambios"
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr "Pedir e descargar conxuntos de cambios…"
-
msgid "URL: "
msgstr "URL: "
@@ -7451,6 +7392,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Esta petición de conxunto de cambios non é válida"
+msgid "Activate"
+msgstr "Activar"
+
+msgid "Activate the selected layer"
+msgstr "Activar a capa escollida"
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr "Eliminar as capas seleccionadas."
+
+msgid "Duplicate this layer"
+msgstr "Duplicar esta capa"
+
+msgid "Copy of {0}"
+msgstr "Copia de {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copia {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Combinar esta capa con outra"
+
+msgid "Move the selected layer one row down."
+msgstr "Mover a capa seleccionada unha fila cara abaixo."
+
+msgid "Move the selected layer one row up."
+msgstr "Mover a capa seleccionada unha fila cara arriba."
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Cambiar o estado visíbel da capa seleccionada."
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7766,12 +7776,12 @@ msgstr "Relacións pai"
msgid "Child Relations"
msgstr "Relacións fillo"
-msgid "Apply Role:"
-msgstr "Aplicar rol:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Introduza un rol e aplíqueo aos membros da relación escollidos"
+msgid "Apply Role:"
+msgstr "Aplicar rol:"
+
msgid "New Relation"
msgstr ""
@@ -9477,9 +9487,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -10296,12 +10303,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -12366,6 +12367,12 @@ msgstr "Preferencias de Conexión"
msgid "Connection Settings for the OSM server."
msgstr "Preferencias de conexión para o servidor OSM."
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr "Acción"
@@ -12893,6 +12900,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -14147,108 +14162,50 @@ msgid "Processing plugin files..."
msgstr ""
msgid "Download plugin list..."
-msgstr ""
-
-msgid "Downloading plugin list from ''{0}''"
-msgstr ""
-
-msgid "Unsuccessful HTTP request"
-msgstr ""
-
-msgid "Plugin list download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin list:"
-msgstr ""
-
-msgid "Details:"
-msgstr ""
-
-msgid ""
-"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
-"plugin site ''{1}''."
-msgstr ""
-
-msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
-
-msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
-
-msgid ""
-"Failed to parse plugin list document from site ''{0}''. Skipping site. "
-"Exception was: {1}"
-msgstr ""
-
-msgid "Processing plugin list from site ''{0}''"
-msgstr ""
-
-msgid "This is after the end of the recording"
-msgstr "Isto está despois do fin da gravación"
-
-msgid "unspecified reason"
-msgstr "razón sen especificar"
-
-msgid "Error playing sound"
-msgstr "Produciuse un erro reproducindo o son"
-
-msgid "Do nothing"
-msgstr "Non facer nada"
-
-msgid "Report Bug"
-msgstr "Informar dun fallo"
+msgstr ""
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
+msgid "Downloading plugin list from ''{0}''"
msgstr ""
-msgid "Update JOSM"
+msgid "Unsuccessful HTTP request"
msgstr ""
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
+msgid "Plugin list download error"
msgstr ""
-msgid "Unexpected Exception"
-msgstr "Excepción Inesperada"
+msgid "JOSM failed to download plugin list:"
+msgstr ""
-msgid "Suppress further error dialogs for this session."
+msgid "Details:"
msgstr ""
msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Atopou un erro en JOMS. Antes de enviar un informe de fallo asegúrese de que "
-"ten a última versión de JOSM aqui:"
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
+msgid "Writing plugin list to local cache ''{0}''"
msgstr ""
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
+msgid "Parsing plugin list from site ''{0}''"
msgstr ""
msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
msgstr ""
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(O texto xa foi copiado ao portapapeis.)"
+msgid "Processing plugin list from site ''{0}''"
+msgstr ""
-msgid "You have encountered a bug in JOSM"
-msgstr "Atopou un fallo en JOSM"
+msgid "This is after the end of the recording"
+msgstr "Isto está despois do fin da gravación"
+
+msgid "unspecified reason"
+msgstr "razón sen especificar"
+
+msgid "Error playing sound"
+msgstr "Produciuse un erro reproducindo o son"
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
@@ -14504,9 +14461,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Non foi posíbel atopar a tradución para o idioma local {0}. Volvendo a {1}."
@@ -14692,6 +14646,68 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Non facer nada"
+
+msgid "Report Bug"
+msgstr "Informar dun fallo"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Excepción Inesperada"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Atopou un fallo en JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Atopou un erro en JOMS. Antes de enviar un informe de fallo asegúrese de que "
+"ten a última versión de JOSM aqui:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(O texto xa foi copiado ao portapapeis.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15028,13 +15044,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -15043,7 +15059,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -15055,15 +15077,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -15160,6 +15179,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15184,13 +15206,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15337,10 +15359,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15393,29 +15415,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15463,6 +15484,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15523,6 +15547,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15559,10 +15586,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15664,6 +15688,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15673,6 +15700,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16331,6 +16361,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17717,6 +17752,12 @@ msgstr "Rúas"
msgid "Motorway"
msgstr "Autoestrada"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -18293,9 +18334,6 @@ msgstr "Saída de autopista"
msgid "Number"
msgstr "Número"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Servizos"
@@ -18775,6 +18813,15 @@ msgstr "superficie mareal"
msgid "mangrove"
msgstr "manglar"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Lama"
@@ -19923,6 +19970,9 @@ msgstr ""
msgid "Fishing"
msgstr "Pesca"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -21191,6 +21241,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22778,8 +22832,8 @@ msgstr "Bolsas para excrementos"
msgid "food"
msgstr "Alimentación"
-msgid "news_papers"
-msgstr "Xornáis"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "Tickets de aparcamento"
@@ -22793,8 +22847,8 @@ msgstr "Bonos de transporte público"
msgid "public_transport_tickets"
msgstr "Billetes de transporte público"
-msgid "SIM-cards"
-msgstr "Tarxetas SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "selos"
@@ -24048,6 +24102,21 @@ msgstr "espazo natural"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -24072,9 +24141,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -24234,7 +24300,13 @@ msgstr "Camping"
msgid "Test"
msgstr "Proba"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -24318,6 +24390,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24416,6 +24493,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24425,6 +24505,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27543,6 +27631,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29872,6 +30020,15 @@ msgstr "Transporte público: activar puntos de referencia"
msgid "Public Transport: Edit waypoint name"
msgstr "Transporte público: editar o nome do punto de referencia"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30658,9 +30815,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr "Crear edificios individuais a partir de un edificio grande"
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/he.po b/i18n/po/he.po
index b8ada1d..71b12b4 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:47+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:46+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "גירסת Java {0}"
msgid "Homepage"
msgstr "דף הבית"
-msgid "Bug Reports"
-msgstr "דיווחי תקלות"
-
msgid "Info"
msgstr "מידע"
@@ -172,6 +169,12 @@ msgstr "תוספים"
msgid "About JOSM..."
msgstr "אודות JOSM..."
+msgid "OK"
+msgstr "אישור"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -577,9 +580,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "אישור"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1169,9 +1169,6 @@ msgstr "שנה גם את שם הקובץ"
msgid "Could not rename file ''{0}''"
msgstr "לא ניתן לשנות את שם הקובץ ''{0}''"
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1782,6 +1779,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "הרצה איטית יותר"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1931,9 +1952,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2253,8 +2271,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3040,9 +3058,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr "החל?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3062,27 +3077,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "יחס"
-
-msgid "Old role"
-msgstr "תפקיד ישן"
-
-msgid "New role"
-msgstr "תפקיד חדש"
-
-msgid "Old key"
-msgstr "מפתח ישן"
-
-msgid "Old value"
-msgstr "ערך ישן"
-
-msgid "New key"
-msgstr "מפתח חדש"
-
-msgid "New value"
-msgstr "ערך חדש"
-
msgid "Apply selected changes"
msgstr "החל את השינויים שנבחרו"
@@ -4142,6 +4136,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4789,6 +4786,12 @@ msgstr ""
msgid "Initializing"
msgstr "מאתחל"
+msgid "Setting defaults"
+msgstr "קביעת ברירות מחדל"
+
+msgid "Creating main GUI"
+msgstr "יוצר ממשקי גרפי ראשי"
+
msgid "Updating plugins"
msgstr ""
@@ -4798,12 +4801,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr "טען תוספים מוקדמים"
-msgid "Setting defaults"
-msgstr "קביעת ברירות מחדל"
-
-msgid "Creating main GUI"
-msgstr "יוצר ממשקי גרפי ראשי"
-
msgid "Loading plugins"
msgstr "טעינת תוספים"
@@ -5782,6 +5779,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "החל?"
+
+msgid "Relation"
+msgstr "יחס"
+
+msgid "Old role"
+msgstr "תפקיד ישן"
+
+msgid "New role"
+msgstr "תפקיד חדש"
+
+msgid "Old key"
+msgstr "מפתח ישן"
+
+msgid "Old value"
+msgstr "ערך ישן"
+
+msgid "New key"
+msgstr "מפתח חדש"
+
+msgid "New value"
+msgstr "ערך חדש"
+
msgid "For selected objects only"
msgstr ""
@@ -6269,51 +6290,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "פתח רשימה המכילה את כל השכבות שנטענו."
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr "מחליף את המצב החזותי של השכבה הנבחרת."
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "העתק של {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "עותק {1} של {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6336,12 +6312,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
-
-msgid "Move the selected layer one row down."
-msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
-
msgid "Information about layer"
msgstr ""
@@ -6765,15 +6735,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6879,9 +6840,6 @@ msgstr ""
msgid "Date"
msgstr "תאריך"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7033,14 +6991,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7125,15 +7075,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7151,6 +7092,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "העתק של {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "עותק {1} של {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
+
+msgid "Move the selected layer one row up."
+msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr "מחליף את המצב החזותי של השכבה הנבחרת."
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7466,10 +7476,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9126,9 +9136,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9941,12 +9948,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11954,6 +11955,12 @@ msgstr "הגדרות חיבור"
msgid "Connection Settings for the OSM server."
msgstr "הגדרות חיבור לשרת OSM"
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr "פעולה"
@@ -12464,6 +12471,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13707,62 +13722,6 @@ msgstr ""
msgid "Error playing sound"
msgstr "שגיאה בניגון הצליל"
-msgid "Do nothing"
-msgstr "אל תעשה כלום"
-
-msgid "Report Bug"
-msgstr "דווח על תקלה"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "שגיאה בלתי צפויה"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(הטקסט כבר הועתק ל-clipboard שלך)."
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14014,9 +13973,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14201,6 +14157,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "אל תעשה כלום"
+
+msgid "Report Bug"
+msgstr "דווח על תקלה"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "שגיאה בלתי צפויה"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(הטקסט כבר הועתק ל-clipboard שלך)."
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14537,13 +14553,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14552,7 +14568,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14564,15 +14586,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14669,6 +14688,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14693,13 +14715,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14846,10 +14868,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14902,29 +14924,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14972,6 +14993,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15032,6 +15056,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15068,10 +15095,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15173,6 +15197,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15182,6 +15209,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15837,6 +15867,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17194,6 +17229,12 @@ msgstr "רחובות"
msgid "Motorway"
msgstr "כבישים"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17770,9 +17811,6 @@ msgstr ""
msgid "Number"
msgstr "מספר"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "שירותים"
@@ -18251,6 +18289,15 @@ msgstr ""
msgid "mangrove"
msgstr "מנגרוב"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "בוץ"
@@ -19399,6 +19446,9 @@ msgstr ""
msgid "Fishing"
msgstr "דייג"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20667,6 +20717,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22254,8 +22308,8 @@ msgstr "שקיות צואה"
msgid "food"
msgstr "מזון"
-msgid "news_papers"
-msgstr "עיתונים"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "כרטיסי חניה"
@@ -22269,8 +22323,8 @@ msgstr "מפות תחבורה ציבורית"
msgid "public_transport_tickets"
msgstr "כרטיסים לתחבורה ציבורית"
-msgid "SIM-cards"
-msgstr "כרטיס SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "בולים"
@@ -23524,6 +23578,21 @@ msgstr "טבעי"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23548,9 +23617,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23710,7 +23776,13 @@ msgstr "מחנאות"
msgid "Test"
msgstr "ניסיון"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23794,6 +23866,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23892,6 +23969,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23901,6 +23981,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27000,6 +27088,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29325,6 +29473,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30109,9 +30266,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index d75849d..19e26f4 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:47+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:46+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr "मुख पृष्ठ"
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr "सूचना"
@@ -172,6 +169,12 @@ msgstr "प्लगइन्स"
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 4f1d625..3e51256 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:03+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:01+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -150,9 +150,6 @@ msgstr "Java verzija {0}"
msgid "Homepage"
msgstr "Početna stranica"
-msgid "Bug Reports"
-msgstr "Izvještaji o greškama"
-
msgid "Info"
msgstr "Info"
@@ -174,6 +171,12 @@ msgstr "Dodaci"
msgid "About JOSM..."
msgstr "O JOSM-u..."
+msgid "OK"
+msgstr "U redu"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -585,9 +588,6 @@ msgstr "Podesi poziciju ovog slikovnog sloja"
msgid "Adjust imagery offset"
msgstr "Podesi offset podloge"
-msgid "OK"
-msgstr "U redu"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1218,9 +1218,6 @@ msgstr "Također preimenuj i datoteku"
msgid "Could not rename file ''{0}''"
msgstr "Nemogu preimenovati datoteku ''{0}''"
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1862,6 +1859,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Sporije naprijed"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr "Pogreške tijekom preuzimanja"
+
msgid "Download GPS"
msgstr ""
@@ -2013,9 +2034,6 @@ msgstr "Izbrisani ili pomaknuti objekti"
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr "Pogreške tijekom preuzimanja"
-
msgid "Error during download"
msgstr "Greška tjekom preuzimanja"
@@ -2336,8 +2354,8 @@ msgid "Add selection to relation"
msgstr "Dodaj selekciju u relaciju"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3137,9 +3155,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr "Glavni skup podataka ne sadržava točku {0}"
-msgid "Apply?"
-msgstr "Potvrditi?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3159,27 +3174,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Relacija"
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr "Stara vrijednost"
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr "Nova vrijednost"
-
msgid "Apply selected changes"
msgstr ""
@@ -4240,6 +4234,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4886,6 +4883,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Kreiranje glavog GUI"
+
msgid "Updating plugins"
msgstr ""
@@ -4895,12 +4898,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Kreiranje glavog GUI"
-
msgid "Loading plugins"
msgstr ""
@@ -5874,6 +5871,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "Potvrditi?"
+
+msgid "Relation"
+msgstr "Relacija"
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr "Stara vrijednost"
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr "Nova vrijednost"
+
msgid "For selected objects only"
msgstr ""
@@ -6362,51 +6383,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "Kopija {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopija {1} od {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6429,12 +6405,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6858,15 +6828,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6972,9 +6933,6 @@ msgstr ""
msgid "Date"
msgstr "Datum"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7126,14 +7084,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7218,15 +7168,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr "URL: "
@@ -7244,6 +7185,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "Kopija {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopija {1} od {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7562,10 +7572,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9245,9 +9255,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "GREŠKA"
-
msgid "Next marker"
msgstr ""
@@ -10054,12 +10061,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -12067,6 +12068,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12577,6 +12584,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13818,62 +13833,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14125,9 +14084,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14312,6 +14268,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14646,13 +14662,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14661,7 +14677,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14673,15 +14695,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14778,6 +14797,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14802,13 +14824,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14955,10 +14977,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15011,29 +15033,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15081,6 +15102,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15141,6 +15165,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15177,10 +15204,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15282,6 +15306,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15291,6 +15318,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15946,6 +15976,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17303,6 +17338,12 @@ msgstr ""
msgid "Motorway"
msgstr "Autocesta"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17879,9 +17920,6 @@ msgstr "Ulaz/izlaz s autoceste"
msgid "Number"
msgstr "Broj"
-msgid "Exit to"
-msgstr "Izlaz za"
-
msgid "Services"
msgstr "Usluge"
@@ -18360,6 +18398,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19508,6 +19555,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20776,6 +20826,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22363,7 +22417,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22378,7 +22432,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23633,6 +23687,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23657,9 +23726,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23819,7 +23885,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23903,6 +23975,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24001,6 +24078,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24010,6 +24090,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27109,6 +27197,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29434,6 +29582,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30218,9 +30375,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -31957,6 +32111,3 @@ msgstr ""
msgid "Drive a race car on this layer"
msgstr ""
-
-#~ msgid "xml"
-#~ msgstr "xml"
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index d9a55fa..2bb31c0 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:46+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:45+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index e66c8c8..f2015d4 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: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-04 22:48+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-28 19:29+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: 2016-03-13 04:48+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:47+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -155,9 +155,6 @@ msgstr "Java verzió: {0}"
msgid "Homepage"
msgstr "Honlap"
-msgid "Bug Reports"
-msgstr "Hibajelentések"
-
msgid "Info"
msgstr "Információ"
@@ -179,6 +176,12 @@ msgstr "Bővítmények"
msgid "About JOSM..."
msgstr "A JOSM névjegye..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Hibajelentés"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Erőforrás nem található: ''{0}''."
@@ -607,9 +610,6 @@ msgstr "A légifelvétel réteg pozíciójának igazítása"
msgid "Adjust imagery offset"
msgstr "Légifelvétel-eltolás beállítása"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1170,7 +1170,7 @@ msgid "Paste"
msgstr "Beillesztés"
msgid "Paste contents of paste buffer."
-msgstr "A vágólap tartalmának beillsztése."
+msgstr "A vágólap tartalmának beillesztése."
msgid "Delete incomplete members?"
msgstr "Törlöd a félkész tagokat?"
@@ -1277,9 +1277,6 @@ msgstr "Fájl átnevezése szintén"
msgid "Could not rename file ''{0}''"
msgstr "Nem lehet átnevezni a(z) \"{0}\" fájlt"
-msgid "Report bug"
-msgstr "Hibajelentés"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Hibajegy felvétele a JOSM hibakövetőjébe"
@@ -1933,6 +1930,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Lassabban előre"
+msgid "Downloading changeset content"
+msgstr "Módosításcsomag-tartalom letöltése"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) {2} módosításcsomag letöltése..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) {2} módosításcsomag tartalmának letöltése..."
+
+msgid "Download changesets"
+msgstr "Módosításcsomag letöltése"
+
+msgid "Querying and downloading changesets"
+msgstr "Módosításcsomagok lekérdezése és letöltése"
+
+msgid "Determine user id for current user..."
+msgstr "Jelenlegi felhasználó azonosítójának megállapítása..."
+
+msgid "Query and download changesets ..."
+msgstr "Módosításcsomag lekérdezés és letöltés"
+
+msgid "Errors during download"
+msgstr "Hibák letöltés közben"
+
msgid "Download GPS"
msgstr "GPS letöltése"
@@ -2098,9 +2119,6 @@ msgstr "Törölt vagy mozgatott objektumok"
msgid "The following errors occurred during mass download: {0}"
msgstr "Az alábbi hibák történtek a tömeges letöltés közben: {0}"
-msgid "Errors during download"
-msgstr "Hibák letöltés közben"
-
msgid "Error during download"
msgstr "Hiba a letöltés közben"
@@ -2447,8 +2465,8 @@ msgid "Add selection to relation"
msgstr "Kiválasztott elemek kapcsolathoz adása"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -2949,7 +2967,7 @@ msgstr ""
"megengedett mennyiséget ({2})"
msgid "API Capabilities Violation"
-msgstr "Nem teljesített API-képeségek"
+msgstr "Nem teljesített API-képességek"
msgid "Cyclic dependency between relations:"
msgstr "Körkörös hivatkozás kapcsolatok között:"
@@ -3284,9 +3302,6 @@ msgstr "Ütközések megoldása {0} vonal pontlistájában"
msgid "Main dataset does not include node {0}"
msgstr "A fő adathalmaz nem tartalamzza {0} pontot"
-msgid "Apply?"
-msgstr "Alkalmaz?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3314,27 +3329,6 @@ msgstr ""
"A vonal megfordításakor az alábbi változtatásokat javasolt megtenni az "
"adatok konzisztenciájának megőrzése érdekében."
-msgid "Relation"
-msgstr "Kapcsolat"
-
-msgid "Old role"
-msgstr "Régi szerep"
-
-msgid "New role"
-msgstr "Új szerep"
-
-msgid "Old key"
-msgstr "Régi kulcs"
-
-msgid "Old value"
-msgstr "Régi érték"
-
-msgid "New key"
-msgstr "Új kulcs"
-
-msgid "New value"
-msgstr "Új érték"
-
msgid "Apply selected changes"
msgstr "Kijelölt változtatások alkalmazása"
@@ -4005,7 +3999,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "Az email cím érvénytelen domain nevet tartalmaz: {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Email-ellenőrző"
msgid "URL is invalid"
msgstr "Érvénytelen URL"
@@ -4026,7 +4020,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "Az URL érvénytelen horgonyt tartalmaz: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "URL-ellenőrző"
msgid "Addresses"
msgstr "Lakcím"
@@ -4098,7 +4092,7 @@ msgid "Tests for the correct usage of ''*:conditional'' tags."
msgstr "Tesztek a ''*:conditional'' címkék helyes használatára."
msgid "Does not match pattern ''restriction value @ condition''"
-msgstr "''korlátozás érték @ állapot'' mintaellenőrzés mellőzése"
+msgstr "„korlátozás érték @ feltétel” mintaellenőrzés mellőzése"
msgid "{0} is not a valid restriction value"
msgstr "{0} nem egy érvényes korlátozás érték"
@@ -4460,10 +4454,13 @@ msgid "Public Transport Route"
msgstr "Tömegközlekedési útvonal"
msgid "Route relation contains a ''{0}'' role"
-msgstr ""
+msgstr "Az útvonal kapcsolatnak „{0}” szerepű tagja van"
msgid "Route relation contains a gap"
-msgstr ""
+msgstr "Az útvonal kapcsolatban szakadás van"
+
+msgid "Stop position not part of route"
+msgstr "A megállási pont nem része az útvonalnak"
msgid "Role verification problem"
msgstr "Szerep ellenőrzési probléma"
@@ -4578,7 +4575,7 @@ msgid "Property values start or end with white space"
msgstr "Tulajdonságérték szóközzel kezdődik vagy végződik"
msgid "Property values contain multiple white spaces"
-msgstr ""
+msgstr "A tulajdonságérték dupla szóközt tartalmaz"
msgid "Property values contain HTML entity"
msgstr "Tulajdonságérték HTML kódot tartalmaz"
@@ -5136,6 +5133,12 @@ msgstr "Részletes hibakeresési szint (trace) engedélyezve"
msgid "Initializing"
msgstr "Inicializálás"
+msgid "Setting defaults"
+msgstr "Alapértelmezett beállítások"
+
+msgid "Creating main GUI"
+msgstr "Felhasználói felület betöltése"
+
msgid "Updating plugins"
msgstr "Bővítények frissítése"
@@ -5145,12 +5148,6 @@ msgstr "Frissített bővítmények telepítése"
msgid "Loading early plugins"
msgstr "Korai bővítmények betöltése"
-msgid "Setting defaults"
-msgstr "Alapértelmezett beállítások"
-
-msgid "Creating main GUI"
-msgstr "Felhasználói felület betöltése"
-
msgid "Loading plugins"
msgstr "Bővítmények betöltése"
@@ -5326,7 +5323,7 @@ msgid "Hide edit toolbar"
msgstr "Szerkesztő eszköztár elrejtése"
msgid "Hide or show this toggle button"
-msgstr "Kapcsoló gomb megjelenítése/elrejtése"
+msgstr "Gomb megjelenítése/elrejtése"
msgid "Move right"
msgstr "Jobbra mozgatás"
@@ -5993,12 +5990,12 @@ msgid_plural ""
"want to continue?"
msgstr[0] ""
"{1} objektum egyesítésére készülsz, amik {0} kapcsolat tagjai:<br/>{2}Az "
-"abjektumok egyesítése megtörheti a kapcsolatot. Ha bizonytalan vagy, ne "
+"objektumok egyesítése megtörheti a kapcsolatot. Ha bizonytalan vagy, ne "
"folytasd a módosítást.<br/>Ha folytatni szeretnéd, egy párbeszéd ablak fog "
"segíteni a kapcsolat adaptációjában. <br/><br/>Szeretnéd folytatni?"
msgstr[1] ""
"{1} objektum egyesítésére készülsz, amik {0} kapcsolat tagjai:<br/>{2}Az "
-"abjektumok egyesítése megtörheti a kapcsolatot. Ha bizonytalan vagy, ne "
+"objektumok egyesítése megtörheti a kapcsolatot. Ha bizonytalan vagy, ne "
"folytasd a módosítást.<br/>Ha folytatni szeretnéd, egy párbeszéd ablak fog "
"segíteni a kapcsolat adaptációjában. <br/><br/>Szeretnéd folytatni?"
@@ -6208,6 +6205,30 @@ msgstr "Csak az ütköző címkék"
msgid "Show tags with multiple values only"
msgstr "Csak a több értékel rendelkező címkék"
+msgid "Apply?"
+msgstr "Alkalmaz?"
+
+msgid "Relation"
+msgstr "Kapcsolat"
+
+msgid "Old role"
+msgstr "Régi szerep"
+
+msgid "New role"
+msgstr "Új szerep"
+
+msgid "Old key"
+msgstr "Régi kulcs"
+
+msgid "Old value"
+msgstr "Régi érték"
+
+msgid "New key"
+msgstr "Új kulcs"
+
+msgid "New value"
+msgstr "Új érték"
+
msgid "For selected objects only"
msgstr "Csak a kiválasztott objektumok"
@@ -6303,10 +6324,10 @@ msgid "Open a merge dialog of all selected items in the list above."
msgstr "Egyesítő ablak megnyitása a kijelölt objektumokkal."
msgid "Resolve to my versions"
-msgstr ""
+msgstr "Megoldás az én verziómra"
msgid "Resolves all unresolved conflicts to ''my'' version"
-msgstr ""
+msgstr "Beállítja az összes megoldatlan ütközést az „én” verziómra"
msgid "Resolve to their versions"
msgstr ""
@@ -6438,7 +6459,7 @@ msgid "Filter Hidden:{0} Disabled:{1}"
msgstr "Szűrő rejtett:{0} letiltott:{1}"
msgid "<html>Error in filter <code>{0}</code>:<br>{1}"
-msgstr ""
+msgstr "<html>Hiba a szűrőben <code>{0}</code>:<br>{1}"
msgid "Error in filter"
msgstr "Hiba a szűrőben"
@@ -6736,51 +6757,6 @@ msgstr "{0} réteg láthatóságának átkapcsolása"
msgid "Open a list of all loaded layers."
msgstr "A betöltött rétegek listájának megjelenítése"
-msgid "Delete the selected layers."
-msgstr "Kiválasztott rétegek törlése."
-
-msgid "Show/hide"
-msgstr "Mutat/Elrejt"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "A kiválasztott réteg láthatóságának átkapcsolása"
-
-msgid "Show/hide layer"
-msgstr "Réteg elrejtése/mutatása"
-
-msgid "Opacity"
-msgstr "Átlátszóság"
-
-msgid "Adjust opacity of the layer."
-msgstr "A réteg átlátszóságának szabályozása"
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "A réteg gamma-értékének igazítása"
-
-msgid "Activate"
-msgstr "Aktiválás"
-
-msgid "Activate the selected layer"
-msgstr "A kiválasztott réteg aktiválása"
-
-msgid "Activate layer"
-msgstr "Réteg aktiválása"
-
-msgid "Merge this layer into another layer"
-msgstr "A réteg egyesítése másik réteggel"
-
-msgid "Duplicate this layer"
-msgstr "Réteg megkettőzése"
-
-msgid "Copy of {0}"
-msgstr "{0} Másolata"
-
-msgid "Copy {1} of {0}"
-msgstr "{0} másolata ({1})"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "a réteg látható (kattints az elrejtéshez)"
@@ -6794,20 +6770,16 @@ msgid "this layer is not currently active (click to activate)"
msgstr "a réteg nem aktív (kattints az aktiváláshoz)"
msgid "scale follows native resolution of this layer"
-msgstr ""
+msgstr "zoomszint automatikus illesztése a réteg felbontásához"
msgid ""
"scale follows native resolution of another layer (click to set this layer)"
msgstr ""
+"a zoomszint másik réteg felbontásához van illesztve (kattints a réteget "
+"kiválasztásához)"
msgid "this layer has no native resolution"
-msgstr ""
-
-msgid "Move the selected layer one row up."
-msgstr "A kiválasztott réteget egyel feljebb mozgatja"
-
-msgid "Move the selected layer one row down."
-msgstr "A kiválasztott réteget egyel lejjebb mozgatja"
+msgstr "a réteg nem rendelkezik saját felbontással"
msgid "Information about layer"
msgstr "Információk a rétegről"
@@ -7246,15 +7218,6 @@ msgstr "Lezárva"
msgid "Discussions"
msgstr "Viták"
-msgid "Downloading changeset content"
-msgstr "Módosításcsomag-tartalom letöltése"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) {2} módosításcsomag letöltése..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) {2} módosításcsomag tartalmának letöltése..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7275,7 +7238,7 @@ msgid "Download objects"
msgstr "Objektumok letöltése"
msgid "Download the current version of the selected objects"
-msgstr ""
+msgstr "A kijelölt objektumok jelenlegi verziójának letöltése"
msgid "Select in layer"
msgstr "Kiválasztás a rétegen"
@@ -7368,9 +7331,6 @@ msgstr "A változtatási csomagról szóló vita frissítése az OSM szerverről
msgid "Date"
msgstr "Dátum"
-msgid "Download changesets"
-msgstr "Módosításcsomag letöltése"
-
msgid "{0} [incomplete]"
msgstr "{0} [félkész]"
@@ -7471,7 +7431,7 @@ msgid "Invalid user ID"
msgstr "Érvénytelen felhasználói azonosító"
msgid "Please enter a non-empty user name"
-msgstr "Kérlek ajd meg egy nem üres felhasználónevet"
+msgstr "Kérlek adj meg egy nem üres felhasználónevet"
msgid "Invalid user name"
msgstr "Érvénytelen felhasználói név"
@@ -7542,16 +7502,6 @@ msgid "Please enter an integer value > 0"
msgstr "Adj meg egy nullánál nagyobb egész számot"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>A megadott érték nem egy érvényes felhasználónév.<br>Kérlek adj meg "
-"egy nem üres felhasználónevet.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Kérlek adj meg egy nem üres felhasználónevet"
-
-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 ""
@@ -7655,15 +7605,6 @@ msgstr "Érvénytelen módosításcsomag-lekérdezés URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Dialógusablak bezárása és a módosításcsomag-lekérdezés megszakítása"
-msgid "Querying and downloading changesets"
-msgstr "Módosításcsomagok lekérdezése és letöltése"
-
-msgid "Determine user id for current user..."
-msgstr "Jelenlegi felhasználó azonosítójának megállapítása..."
-
-msgid "Query and download changesets ..."
-msgstr "Módosításcsomag lekérdezés és letöltés"
-
msgid "URL: "
msgstr "URL: "
@@ -7686,6 +7627,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Ez a módosításcsomag-lekérdezés URL érvénytelen"
+msgid "Activate"
+msgstr "Aktiválás"
+
+msgid "Activate the selected layer"
+msgstr "A kiválasztott réteg aktiválása"
+
+msgid "Activate layer"
+msgstr "Réteg aktiválása"
+
+msgid "Delete the selected layers."
+msgstr "Kiválasztott rétegek törlése."
+
+msgid "Duplicate this layer"
+msgstr "Réteg megkettőzése"
+
+msgid "Copy of {0}"
+msgstr "{0} Másolata"
+
+msgid "Copy {1} of {0}"
+msgstr "{0} másolata ({1})"
+
+msgid "Change visibility of the selected layer."
+msgstr "A kiválasztott réteg láthatóságának váltása"
+
+msgid "Show layer"
+msgstr "Réteg megjelenítése"
+
+msgid "Adjust opacity of the layer."
+msgstr "A réteg átlátszóságának szabályozása"
+
+msgid "Opacity"
+msgstr "Átlátszóság"
+
+msgid "Adjust gamma value of the layer."
+msgstr "A réteg gamma-értékének igazítása"
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "A réteg élességének/lágyságának szabályozása"
+
+msgid "Sharpness"
+msgstr "Élesség"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "A réteg színtelítettségének szabályozása"
+
+msgid "Colorfulness"
+msgstr "Színtelítettség"
+
+msgid "Merge this layer into another layer"
+msgstr "A réteg egyesítése másik réteggel"
+
+msgid "Move the selected layer one row down."
+msgstr "A kiválasztott réteget eggyel lejjebb mozgatja"
+
+msgid "Move the selected layer one row up."
+msgstr "A kiválasztott réteget eggyel feljebb mozgatja"
+
+msgid "Show/hide"
+msgstr "Mutat/Elrejt"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "A kiválasztott réteg láthatóságának átkapcsolása"
+
+msgid "Show/hide layer"
+msgstr "Réteg elrejtése/mutatása"
+
msgid "Discardable key: selection Foreground"
msgstr "Eldobható kulcs: kiválasztás előtér"
@@ -7766,7 +7776,7 @@ msgid "Edit Tags"
msgstr "Címkék szerkesztése"
msgid "Go to OSM wiki for tag help"
-msgstr ""
+msgstr "Címke dokumentáció az OSM wikiben"
msgid "Launch browser with wiki help for selected object"
msgstr "Böngésző indítása a kijelölt objektum wiki-leírásával"
@@ -7874,7 +7884,7 @@ msgid "Remember last used tags after a restart"
msgstr "Emlékezzen a legutóbb használt cimkékre újraindítás után is"
msgid "Recent tags with existing key"
-msgstr ""
+msgstr "Gyakori címkék meglévő kulccsal"
msgid "Enable"
msgstr "Engedélyez"
@@ -7883,16 +7893,16 @@ msgid "Hide"
msgstr "Rejtett"
msgid "Refresh recent tags list after applying tag"
-msgstr ""
+msgstr "Gyakori címkék listájának frissítése címke hozzáadása után"
msgid "No refresh"
-msgstr ""
+msgstr "Ne frissítse"
msgid "Refresh tag status only (enabled / disabled)"
-msgstr ""
+msgstr "Csak a címke állapot frissítése (engedélyezve / letiltva)"
msgid "Refresh tag status and list of recently added tags"
-msgstr ""
+msgstr "Címke állapot és gyakori címkék listájának frissítése"
msgid "to apply first suggestion"
msgstr "az első javaslat elfogadása"
@@ -7925,13 +7935,13 @@ msgid "The key ''{0}'' is already used"
msgstr "''{0}'' kulcs már használatban van"
msgid "Ignore key ''{0}''"
-msgstr ""
+msgstr "„{0}” kulcs mellőzése"
msgid "Ignore tag ''{0}''"
-msgstr ""
+msgstr "„{0}” címke mellőzése"
msgid "Edit ignore list"
-msgstr ""
+msgstr "Mellőzési lista szerkesztése"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr "Megváltoztattad ''{0}'' adattartalmát ''{1}'' erre: ''{2}''."
@@ -8007,13 +8017,13 @@ msgstr "Szülő-kapcsolatok"
msgid "Child Relations"
msgstr "Gyerek-kapcsolatok"
-msgid "Apply Role:"
-msgstr "Szerep alkalmazása:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
"Adj meg egy szerepet, amit az összes kijelölt tagra alkalmazni szeretnél"
+msgid "Apply Role:"
+msgstr "Szerep alkalmazása:"
+
msgid "New Relation"
msgstr "Új kapcsolat"
@@ -8218,7 +8228,7 @@ msgstr ""
"aktuális rétegnek"
msgid "Relation Editor: Refresh"
-msgstr ""
+msgstr "Kapcsolatszerkesztő: Frissítés"
msgid "Refresh relation from data layer"
msgstr ""
@@ -9090,7 +9100,7 @@ msgid "Authenticate with the supplied username and password"
msgstr "Azonosítása a megadott felhasználónévvel és jelszóval"
msgid "Cancel authentication"
-msgstr "Azonosítás megszakítása"
+msgstr "Hitelesítés megszakítása"
msgid "Downloading file"
msgstr "Fájl letöltése"
@@ -9438,7 +9448,7 @@ msgid "Cancel and return to the previous dialog"
msgstr "Megszakítás és visszatérés az előző ablakhoz"
msgid "Please enter a valid chunk size first"
-msgstr "Előbb ajd meg egy valós tömbméretet"
+msgstr "Előbb adj meg egy valós tömbméretet"
msgid "Illegal chunk size"
msgstr "érvénytelen tömbméret"
@@ -9750,13 +9760,13 @@ msgid "Auto load tiles"
msgstr "Csempék automatikus betöltése"
msgid "Show errors"
-msgstr ""
+msgstr "Hibák jelzése"
msgid "Load all tiles"
-msgstr ""
+msgstr "Összes csempe újratöltése"
msgid "Load all error tiles"
-msgstr ""
+msgstr "Összes hibás csempe újratöltése"
msgid "Zoom to native resolution"
msgstr "Nagyítás eredeti felbontásra"
@@ -9771,7 +9781,7 @@ msgid "Decrease zoom"
msgstr "Nagyítás csökkentése"
msgid "Flush tile cache"
-msgstr ""
+msgstr "Csempe gyorsítótár ürítése"
msgid "Failed to create tile source"
msgstr "Csempeforrás létrehozása nem sikerült"
@@ -9893,9 +9903,6 @@ msgstr "Légifelvétel áttetszősége"
msgid "Unsupported imagery type: {0}"
msgstr "Nem támogatott légifelvétel típus: {0}"
-msgid "ERROR"
-msgstr "HIBA"
-
msgid "Next marker"
msgstr "Következő jelölő"
@@ -10787,12 +10794,6 @@ msgstr "Az automatikus lépések ismételt lefuttatása"
msgid "Test Access Token"
msgstr "Az elérési token kipróbálása"
-msgid "Please enter your OSM user name"
-msgstr "Írd be az OSM felhasználónevedet"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "A név nem lehet üres. Kérjük, írd be az OSM felhasználónevedet"
-
msgid "Please enter your OSM password"
msgstr "Írd be az OSM jelszavadat"
@@ -12303,7 +12304,7 @@ msgid "Map Settings"
msgstr "Térképbeállítások"
msgid "Settings for the map projection and data interpretation."
-msgstr "Térképvetületek és adatéltelmezések beállításai."
+msgstr "Térképvetületek és adatértelmezések beállításai."
msgid "Could not read tagging preset source: {0}"
msgstr "Nem olvasható címkekészlet forrás: {0}"
@@ -12492,7 +12493,7 @@ msgid "Add JOSM Plugin description URL."
msgstr "JOSM Bővítmény leíró URL hozzáadása."
msgid "Enter URL"
-msgstr "URL beirása"
+msgstr "URL beírása"
msgid "Please select an entry."
msgstr "Kérlek válassz egy listaelemet."
@@ -12843,8 +12844,8 @@ msgstr "Egyszerű hitelesítés használata"
msgid ""
"Select to use HTTP basic authentication with your OSM username and password"
msgstr ""
-"Válaszd az OSM felhasználóneved és jelszavad HTTP basic authentication "
-"módszerrel küldéséhez"
+"Válaszd az OSM felhasználóneved és jelszavad „HTTP egyszerű hitelesítésel” "
+"történő küldéséhez"
msgid "Use OAuth"
msgstr "OAuth használata"
@@ -12856,8 +12857,8 @@ msgid ""
"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
"method ''Basic Authentication''."
msgstr ""
-"Nem támogatott érték a(z) ''{0}'' beállításban, kapott: ''{1}''. ''Egyszerű "
-"hitelesítés'' lesz használva."
+"Nem támogatott érték a(z) ''{0}'' beállításban, kapott: ''{1}''. „Egyszerű "
+"hitelesítés” lesz használva."
msgid "OSM username:"
msgstr "OSM felhasználónév:"
@@ -13015,6 +13016,12 @@ msgstr "Kapcsolódás beállításai"
msgid "Connection Settings for the OSM server."
msgstr "OSM szerverhez kapcsolódás beállításai."
+msgid "Please enter your OSM user name"
+msgstr "Írd be az OSM felhasználónevedet"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "A név nem lehet üres. Kérjük, írd be az OSM felhasználónevedet"
+
msgid "Action"
msgstr "Művelet"
@@ -13294,13 +13301,13 @@ msgid "Presets"
msgstr "Címkék"
msgid "Search for objects by preset..."
-msgstr ""
+msgstr "Objektum keresése címke alapján..."
msgid "Search for objects by preset"
msgstr "Objektumok keresése címkekészlet alapján"
msgid "Show only applicable to selection"
-msgstr "Csak az alkalmahatók megjelenítése"
+msgstr "Csak a kijelölésre alkalmazhatók megjelenítése"
msgid "Search in tags"
msgstr "Keresés címkék között"
@@ -13350,7 +13357,7 @@ msgstr ""
"''short_descriptions''-ban és a ''values''-ban"
msgid "This corresponds to the key ''{0}''"
-msgstr ""
+msgstr "A ''{0}'' kulcsot alkalmazza"
msgid "More information about this feature"
msgstr "További információk erről a tulajdonságról"
@@ -13380,7 +13387,7 @@ msgid "Select auto-increment of {0} for this field"
msgstr "Mező értékének automatikus növelése: {0}"
msgid "Cancel auto-increment for this field"
-msgstr "Automaikus növelés törlése a mezőről"
+msgstr "Automatikus növelés törlése a mezőről"
msgid ""
"Adjustable {0} not registered yet. Cannot set participation in synchronized "
@@ -13450,13 +13457,13 @@ msgid "false: the property is explicitly switched off"
msgstr "hamis: a tulajdonság explicite kikapcsolva"
msgid "false: the property ''{0}'' is explicitly switched off"
-msgstr ""
+msgstr "hamis: a ''{0}'' tulajdonság határozottan ki van kapcsolva"
msgid "true: the property is explicitly switched on"
msgstr "igaz: a tulajdonság explicite bekapcsolva"
msgid "true: the property ''{0}'' is explicitly switched on"
-msgstr ""
+msgstr "igaz: a ''{0}'' tulajdonság határozottan be van kapcsolva"
msgid ""
"partial: different selected objects have different values, do not change"
@@ -13475,6 +13482,7 @@ msgstr ""
msgid "unset: do not set the property ''{0}'' on the selected objects"
msgstr ""
+"beállítatlan: ne legyen ''{0}'' tulajdonság beállítva a kijelölt objektumokon"
msgid "Cut"
msgstr "Kivágás"
@@ -13555,7 +13563,7 @@ msgid "Downloading notes"
msgstr "Jegyzetek letöltése"
msgid "Failed to open input stream for resource ''{0}''"
-msgstr "A(z) ''{0}'' erőforrás bejövő adatfolyamánk megnyitása elbukott"
+msgstr "A(z) ''{0}'' erőforrás bemenetének megnyitása nem sikerült"
msgid ""
"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
@@ -13579,6 +13587,14 @@ msgstr ""
"A(z) ''{1}'' elem ''{0}'' jellemzőjének értéke helytelen a szerver "
"képességeihez. ''{2}'' jött"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "A szerver által válaszolt ''{0}'' dátum értelmezése sikertelen."
@@ -14396,7 +14412,7 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
-"A Távirányítóhoz kérés érkezett, hogy töltsön be adatokat az API-ről."
+"A Távirányítóhoz kérés érkezett, hogy töltsön be adatokat az API-ról."
msgid "The latitudes must be between {0} and {1}"
msgstr "A szélességi foknak {0} és {1} között kell lennie"
@@ -14419,7 +14435,7 @@ msgid ""
"the API."
msgstr ""
"A Távirányítóhoz kérés érkezett, hogy töltsön be objektumokat (az "
-"azonosítójuk alapján), az API-ről."
+"azonosítójuk alapján), az API-ról."
msgid "Remote Control has been asked to open a local file."
msgstr "A Távirányítóhoz kérés érkezett, hogy töltsön be egy helyi fájlt."
@@ -14568,7 +14584,7 @@ msgid "Skip layer and continue"
msgstr "Réteg kihagyása és folytatás"
msgid "expected .jos file inside .joz archive"
-msgstr "a .jos fájl elvárt a .joz arhívumon belül"
+msgstr "a .jos fájl elvárt a .joz archívumon belül"
msgid "Skip download"
msgstr "Letöltés kihagyása"
@@ -14966,78 +14982,6 @@ msgstr "meghatározatlan ok"
msgid "Error playing sound"
msgstr "Hiba a hang lejátszása közben"
-msgid "Do nothing"
-msgstr "Nincs művelet"
-
-msgid "Report Bug"
-msgstr "Hiba jelentése"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Nem várt hiba (kivétel) történt.<br>Ez mindig programozási hibát jelent. Ha "
-"a JOSM legfrissebb változatát használod,<br>kérjük jelentsd be a hibát a "
-"weblapunkon."
-
-msgid "Update JOSM"
-msgstr "JOSM frissítés"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Nem várt hiba (kivétel) történt. Ez mindig programozási hibát "
-"jelent.<br><br>Mindazonáltal a JOSM egy régi verzióját futtatod({0}),<br>az "
-"aktuális tesztelt verzió helyett (<b>{1}</b>).<br><br><b>Kérlek, frissítsd a "
-"JOSM-t,</b> mielőtt hibabejelentésben gondolkodnál."
-
-msgid "Unexpected Exception"
-msgstr "Nemvárt kivétel"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "További párbeszédablakok elhagyása ebben a munkamenetben."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Egy hibával találkoztál a JOSM-ban. Kérlek, győződj meg róla, hogy a JOSM "
-"legújabb verzióját használod; mielőtt egy hibajelentést küldenél ide:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"A bővítményeket szintén frissíteni kellene. Ha egyik sem segít ezek közül, "
-"küldj egy hibajelentést a nyilvántartásunkba ezen a linken keresztül:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Az alábbiakban kellene már legyen kitöltött hibainformáció segítségül. "
-"Kérlek, ezt további információkkal bővítsd; hogyan is idézhető elő újra ez a "
-"hiba, próbáld az összes lehetséges részletet beküldeni."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Alternatívaként, ha nem működik, akkor kézzel is be tudod tölteni az "
-"információkat a lenti URL-en:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(A szöveg átmásolása a vágólapra már megtörtént.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Egy hibával találkoztál a JOSM-ban"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15410,9 +15354,6 @@ msgstr "A letöltés átirányításra került a \"{0}\"-hoz"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Túl sok átirányítás lett észlelve a letöltési URL-hez. Megszakítás."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Nem található fordítás a helyi {0} nyelvre. Visszatérés ehhez: {1}."
@@ -15638,6 +15579,82 @@ msgstr "Hibás formátumú geometria figyelmen kívül hagyása: {0}"
msgid "Failed to load XML schema."
msgstr "Nem sikerült betölteni az XML sémát."
+msgid "Do nothing"
+msgstr "Nincs művelet"
+
+msgid "Report Bug"
+msgstr "Hiba jelentése"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Nem várt hiba (kivétel) történt.<br>Ez mindig programozási hibát jelent. Ha "
+"a JOSM legfrissebb változatát használod,<br>kérjük jelentsd be a hibát a "
+"weblapunkon."
+
+msgid "Update JOSM"
+msgstr "JOSM frissítés"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Nem várt hiba (kivétel) történt. Ez mindig programozási hibát "
+"jelent.<br><br>Mindazonáltal a JOSM egy régi verzióját futtatod({0}),<br>az "
+"aktuális tesztelt verzió helyett (<b>{1}</b>).<br><br><b>Kérlek, frissítsd a "
+"JOSM-t,</b> mielőtt hibabejelentésben gondolkodnál."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "További párbeszédablakok elhagyása ebben a munkamenetben."
+
+msgid "Unexpected Exception"
+msgstr "Nemvárt kivétel"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Egy hibával találkoztál a JOSM-ban"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Egy hibával találkoztál a JOSM-ban. Kérlek, győződj meg róla, hogy a JOSM "
+"legújabb verzióját használod; mielőtt egy hibajelentést küldenél ide:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"A bővítményeket szintén frissíteni kellene. Ha egyik sem segít ezek közül, "
+"küldj egy hibajelentést a nyilvántartásunkba ezen a linken keresztül:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Az alábbiakban kellene már legyen kitöltött hibainformáció segítségül. "
+"Kérlek, ezt további információkkal bővítsd; hogyan is idézhető elő újra ez a "
+"hiba, próbáld az összes lehetséges részletet beküldeni."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Alternatívaként, ha nem működik, akkor kézzel is be tudod tölteni az "
+"információkat a lenti URL-en:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(A szöveg átmásolása a vágólapra már megtörtént.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15723,7 +15740,7 @@ msgstr "erdő"
msgctxt "landuse"
msgid "meadow"
-msgstr "rét"
+msgstr "mező"
msgctxt "landuse"
msgid "farmland"
@@ -15783,7 +15800,7 @@ msgstr "útvonal"
msgctxt "Relation type"
msgid "route_master"
-msgstr "Mester útvonal"
+msgstr "tömegközlekedési_hálózat"
msgctxt "Relation type"
msgid "site"
@@ -15985,14 +16002,14 @@ msgstr "Mapbox műholdkép"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Nyílt Légifelvétel"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS Nyomvonalak"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Alapértelmezett réteg)"
+msgid "OpenSeaMap"
+msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap Mapnik (fekete-fehér)"
@@ -16000,8 +16017,14 @@ msgstr "OpenStreetMap Mapnik (fekete-fehér)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, felirat nélkül)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Német stílusú)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS Nyomvonalak"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16012,15 +16035,12 @@ msgstr "Tömegközlekedés (ÖPNV)"
msgid "Hike & Bike"
msgstr "Túra és kerékpár"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Német stílusú)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam kétnyelvű"
-msgid "osmfr"
-msgstr "OSM Fr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT map (fedettség)"
@@ -16117,6 +16137,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at ortofotó"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (alaptérkép)"
@@ -16141,14 +16164,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild 2015 tél (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Domborzati modell)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DGM (Felületi modell)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV (laanderen) légifelvétel (Brüsszel régiót is lefedi)"
@@ -16294,10 +16317,10 @@ msgstr "Géolittoral V2 - Orthofotók 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Gyalogutak"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16352,6 +16375,15 @@ msgstr "Bajorország (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (légifelvétel)"
@@ -16367,18 +16399,6 @@ msgstr "Zwenkau régi térképe - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Pegau régi térképe - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr ""
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr ""
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - rátét Binghez (pl. használj 20% és 50% közti "
-"átlátszóságot)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16424,6 +16444,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16484,6 +16507,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16520,11 +16546,8 @@ msgstr "1.cikla ortofotó - Lettország"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortoforó 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortofotó 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Vasúti"
@@ -16625,6 +16648,9 @@ msgstr "Powiat poznański: Budynki (épületek)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (légifelvétel)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (épületek)"
@@ -16634,6 +16660,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (légifelvétel)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (épületek)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (épületek)"
@@ -17348,6 +17377,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17872,7 +17906,7 @@ msgid "Oneway"
msgstr "Egyirányú"
msgid "Lit"
-msgstr "Közvilágítás"
+msgstr "Kivilágított"
msgid "Width (meters)"
msgstr "Szélesség (méter)"
@@ -18045,37 +18079,37 @@ msgid "chicken"
msgstr "csirke"
msgid "american"
-msgstr ""
+msgstr "amerikai"
msgid "ice_cream"
-msgstr "jégkrém"
+msgstr "fagylalt"
msgid "international"
-msgstr ""
+msgstr "nemzetközi"
msgid "seafood"
-msgstr ""
+msgstr "tenger gyümölcsei"
msgid "spanish"
-msgstr ""
+msgstr "spanyol"
msgid "vietnamese"
-msgstr ""
+msgstr "vietnami"
msgid "fish"
-msgstr ""
+msgstr "hal"
msgid "noodle"
-msgstr ""
+msgstr "tészta"
msgid "barbecue"
msgstr ""
msgid "vegetarian"
-msgstr ""
+msgstr "vegetáriánus"
msgid "korean"
-msgstr ""
+msgstr "koreai"
msgid "Internet access"
msgstr "Internetelérés"
@@ -18090,7 +18124,7 @@ msgid "terminal"
msgstr "terminál"
msgid "Internet access fee"
-msgstr "Internetelérés költsége"
+msgstr "Internetelérés fizetős"
msgid "Smoking"
msgstr "Dohányzás"
@@ -18158,7 +18192,7 @@ msgstr "kosárlabda"
msgctxt "sport"
msgid "beachvolleyball"
-msgstr ""
+msgstr "strandröplabda"
msgctxt "sport"
msgid "billiards"
@@ -18234,11 +18268,11 @@ msgstr "jégkorong"
msgctxt "sport"
msgid "karting"
-msgstr ""
+msgstr "gokart"
msgctxt "sport"
msgid "model_aerodrome"
-msgstr ""
+msgstr "modellrepülőtér"
msgctxt "sport"
msgid "motocross"
@@ -18286,11 +18320,11 @@ msgstr "gördeszka"
msgctxt "sport"
msgid "ice_skating"
-msgstr ""
+msgstr "jégkorcsolya"
msgctxt "sport"
msgid "roller_skating"
-msgstr ""
+msgstr "görkorcsolya"
msgctxt "sport"
msgid "soccer"
@@ -18358,7 +18392,7 @@ msgid "private"
msgstr "privát"
msgid "customers"
-msgstr "vásárlók"
+msgstr "vásárlók részére"
msgid "permissive"
msgstr "engedélyköteles"
@@ -18367,7 +18401,7 @@ msgid "Time Limit (minutes)"
msgstr "Időkorlát (perc)"
msgid "Supervised"
-msgstr "Őrzött"
+msgstr "Őrzött/felügyelt"
msgid "General Access"
msgstr "Általános behajtás"
@@ -18418,10 +18452,10 @@ msgid "mixed"
msgstr "vegyes"
msgid "leafless"
-msgstr "lombtalan (fa)"
+msgstr "lomb nélküli"
msgid "Cycle"
-msgstr "Kör"
+msgstr "Ciklus"
msgid "deciduous"
msgstr "lombhullató"
@@ -18653,19 +18687,19 @@ msgid "Toll"
msgstr "Fizetős"
msgid "Intermittent"
-msgstr ""
+msgstr "Időszakos"
msgid "Seasonal"
-msgstr ""
+msgstr "Évszakfüggő"
msgid "In the tidal range"
-msgstr ""
+msgstr "Árapály zónában van"
msgid "culvert"
msgstr "áteresz"
msgid "Water access rules:"
-msgstr ""
+msgstr "Hajózási tevékenység szabályozása:"
msgid "Ship"
msgstr "Hajó"
@@ -18705,19 +18739,19 @@ msgstr "Tartója"
msgctxt "mounting/support"
msgid "pole"
-msgstr "oszlopos"
+msgstr "oszlop"
msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "Falra szerelt"
+msgstr "falra_szerelt"
msgctxt "mounting/support"
msgid "billboard"
-msgstr "Hirdetőtáblás"
+msgstr "hirdetőtáblán"
msgctxt "mounting/support"
msgid "ground"
-msgstr "Álló"
+msgstr "földön_álló"
msgid "IATA"
msgstr "IATA"
@@ -18784,6 +18818,12 @@ msgstr "Autóutak"
msgid "Motorway"
msgstr "Autópálya"
+msgid "Destination"
+msgstr "Célforgalom"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr "Vonal elhelyezkedése"
@@ -18860,7 +18900,7 @@ msgid "Passing Places"
msgstr "Félreálló hely"
msgid "Residential"
-msgstr "Lakóút / utca"
+msgstr "Lakóút, utca"
msgid "Bicycle Road"
msgstr "Kerékpárút"
@@ -18870,11 +18910,11 @@ msgstr "Közút típusa"
msgctxt "Highway"
msgid "residential"
-msgstr "Lakóterületi"
+msgstr "lakóút"
msgctxt "Highway"
msgid "service"
-msgstr "Szervízút"
+msgstr "szervizút"
msgctxt "Highway"
msgid "unclassified"
@@ -18910,30 +18950,32 @@ msgid "Service way type"
msgstr "Szervíz út típus"
msgid "alley"
-msgstr "átjáró"
+msgstr "sikátor"
msgid "driveway"
-msgstr "kocsibehajtó"
+msgstr "kocsifelhajtó"
msgid "parking_aisle"
msgstr "parkolóút"
msgid "drive-through"
-msgstr "Áthajtó"
+msgstr "áthajtó"
msgid "emergency_access"
-msgstr ""
+msgstr "tűzoltási_felvonulási_terület"
msgid "Parking Aisle"
msgstr "Parkolóút"
msgid "Escape"
-msgstr "Kijárat"
+msgstr "Fékezősáv (\"majomfogó\")"
msgid ""
"Emergency lane beside long descending slopes for trucks and other vehicles "
"to stop safely after brake failure."
msgstr ""
+"Fékezősáv hosszan lejtő utak mellett fékhibás teherautók és egyéb járművek "
+"biztonságos megállítására."
msgid "Raceway"
msgstr "Versenypálya"
@@ -19051,16 +19093,16 @@ msgid "Motor vehicles"
msgstr "Gépjárművek"
msgid "Light Commercial Vehicles (goods)"
-msgstr "Kishaszonjármű (áruszállító)"
+msgstr "Kisteherautó (3,5t-ig)"
msgid "Heavy Goods Vehicles (hgv)"
-msgstr "Nehézgépjármű (hvg)"
+msgstr "Tehergépjármű (3,5t feletti)"
msgid "Vehicles per use"
msgstr "Járművek felhasználás szerint"
msgid "Agricultural"
-msgstr "Mezőgazdasági"
+msgstr "Mezőgazdasági gépek"
msgid "Emergency vehicles"
msgstr "Sürgősségi járművek"
@@ -19069,13 +19111,13 @@ msgid "High-occupancy vehicles (hov)"
msgstr "Nagykihasználtságú jármű (hov)"
msgid "Public Service Vehicles (psv)"
-msgstr "Közszolgáltatási járművek (tömegközl.)"
+msgstr "Közösségi közlekedés"
msgid "Tourist buses"
msgstr "Túrista buszok"
msgid "Max. speed Heavy Goods Vehicles (km/h)"
-msgstr ""
+msgstr "Max. sebesség tehergépjárműveknek (km/h)"
msgid "Min. speed (km/h)"
msgstr "Min. sebesség (km/h)"
@@ -19373,9 +19415,6 @@ msgstr "Autópálya-csomópont"
msgid "Number"
msgstr "Szám"
-msgid "Exit to"
-msgstr "Kijárat errefelé"
-
msgid "Services"
msgstr "Autópálya-pihenő"
@@ -19470,29 +19509,29 @@ msgid "Traffic Calming"
msgstr "Forgalomcsillapító"
msgid "Bump"
-msgstr ""
+msgstr "Fekvőrendőr"
msgid "Chicane"
-msgstr ""
+msgstr "Sávelhúzás (Sikán)"
msgid "Choker"
-msgstr ""
+msgstr "Sávszűkítés"
msgid "Cushion"
-msgstr ""
+msgstr "Lemez-szintemelés"
msgid "Hump"
-msgstr ""
+msgstr "Bukkanó"
msgctxt "traffic_calming"
msgid "Island"
-msgstr ""
+msgstr "Középsziget"
msgid "Rumble strip"
-msgstr ""
+msgstr "Rázóborda"
msgid "Table"
-msgstr ""
+msgstr "Pályaszintemelés"
msgid "Passing Place"
msgstr "Kitérő (útkiszélesedés)"
@@ -19575,7 +19614,7 @@ msgid "plastic"
msgstr "műanyag"
msgid "Cycle Barrier"
-msgstr "Kerékpárakadály"
+msgstr "Kerékpárakadály (labirint korlát)"
msgid "Cattle Grid"
msgstr "Marharács"
@@ -19599,10 +19638,10 @@ msgid "Genus"
msgstr "Nemzetség"
msgid "Species"
-msgstr "Fajok"
+msgstr "Faj (-ok)"
msgid "Taxon"
-msgstr "Életközösség"
+msgstr "Taxon"
msgid "Fence"
msgstr "Kerítés"
@@ -19632,7 +19671,7 @@ msgid "Wall"
msgstr "Fal"
msgid "dry_stone"
-msgstr ""
+msgstr "szárazon rakott kőfal"
msgid "noise_barrier"
msgstr "zajvédőfal"
@@ -19644,7 +19683,7 @@ msgid "Retaining Wall"
msgstr "Támfal"
msgid "Jersey Barrier"
-msgstr ""
+msgstr "Jersey terelőfal (T fal)"
msgctxt "Barrier"
msgid "Ditch"
@@ -19663,7 +19702,7 @@ msgid "Lift Gate"
msgstr "Sorompó"
msgid "Swing Gate"
-msgstr "Kétszárnyú kapu"
+msgstr "Oldalra nyíló sorompó"
msgctxt "swing_gate"
msgid "single"
@@ -19680,19 +19719,19 @@ msgid "Bump Gate"
msgstr "Lökőkapu"
msgid "Kissing Gate"
-msgstr "U vagy V kapu (Kissing gate)"
+msgstr "U vagy V \"zsilip\" kapu (Kissing gate)"
msgid "Chain"
msgstr "Lánc"
msgid "Stile"
-msgstr "Létra"
+msgstr "Kerítés átkelési lehetőség"
msgid "ladder"
msgstr "létra"
msgid "squeezer"
-msgstr "átjáró rés"
+msgstr "szűk rés"
msgid "stepover"
msgstr "átlépő"
@@ -19713,16 +19752,16 @@ msgid "Arcade"
msgstr "Árkádsor"
msgid "Open on left side"
-msgstr "Megnyitás bal oldalon"
+msgstr "Bal oldalon nyitott"
msgid "Open on right side"
-msgstr "Megnyitás jobb oldalon"
+msgstr "Jobb oldalon nyitott"
msgid "Colonnade"
msgstr "Oszlopsor"
msgid "Avalanche Protector"
-msgstr "Lavina védelem"
+msgstr "Lavina-védelmi alagút"
msgctxt "main group"
msgid "Water"
@@ -19736,7 +19775,7 @@ msgid "Drain"
msgstr "Ér"
msgid "Ditch"
-msgstr "Árok / csermely"
+msgstr "Árok, csermely"
msgid "Stream"
msgstr "Patak"
@@ -19808,7 +19847,7 @@ msgid "pond"
msgstr "tavacska"
msgid "reservoir"
-msgstr "Víztározó"
+msgstr "víztározó"
msgid "river"
msgstr "folyó"
@@ -19817,7 +19856,7 @@ msgid "Salt Water"
msgstr "Sós víz"
msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "A víztömeg jelenléte időszakos (szezonálisan eltűnik)?"
+msgstr "A víztömeg jelenléte időszakos (szezonálisan eltűnik)?"
msgid "Coastline"
msgstr "Partvonal"
@@ -19852,11 +19891,20 @@ msgid "saltmarsh"
msgstr "sós mocsár"
msgid "tidalflat"
-msgstr "Árapálysíkság"
+msgstr "árapálysíkság"
msgid "mangrove"
msgstr "mangrove mocsár"
+msgid "wet_meadow"
+msgstr "Nedves_mező"
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr "sótelep"
+
msgid "Mud"
msgstr "Sár"
@@ -19873,7 +19921,7 @@ msgid "swimming"
msgstr "úszás"
msgid "surfing"
-msgstr "Szörfözés"
+msgstr "szörfözés"
msgid "Bay"
msgstr "Öböl"
@@ -19881,8 +19929,7 @@ msgstr "Öböl"
msgid ""
"A large body of water partially enclosed by land but with a wide mouth."
msgstr ""
-"Nagyobb víztömeg részben szárazfölddel körbefogva, de még nagy nyitottsággal "
-"a nyílt víz felé is."
+"Szárazfölddel körülvett nagyobb víztömeg, széles kijárattal a nyílt víz felé."
msgid "Shipping"
msgstr "Hajózás"
@@ -19899,16 +19946,15 @@ msgstr "utasok"
msgctxt "cargo"
msgid "vehicle"
-msgstr "jármű"
+msgstr "járművek"
msgctxt "cargo"
msgid "bicycle"
msgstr "kerékpár"
-# (HVG) - Heavy Goods Vehicle
msgctxt "cargo"
msgid "hgv"
-msgstr "Nehézjármű"
+msgstr "tehergépjármű (3,5t feletti)"
msgctxt "cargo"
msgid "passengers;vehicle"
@@ -20005,7 +20051,7 @@ msgid "Fuel types:"
msgstr "Üzemanyagtípusok:"
msgid "Diesel"
-msgstr "Dízel"
+msgstr "Gázolaj"
msgid "Bio Diesel"
msgstr "Biodízel"
@@ -20101,7 +20147,7 @@ msgid "Monorail"
msgstr "Egysínű vasúti pálya"
msgid "Preserved"
-msgstr "Megőrzött / nosztalgia"
+msgstr "Megőrzött (nosztalgia)"
msgid "Light Rail"
msgstr "Könnyűvasút"
@@ -20178,7 +20224,7 @@ msgid "Cable Car"
msgstr "Nagykabinos"
msgid "Number of people per hour"
-msgstr "utas/óra"
+msgstr "Utasok száma óránként"
msgid "Number of people per car"
msgstr "férőhely kabinonként"
@@ -20234,14 +20280,14 @@ msgid "Magic Carpet"
msgstr "Szállítószalag"
msgid "Goods"
-msgstr "Áruk"
+msgstr "Áruszállító"
msgctxt "aerialway"
msgid "Station"
msgstr "Felvonóállomás"
msgid "Pylon"
-msgstr "Villanyoszlop"
+msgstr "Tartóoszlop"
msgid "Parking"
msgstr "Parkoló"
@@ -20259,7 +20305,7 @@ msgid "tram"
msgstr "villamos"
msgid "metro"
-msgstr "Földalatti/metró"
+msgstr "földalatti/metró"
msgid "ferry"
msgstr "komp"
@@ -20304,10 +20350,10 @@ msgid "kiosk"
msgstr "kioszk"
msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr "Dízel (szintetikus GTL)"
+msgstr "Gázolaj (szintetikus GTL)"
msgid "Diesel for Heavy Good Vehicles"
-msgstr "Dízel tehergépjárművek számára"
+msgstr "Gázolaj tehergépjárművek számára"
msgid "1/25 mix (mofa/moped)"
msgstr "1:25 keverék (moped)"
@@ -20394,7 +20440,7 @@ msgid "TÜV"
msgstr "TÜV"
msgid "Clothes"
-msgstr "Ruhák"
+msgstr "Ruházat"
msgid "anchors"
msgstr "horgony"
@@ -20457,7 +20503,7 @@ msgid "Public Transport"
msgstr "Tömegközlekedés"
msgid "Public Transport Route (Rail)"
-msgstr ""
+msgstr "Tömegközlekedési útvonal (Kötöttpályás)"
msgid "Route type"
msgstr "Útvonal típusa"
@@ -20484,22 +20530,22 @@ msgid "platform"
msgstr "peron"
msgid "platform (exit only)"
-msgstr "peron (csak kijárat)"
+msgstr "peron (csak leszálló)"
msgid "platform (entry only)"
-msgstr "peron (csak bejárat)"
+msgstr "peron (csak felszálló)"
msgid "route segment"
msgstr "útszakasz"
msgid "Public Transport Route (Bus)"
-msgstr ""
+msgstr "Tömegközlekedési útvonal (Busz)"
msgid "trolleybus"
msgstr "trolibusz"
msgid "Route Master"
-msgstr "Mester útvonal"
+msgstr "Tömegközlekedési útvonalhálózat"
msgid "aerialway"
msgstr "drótkötélpálya"
@@ -20789,7 +20835,7 @@ msgid "Cafe"
msgstr "Kávézó"
msgid "Ice cream"
-msgstr ""
+msgstr "Fagylaltozó"
msgid "Pub"
msgstr "Kocsma"
@@ -20883,7 +20929,7 @@ msgid "Board Content"
msgstr "Tábla tartalma"
msgid "notice"
-msgstr "hidető"
+msgstr "hirdetőtábla"
msgid "history"
msgstr "történelem"
@@ -20964,19 +21010,19 @@ msgid "wall"
msgstr "fal"
msgid "Amusement/Theme Park"
-msgstr "Szórakozás/Vidámpark"
+msgstr "Vidámpark"
msgid "Water Park"
msgstr "Akvapark"
msgid "Swimming Pool"
-msgstr ""
+msgstr "Úszómedence"
msgid "Used for the water area only."
-msgstr ""
+msgstr "Csak a medence jelölésére használatos."
msgid "Fitness Station"
-msgstr ""
+msgstr "Szabadtéri tornapálya"
msgid "Sauna"
msgstr "Szauna"
@@ -21012,6 +21058,9 @@ msgstr "Tűzrakóhely"
msgid "Fishing"
msgstr "Horgászat"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Éjszakai klub"
@@ -21084,7 +21133,7 @@ msgid "basilica"
msgstr "bazilika"
msgid "cathedral"
-msgstr "katedrális"
+msgstr "katedrális (székesegyház)"
msgid "chapel"
msgstr "kápolna"
@@ -21093,7 +21142,7 @@ msgid "church"
msgstr "templom"
msgid "temple"
-msgstr "Istenháza (templom)"
+msgstr "istenháza (főtemplom)"
msgctxt "christian"
msgid "anglican"
@@ -21173,7 +21222,7 @@ msgstr "hetednapi adventista"
msgctxt "christian"
msgid "spiritist"
-msgstr ""
+msgstr "spiritiszta"
msgid "Mosque"
msgstr "Mecset"
@@ -21293,7 +21342,7 @@ msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
msgid "Health"
-msgstr "Egészség"
+msgstr "Egészségügy"
msgid "Hospital"
msgstr "Kórház"
@@ -21335,10 +21384,10 @@ msgid "Veterinary"
msgstr "Állatorvos"
msgid "Emergency"
-msgstr ""
+msgstr "Vészhelyzeti szolgáltatás"
msgid "Ambulance Station"
-msgstr ""
+msgstr "Mentőállomás"
msgid "Automated Defibrillator"
msgstr "Automata defibrillátor"
@@ -21353,13 +21402,13 @@ msgid "Last check note"
msgstr "Utolsó vizsgálati jegyzet"
msgid "Fire Extinguisher"
-msgstr ""
+msgstr "Tűzoltó készülék"
msgid "Indoor"
msgstr "Beltéri"
msgid "Fire Hose"
-msgstr ""
+msgstr "Tűzoltó tömlő"
msgid "Fire Hydrant"
msgstr "Tűzcsap"
@@ -21412,43 +21461,43 @@ msgid "Count"
msgstr "Darabszám"
msgid "Water Tank"
-msgstr ""
+msgstr "Tűzivíz tartály"
msgid "Volume (in liters)"
-msgstr ""
+msgstr "Térfogat (literben)"
msgid "Assembly Point"
-msgstr ""
+msgstr "Gyülekezőhely"
msgid "Emergency Phone"
msgstr "Segélykérő telefon"
msgid "Siren"
-msgstr ""
+msgstr "Sziréna"
msgid "pneumatic"
-msgstr ""
+msgstr "sűrített_levegős"
msgid "electronic"
-msgstr ""
+msgstr "elektromos"
msgid "mechanical"
-msgstr ""
+msgstr "mechanikus"
msgid "Purpose"
-msgstr ""
+msgstr "Funkció"
msgid "tornado"
-msgstr ""
+msgstr "tornádójelző"
msgid "fire"
-msgstr ""
+msgstr "tűzjelző"
msgid "air_raid"
-msgstr ""
+msgstr "légvédelmi"
msgid "civil_defense"
-msgstr ""
+msgstr "lakosságvédelmi"
msgid "Range (in meters)"
msgstr ""
@@ -21483,7 +21532,7 @@ msgstr "Mosdók/WC"
msgctxt "restroom"
msgid "Female"
-msgstr "Nő"
+msgstr "Női"
msgctxt "restroom"
msgid "Male"
@@ -21547,7 +21596,7 @@ msgstr "fali"
msgctxt "post_box"
msgid "meter"
-msgstr ""
+msgstr "postakész"
msgid "Drive through"
msgstr "Áthajtó (autós)"
@@ -21556,11 +21605,11 @@ msgid "Telephone"
msgstr "Telefon"
msgid "Coins"
-msgstr "Érmék"
+msgstr "Érme"
msgctxt "payment"
msgid "Notes"
-msgstr "Jegyzetek"
+msgstr "Bankjegy"
msgid "Telephone cards"
msgstr "Telefonkártya"
@@ -21584,19 +21633,19 @@ msgid "sundial"
msgstr "napóra"
msgid "unorthodox"
-msgstr "liberális szellemű"
+msgstr "egyedi"
msgid "Visibility/readability"
msgstr "Láthatóság/olvashatóság"
msgid "house (up to 5m)"
-msgstr "ház (5 méterig)"
+msgstr "ház mellől (5 méterről)"
msgid "street (up to 20m)"
-msgstr "utca (20 méterig)"
+msgstr "utcáról (20 méterről)"
msgid "area (more than 20m)"
-msgstr "távol (20 méteren túl)"
+msgstr "távolról (20 méteren túlról)"
msgid "Shows current date"
msgstr "Kijelzi a dátumot"
@@ -21614,7 +21663,7 @@ msgid "Recycling Container"
msgstr "Szelektív hulladékgyűjtő konténer"
msgid "Batteries"
-msgstr "Akkumulátorok"
+msgstr "Akkumulátor"
msgid "Cans"
msgstr "Konzerv"
@@ -21623,16 +21672,16 @@ msgid "Cardboard"
msgstr "Karton"
msgid "Electrical Appliances"
-msgstr ""
+msgstr "Elektronikai hulladék"
msgid "Glass"
msgstr "Üveg"
msgid "Glass Bottles"
-msgstr ""
+msgstr "Üveg göngyöleg"
msgid "Green Waste"
-msgstr ""
+msgstr "Zöldhulladék"
msgid "Paper"
msgstr "Papír"
@@ -21641,22 +21690,22 @@ msgid "Plastic"
msgstr "Műanyag"
msgid "Plastic Bottles"
-msgstr ""
+msgstr "Műanyag flakon"
msgid "Plastic Packaging"
-msgstr ""
+msgstr "Műanyag csomagolóanyag"
msgid "Scrap Metal"
msgstr "Fémhulladék"
msgid "Shoes"
-msgstr "Cipőbolt"
+msgstr "Cipő"
msgid "Small Appliances"
-msgstr ""
+msgstr "Háztartási kisgép"
msgid "Waste"
-msgstr ""
+msgstr "Kommunális hulladék"
msgid "Recycling Centre"
msgstr "Hulladékhasznosító központ"
@@ -21668,13 +21717,13 @@ msgid "Sanitary Dump Station"
msgstr "Szennyvízleeresztő állomás"
msgid "Suction pumpout"
-msgstr ""
+msgstr "Vákuumszivattyús ürítés"
msgid "Gravity drain for hose"
-msgstr ""
+msgstr "Csőcsatlakozás gravitációs ürítéshez"
msgid "Casette or Elsan Disposal"
-msgstr ""
+msgstr "Lefolyó vagy Elsan Point (UK)"
msgid "Operation times"
msgstr "Üzemidő"
@@ -21732,19 +21781,19 @@ msgstr "teljes"
msgctxt "hunting stand"
msgid "Hide"
-msgstr ""
+msgstr "Rejtek"
msgid "Lock"
msgstr "Zárható"
msgid "Water Point"
-msgstr ""
+msgstr "Vízcsap"
msgid "Compressed Air"
msgstr "Sűrített levegő/kerékfújó"
msgid "Valves"
-msgstr ""
+msgstr "Szelep típusa"
msgid "Dunlop (Woods)"
msgstr ""
@@ -21765,7 +21814,7 @@ msgid "Billboard"
msgstr "Hírdetőtábla"
msgid "Sports"
-msgstr "Sportok"
+msgstr "Sportszer"
msgid "Sport Facilities"
msgstr "Sportlétesítmények"
@@ -21799,25 +21848,25 @@ msgstr "Golfpálya"
msgctxt "golf"
msgid "Tee"
-msgstr ""
+msgstr "Elütőhely (Tee)"
msgctxt "golf"
msgid "Hole"
-msgstr ""
+msgstr "Lyuk (szakasz)"
msgid "Par"
msgstr ""
msgid "Handicap rating"
-msgstr ""
+msgstr "Handicap érték"
msgctxt "golf"
msgid "Pin"
-msgstr ""
+msgstr "Lyuk (zászló) helye"
msgctxt "golf"
msgid "Bunker"
-msgstr ""
+msgstr "Homokcsapda"
msgctxt "golf"
msgid "Natural"
@@ -21825,27 +21874,27 @@ msgstr ""
msgctxt "golf"
msgid "Frontal Water hazard"
-msgstr ""
+msgstr "Vízakadály (sárga karó)"
msgctxt "golf"
msgid "Lateral water hazard"
-msgstr ""
+msgstr "Oldalsó vízakadály (piros karó)"
msgctxt "golf"
msgid "Green"
-msgstr ""
+msgstr "Green"
msgctxt "golf"
msgid "Fairway"
-msgstr ""
+msgstr "Fairway"
msgctxt "golf"
msgid "Rough"
-msgstr ""
+msgstr "Rough"
msgctxt "golf"
msgid "Driving range"
-msgstr ""
+msgstr "Gyakorlópálya"
msgid "Miniature Golf"
msgstr "Minigolf"
@@ -21919,13 +21968,13 @@ msgid "Gymnastics"
msgstr "Torna"
msgid "Ice Skating"
-msgstr ""
+msgstr "Jégkorcsolya"
msgid "ice_rink"
msgstr "jégpálya"
msgid "Roller Skating"
-msgstr ""
+msgstr "Görkorcsolya"
msgid "Skateboard"
msgstr "Gördeszka"
@@ -22070,7 +22119,7 @@ msgid "Volleyball"
msgstr "Röplabda"
msgid "Beach Volleyball"
-msgstr "Strand röplabda"
+msgstr "Strandröplabda"
msgid "Billiards"
msgstr "Biliárd"
@@ -22164,11 +22213,11 @@ msgstr "kereskedelmi"
msgctxt "building"
msgid "service"
-msgstr ""
+msgstr "gépház"
msgctxt "building"
msgid "train_station"
-msgstr ""
+msgstr "vasútállomás"
msgctxt "building"
msgid "barn"
@@ -22176,15 +22225,15 @@ msgstr "csűr"
msgctxt "building"
msgid "stable"
-msgstr ""
+msgstr "istálló"
msgctxt "building"
msgid "cabin"
-msgstr ""
+msgstr "kunyhó"
msgctxt "building"
msgid "farm_auxiliary"
-msgstr ""
+msgstr "gazdasági_épület"
msgctxt "building"
msgid "transportation"
@@ -22208,11 +22257,11 @@ msgstr "kórház"
msgctxt "building"
msgid "kindergarten"
-msgstr ""
+msgstr "óvoda"
msgctxt "building"
msgid "manufacture"
-msgstr ""
+msgstr "gyárépület"
msgctxt "building"
msgid "warehouse"
@@ -22228,19 +22277,19 @@ msgstr "pajta/gépszín"
msgctxt "building"
msgid "storage_tank"
-msgstr ""
+msgstr "Tárolótartály"
msgctxt "building"
msgid "supermarket"
-msgstr ""
+msgstr "szupermarket"
msgctxt "building"
msgid "gasometer"
-msgstr ""
+msgstr "gáztározó"
msgctxt "building"
msgid "silo"
-msgstr ""
+msgstr "siló"
msgctxt "building"
msgid "cowshed"
@@ -22252,34 +22301,38 @@ msgstr "építkezés"
msgctxt "building"
msgid "basilica"
-msgstr ""
+msgstr "bazilika"
msgctxt "building"
msgid "cathedral"
-msgstr ""
+msgstr "katedrális (székesegyház)"
msgctxt "building"
msgid "chapel"
-msgstr ""
+msgstr "kápolna"
msgctxt "building"
msgid "church"
-msgstr ""
+msgstr "templom"
msgctxt "building"
msgid "temple"
-msgstr ""
+msgstr "istenháza (főtemplom)"
msgctxt "building"
msgid "mosque"
-msgstr ""
+msgstr "mecset"
msgctxt "building"
msgid "synagogue"
-msgstr ""
+msgstr "zsinagóga"
msgctxt "building"
msgid "transformer_tower"
+msgstr "trafótorony"
+
+msgctxt "building"
+msgid "public"
msgstr ""
msgctxt "building"
@@ -22396,7 +22449,7 @@ msgid "Gasometer"
msgstr "Gáztározó"
msgid "Silo"
-msgstr ""
+msgstr "Siló"
msgid "Storage Tank"
msgstr "Tárolótartály"
@@ -23036,7 +23089,7 @@ msgid "pelton_turbine"
msgstr "Pelton-turbina"
msgid "Tidal Water Turbine"
-msgstr "Ár-apály (Tidal) vízturbina"
+msgstr "Árapály (Tidal) vízturbina"
msgctxt "generator method"
msgid "barrage"
@@ -23259,7 +23312,7 @@ msgid "Power Street Cabinet"
msgstr "Elosztószekrény"
msgid "Transformer Tower"
-msgstr ""
+msgstr "Trafótorony"
msgid "Power Portal"
msgstr ""
@@ -23373,7 +23426,7 @@ msgstr "henger"
msgctxt "power"
msgid "asymmetric"
-msgstr "asszimetrikus"
+msgstr "asszimmetrikus"
msgctxt "power"
msgid "triangle"
@@ -23588,7 +23641,7 @@ msgid "Shops"
msgstr "Boltok"
msgid "Food"
-msgstr "Étel"
+msgstr "Élelmiszer"
msgid "Supermarket"
msgstr "Szupermarket"
@@ -23669,7 +23722,7 @@ msgid "Electronic"
msgstr "Elektronika"
msgid "Computer"
-msgstr "Számítógép bolt"
+msgstr "Számítástechnikai bolt"
msgid "Electronics"
msgstr "Elektronikai bolt"
@@ -23693,7 +23746,7 @@ msgid "Music"
msgstr "Zene"
msgid "Cash"
-msgstr "Pénzügy"
+msgstr "Fizetési lehetőség"
msgid "Bank"
msgstr "Bank"
@@ -23762,22 +23815,22 @@ msgid "Chemist"
msgstr "Drogéria"
msgid "Cosmetics"
-msgstr ""
+msgstr "Kozmetikum"
msgid "Perfumery"
-msgstr ""
+msgstr "Illatszer"
msgid "Beauty"
msgstr "Szépségszalon"
msgid "Tobacco"
-msgstr ""
+msgstr "Dohányáru"
msgid "Hairdresser/Barber"
msgstr "Fodrász/Borbély"
msgid "Tattoo"
-msgstr "Tetoválás"
+msgstr "Tetoválószalon"
msgid "Optician"
msgstr "Optikus"
@@ -23786,7 +23839,7 @@ msgid "Hearing Aids"
msgstr "Hallókészülék"
msgid "Medical Supply"
-msgstr "Egészségügyi ellátás"
+msgstr "Egészségügyi segédeszközök"
msgid "Jewellery"
msgstr "Ékszerész"
@@ -23875,8 +23928,8 @@ msgstr "ürülékgyűjtő zacskó"
msgid "food"
msgstr "étel"
-msgid "news_papers"
-msgstr "újság"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parkolójegy"
@@ -23890,8 +23943,8 @@ msgstr "tömegközlekedési térkép"
msgid "public_transport_tickets"
msgstr "tömgeközlekedési jegy"
-msgid "SIM-cards"
-msgstr "SIM kártya"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "bélyeg"
@@ -23918,7 +23971,7 @@ msgid "Debit cards"
msgstr "Bankkártya"
msgid "BankAxess"
-msgstr "Bank hozzáféré"
+msgstr "BankAxess"
msgid "Bancomat"
msgstr "Bankomat"
@@ -23927,16 +23980,16 @@ msgid "Girocard"
msgstr "Bankkártya"
msgid "Laser"
-msgstr ""
+msgstr "Laser"
msgid "Maestro"
msgstr "Maestro"
msgid "Visa Debit"
-msgstr ""
+msgstr "Visa Debit"
msgid "Visa Electron"
-msgstr ""
+msgstr "Visa Electron"
msgid "Credit cards"
msgstr "Hitelkártya"
@@ -23948,10 +24001,10 @@ msgid "Diners Club"
msgstr "Diners Club"
msgid "Discover Card"
-msgstr ""
+msgstr "Discover kártya"
msgid "JCB"
-msgstr ""
+msgstr "JCB"
msgid "Mastercard"
msgstr "Mastercard"
@@ -23963,7 +24016,7 @@ msgid "Electronic purses and Charge cards"
msgstr "Elektronikus vásárlás és feltöltőkártya"
msgid "Avant (fi)"
-msgstr ""
+msgstr "Avant (fi)"
msgid "Cash (ch)"
msgstr "Cash (ch)"
@@ -23999,7 +24052,7 @@ msgid "Quick (au)"
msgstr "Quick (au)"
msgid "Cryptocurrencies"
-msgstr ""
+msgstr "Elektronikus pénztárca"
msgid "Bitcoin"
msgstr "Bitcoin"
@@ -24023,7 +24076,7 @@ msgstr "Közigazgatás"
msgctxt "office"
msgid "Advertising agency"
-msgstr ""
+msgstr "Reklámügynökség"
msgctxt "office"
msgid "Architect"
@@ -24031,7 +24084,7 @@ msgstr "Építész"
msgctxt "office"
msgid "Association"
-msgstr ""
+msgstr "Egyesület"
msgctxt "office"
msgid "Private company"
@@ -24079,7 +24132,7 @@ msgstr "Civil szervezet"
msgctxt "office"
msgid "Notary"
-msgstr ""
+msgstr "Jegyzői iroda"
msgctxt "office"
msgid "Political party"
@@ -24102,79 +24155,79 @@ msgid "Telecommunication"
msgstr "Telekommunikáció"
msgid "Craft"
-msgstr ""
+msgstr "Szakmák"
msgid "Carpenter"
-msgstr ""
+msgstr "Ács, asztalos"
msgid "Shoemaker"
-msgstr ""
+msgstr "Cipész, suszter"
msgid "Photographer"
-msgstr ""
+msgstr "Fényképész"
msgid "Metal construction"
-msgstr ""
+msgstr "Fém megmunkálás"
msgid "Electrician"
-msgstr ""
+msgstr "Villanyszerelő, műszerész"
msgid "Brewery"
-msgstr ""
+msgstr "Sörfőzde"
msgid "Plumber"
-msgstr ""
+msgstr "Vízvezeték-szerelő"
msgid "Sawmill"
-msgstr ""
+msgstr "Fűrészmalom"
msgid "Gardener"
-msgstr ""
+msgstr "Kertész"
msgid "Winery"
-msgstr ""
+msgstr "Borászat"
msgid "Hvac"
-msgstr ""
+msgstr "Épületgépészet"
msgid "Painter"
-msgstr ""
+msgstr "Szobafestő-mázoló"
msgid "Stonemason"
-msgstr ""
+msgstr "Kőfaragó"
msgid "Handicraft"
-msgstr ""
+msgstr "Kézműves"
msgid "Pottery"
-msgstr ""
+msgstr "Fazekas"
msgid "Key cutter"
-msgstr ""
+msgstr "Kulcsmásoló"
msgid "Caterer"
-msgstr ""
+msgstr "Rendezvényszervező"
msgid "Roofer"
-msgstr ""
+msgstr "Tetőfedő"
msgid "Beekeeper"
-msgstr ""
+msgstr "Méhészet"
msgid "Blacksmith"
-msgstr ""
+msgstr "Kovácsműhely"
msgid "Locksmith"
-msgstr ""
+msgstr "Zárlakatos"
msgid "Window construction"
-msgstr ""
+msgstr "Nyílászáró gyártás"
msgid "Upholsterer"
-msgstr ""
+msgstr "Kárpitos"
msgid "Tiler"
-msgstr ""
+msgstr "Hidegburkoló"
msgid "Geography"
msgstr "Földrajz"
@@ -25162,6 +25215,21 @@ msgstr "természet"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Sí útvonal"
@@ -25186,9 +25254,6 @@ msgstr "hegyi"
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr "Célforgalom"
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -25232,7 +25297,7 @@ msgid "anything related to the street"
msgstr "az utcához tartozó egyéb dolgok"
msgid "Destination Sign"
-msgstr "Úti cél Jelzés"
+msgstr "Útirányjelző tábla"
msgid "Destination written on sign (w/o distance)"
msgstr "A táblán jelzett célpont (táv nélkül)"
@@ -25348,8 +25413,14 @@ msgstr "Kemping"
msgid "Test"
msgstr "Próba"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Házszám csökkentése a lakcím interpolációban"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} {1} nélkül"
@@ -25438,6 +25509,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "A(z) {0} kivezetésre került. Kérlek, használj inkább multipoligont."
@@ -25543,6 +25619,9 @@ msgstr "{0} muszáj egy vonalhoz kapcsolódjon"
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -25552,6 +25631,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "rövidített utca név"
@@ -28715,6 +28802,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -30664,27 +30811,28 @@ msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid "A calibration file associated to the picture file was found: {0}\n"
-msgstr ""
+msgstr "A képfájlhoz kalibrációs fájl tartozik: {0}\n"
msgid ""
"Set \"{0}\" to yes/no/ask in the preferences\n"
"to control the autoloading of calibration files."
msgstr ""
-"Állíts be a \"{0}\"-hez az igen/nem/kérdezz értékből a beállításoknál\n"
-", hogy vezérelhesd a kalibrációs fájlok automata betöltését."
+"A kalibrációs fájlok automata betöltésének vezérléséhez a beállításokban\n"
+"a \"{0}\" beállítást állítsd a yes/no/ask értékek valamelyikére."
msgid "Do you want to apply it ?"
-msgstr "Alkalmazmi akarod ezt?"
+msgstr "Szeretnéd a kalibrációt betölteni?"
msgid "Load calibration file?"
-msgstr ""
+msgstr "Betöltöd a kalibrációs fájlt?"
msgid "It will be applied automatically."
-msgstr ""
+msgstr "A kalibráció automatikusan be fog töltődni"
msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+"Mostantól a kalibrációs fájlok mindig automatikusan fognak betöltődni."
msgid "Point info"
msgstr ""
@@ -31058,6 +31206,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -31855,9 +32012,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -32596,7 +32750,7 @@ msgid "Public service vehicles like buses, tramways, etc."
msgstr "Közösségi közlekedési járművek (PSV), mint buszok, villamosok, stb."
msgid "Heavy Goods Vehicles"
-msgstr "Tehergépjármű"
+msgstr "Tehergépjármű (3,5t feletti)"
msgid "Motorcars"
msgstr "Gépkocsi"
@@ -32715,10 +32869,10 @@ msgid "Display and edit list of via-objects in the Basic Editor"
msgstr "Via-objektumok megjelenítése az Alap Szerkesztőben"
msgid "Road signs - Set A"
-msgstr "Jelzőtáblák - ''A'' készlet"
+msgstr "Jelzőtáblák - „A” készlet"
msgid "Road signs - Set B"
-msgstr "Jelzőtáblák - ''B'' készlet"
+msgstr "Jelzőtáblák - „B” készlet"
msgid "Please select the set of road sign icons to be used in the plugin."
msgstr ""
@@ -33750,17 +33904,3 @@ msgstr "Vezetés"
msgid "Drive a race car on this layer"
msgstr "Autóverseny ezen a rétegen"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Szabálytalan dash minta, az érték pozitív kell legyen"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Szabálytalan dash minta, legalább egy érték > 0 kell legyen"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Nem sikerült értelmezni a térképstílusokat itt: \"{0}\". Hiba: [{1}:{2}] {3}"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 9034fd4..ce08124 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:33+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:33+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: hy\n"
msgid "Cancel"
@@ -151,9 +151,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -175,6 +172,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,6 +4769,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Ինտերֆեյսի ստեղծում"
+
msgid "Updating plugins"
msgstr ""
@@ -4781,12 +4784,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Ինտերֆեյսի ստեղծում"
-
msgid "Loading plugins"
msgstr ""
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index f4b005d..e3ba6d3 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:49+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:48+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr "Pagina principal"
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr "Circa JOSM..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/id.po b/i18n/po/id.po
index 00d594c..bd7429a 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:49+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:48+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -152,9 +152,6 @@ msgstr "Versi Java {0}"
msgid "Homepage"
msgstr "Halaman Depan"
-msgid "Bug Reports"
-msgstr "Laporan Kesalahan"
-
msgid "Info"
msgstr "Informasi"
@@ -176,6 +173,12 @@ msgstr "Plugins"
msgid "About JOSM..."
msgstr "Tentang JOSM"
+msgid "OK"
+msgstr "Ok"
+
+msgid "Report bug"
+msgstr "Melaporkan bug"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -596,9 +599,6 @@ msgstr "Atur posisi pada layer citra ini"
msgid "Adjust imagery offset"
msgstr "Atur offset citra"
-msgid "OK"
-msgstr "Ok"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1249,9 +1249,6 @@ msgstr "Beri nama ulang berkasnya pula"
msgid "Could not rename file ''{0}''"
msgstr "Tidak dapat mengubah nama berkas \"{0}\""
-msgid "Report bug"
-msgstr "Melaporkan bug"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1901,6 +1898,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Maju perlahan"
+msgid "Downloading changeset content"
+msgstr "download isi set perubahan"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) mendownload set perubahan {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) mendownload isi untuk set perubahan {2}..."
+
+msgid "Download changesets"
+msgstr "download set perubahan"
+
+msgid "Querying and downloading changesets"
+msgstr "query dan download set perubahan"
+
+msgid "Determine user id for current user..."
+msgstr "Menentukan user id untuk pengguna saat ini..."
+
+msgid "Query and download changesets ..."
+msgstr "query dan download set perubahan ..."
+
+msgid "Errors during download"
+msgstr "Gangguan saat mendownload"
+
msgid "Download GPS"
msgstr "Download GPS"
@@ -2053,9 +2074,6 @@ msgstr "Objek yang telah dihapus atau dipindahkan"
msgid "The following errors occurred during mass download: {0}"
msgstr "Kesalahan berikut terjadi pada saat download masal: {0}"
-msgid "Errors during download"
-msgstr "Gangguan saat mendownload"
-
msgid "Error during download"
msgstr "Kesalahan pada saat download"
@@ -2399,8 +2417,8 @@ msgid "Add selection to relation"
msgstr "Tambahkan seleksi pada relasi"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3214,9 +3232,6 @@ msgstr "Selesaikan konflik pada daftar node/titik dari way/garis {0}"
msgid "Main dataset does not include node {0}"
msgstr "Dataset utama tidak termasuk node/titik {0}"
-msgid "Apply?"
-msgstr "Terapkan?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3239,27 +3254,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Relasi"
-
-msgid "Old role"
-msgstr "Peran lama"
-
-msgid "New role"
-msgstr "Peran baru"
-
-msgid "Old key"
-msgstr "Key lama"
-
-msgid "Old value"
-msgstr "Value lama"
-
-msgid "New key"
-msgstr "Key baru"
-
-msgid "New value"
-msgstr "Value baru"
-
msgid "Apply selected changes"
msgstr "Terapkan perubahan yang dipilih"
@@ -4371,6 +4365,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Peran verifikasi masalah"
@@ -5034,6 +5031,12 @@ msgstr ""
msgid "Initializing"
msgstr "Inisialiasasi"
+msgid "Setting defaults"
+msgstr "Pengaturan standar"
+
+msgid "Creating main GUI"
+msgstr "Membuat GUI Utama"
+
msgid "Updating plugins"
msgstr "Memperbaharui plugin"
@@ -5043,12 +5046,6 @@ msgstr "Memasang plugins terbaru"
msgid "Loading early plugins"
msgstr "Memuat plugins sebelumnya"
-msgid "Setting defaults"
-msgstr "Pengaturan standar"
-
-msgid "Creating main GUI"
-msgstr "Membuat GUI Utama"
-
msgid "Loading plugins"
msgstr "Memuat plugins"
@@ -6052,6 +6049,30 @@ msgstr "Hanya menampilkan tag dengan konflik"
msgid "Show tags with multiple values only"
msgstr "Hanya menunjukkan tag dengan multiple value"
+msgid "Apply?"
+msgstr "Terapkan?"
+
+msgid "Relation"
+msgstr "Relasi"
+
+msgid "Old role"
+msgstr "Peran lama"
+
+msgid "New role"
+msgstr "Peran baru"
+
+msgid "Old key"
+msgstr "Key lama"
+
+msgid "Old value"
+msgstr "Value lama"
+
+msgid "New key"
+msgstr "Key baru"
+
+msgid "New value"
+msgstr "Value baru"
+
msgid "For selected objects only"
msgstr "Hanya untuk objek yang dipilih"
@@ -6562,51 +6583,6 @@ msgstr "Alihkan visibilitas dari layer: {0}"
msgid "Open a list of all loaded layers."
msgstr "Buka daftar dari layer yang dimuat"
-msgid "Delete the selected layers."
-msgstr "Hapus layer yang dipilih"
-
-msgid "Show/hide"
-msgstr "Tunjukkan/Sembuyikan"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Alihkan visibilitas state dari layer yang dipilih."
-
-msgid "Show/hide layer"
-msgstr "Tunjukkan/Sembunyikan layer"
-
-msgid "Opacity"
-msgstr "Tingkat transparan"
-
-msgid "Adjust opacity of the layer."
-msgstr "mengatur tingkat transparan dari layer"
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Aktifkan"
-
-msgid "Activate the selected layer"
-msgstr "mengaktifkan layer yang dipilih"
-
-msgid "Activate layer"
-msgstr "mengaktifkan layer"
-
-msgid "Merge this layer into another layer"
-msgstr "menggabungkan layer ke dalam layer lainnya"
-
-msgid "Duplicate this layer"
-msgstr "Duplikasi layer ini"
-
-msgid "Copy of {0}"
-msgstr "Menyalin {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Menyalin {1} dari {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "Layer yang saat ini terlihat (klik pada sembunyikan layer)"
@@ -6629,12 +6605,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Pindahkan layer yang dipilih satu baris atas"
-
-msgid "Move the selected layer one row down."
-msgstr "Pindahkan layer yang dipilih satu baris ke bawah"
-
msgid "Information about layer"
msgstr "Infomasi tentang layer"
@@ -7062,15 +7032,6 @@ msgstr "Tutup di"
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr "download isi set perubahan"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) mendownload set perubahan {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) mendownload isi untuk set perubahan {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7179,9 +7140,6 @@ msgstr ""
msgid "Date"
msgstr "Tanggal"
-msgid "Download changesets"
-msgstr "download set perubahan"
-
msgid "{0} [incomplete]"
msgstr "{0} [tidak lengkap]"
@@ -7354,16 +7312,6 @@ msgid "Please enter an integer value > 0"
msgstr "Silahkan masukkan nilai integer > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Value yang ada saat ini bukan nama pengguna yang sah.<br>Silahkan "
-"masukkan nama pengguna.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Silahkan masukkan nama pengguna"
-
-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 ""
@@ -7465,15 +7413,6 @@ msgstr "Set perubahan ilegal query URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Tutup kotak dialog dan membatalkan query dari set perubahan"
-msgid "Querying and downloading changesets"
-msgstr "query dan download set perubahan"
-
-msgid "Determine user id for current user..."
-msgstr "Menentukan user id untuk pengguna saat ini..."
-
-msgid "Query and download changesets ..."
-msgstr "query dan download set perubahan ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7494,6 +7433,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "URL set perubahan query tidak valid"
+msgid "Activate"
+msgstr "Aktifkan"
+
+msgid "Activate the selected layer"
+msgstr "mengaktifkan layer yang dipilih"
+
+msgid "Activate layer"
+msgstr "mengaktifkan layer"
+
+msgid "Delete the selected layers."
+msgstr "Hapus layer yang dipilih"
+
+msgid "Duplicate this layer"
+msgstr "Duplikasi layer ini"
+
+msgid "Copy of {0}"
+msgstr "Menyalin {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Menyalin {1} dari {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "mengatur tingkat transparan dari layer"
+
+msgid "Opacity"
+msgstr "Tingkat transparan"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "menggabungkan layer ke dalam layer lainnya"
+
+msgid "Move the selected layer one row down."
+msgstr "Pindahkan layer yang dipilih satu baris ke bawah"
+
+msgid "Move the selected layer one row up."
+msgstr "Pindahkan layer yang dipilih satu baris atas"
+
+msgid "Show/hide"
+msgstr "Tunjukkan/Sembuyikan"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Alihkan visibilitas state dari layer yang dipilih."
+
+msgid "Show/hide layer"
+msgstr "Tunjukkan/Sembunyikan layer"
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7805,12 +7813,12 @@ msgstr "Relasi Utama"
msgid "Child Relations"
msgstr "Relasi Turunan"
-msgid "Apply Role:"
-msgstr "menerapkan peran"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Masukkan peran dan menerapkan relasi member yang dipilih"
+msgid "Apply Role:"
+msgstr "menerapkan peran"
+
msgid "New Relation"
msgstr "Relasi baru"
@@ -9622,9 +9630,6 @@ msgstr "Citra satelit pudar"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "KESALAHAN"
-
msgid "Next marker"
msgstr "Penanda selanjutnya"
@@ -10496,12 +10501,6 @@ msgstr "Jalankan kembali langkah-langkah otorisasi otomatis"
msgid "Test Access Token"
msgstr "Menguji Akses Token"
-msgid "Please enter your OSM user name"
-msgstr "Silahkan masukkan nama user OSM Anda"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "Nama user tidak boleh kosong. Silahkan masukkan nama user OSM Anda"
-
msgid "Please enter your OSM password"
msgstr "Silahkan masukkan password OSM Anda"
@@ -12698,6 +12697,12 @@ msgstr "pengaturan koneksi"
msgid "Connection Settings for the OSM server."
msgstr "Pengaturan koneksi untuk server OSM"
+msgid "Please enter your OSM user name"
+msgstr "Silahkan masukkan nama user OSM Anda"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "Nama user tidak boleh kosong. Silahkan masukkan nama user OSM Anda"
+
msgid "Action"
msgstr "Tindakan"
@@ -13242,6 +13247,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Gagal memisahkan tanggal \"{0}\" menjawab oleh server."
@@ -14566,74 +14579,6 @@ msgstr "alasan yang tidak spesifik"
msgid "Error playing sound"
msgstr "Kesalahan saat memutar sound"
-msgid "Do nothing"
-msgstr "Jangan lakukan apapun"
-
-msgid "Report Bug"
-msgstr "Laporkan Bug"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Pengecualian tak terduga terjadi.<br>Ini selalu kesalahan pengkodean. Jika "
-"Anda menjalankan versi terbaru<br>versi JOSM, harap mempertimbangkan dengan "
-"baik dan mengajukan laporan bug."
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "Pengecualian tak terduga"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Menekan dialog kesalahan lebih lanjut untuk sesi ini."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Anda telah menemukan kesalahan pada JOSM. Sebelum Anda mengajukan laporan "
-"bug pastikan Anda memperbarui versi terbaru dari JOSM disini:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Anda juga harus memperbarui plugin Anda. Jika tidak membantu mereka harap "
-"mengajukan laporan bug di bugtracker kami menggunakan link ini:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Ada kesalahan informasi yang tersedia di bawah sehingga harus sudah diisi "
-"untuk Anda. Harap masukan informasi bagaimana mereproduksi kesalahan dan "
-"mencoba memasok sedetail mungkin."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Alternatifnya, Jika itu tidak bekerja Anda dapat mengisi manual di informasi "
-"di bawah pada URL ini:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Teks telah disalin ke clipboard Anda.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Anda mengalami bug di JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14963,9 +14908,6 @@ msgstr "Unduh diarahkan pada \"{0}\""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Terlalu banyak pengalihan download URL terdeteksi. Gagal."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Tidak dapat menemukan terjemahan untuk lokal {0}. Mengembalikan ke {1}."
@@ -15166,6 +15108,78 @@ msgstr "Mengabaikan geometri cacat: {0}"
msgid "Failed to load XML schema."
msgstr "Gagal memuat skema XML."
+msgid "Do nothing"
+msgstr "Jangan lakukan apapun"
+
+msgid "Report Bug"
+msgstr "Laporkan Bug"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Pengecualian tak terduga terjadi.<br>Ini selalu kesalahan pengkodean. Jika "
+"Anda menjalankan versi terbaru<br>versi JOSM, harap mempertimbangkan dengan "
+"baik dan mengajukan laporan bug."
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Menekan dialog kesalahan lebih lanjut untuk sesi ini."
+
+msgid "Unexpected Exception"
+msgstr "Pengecualian tak terduga"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Anda mengalami bug di JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Anda telah menemukan kesalahan pada JOSM. Sebelum Anda mengajukan laporan "
+"bug pastikan Anda memperbarui versi terbaru dari JOSM disini:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Anda juga harus memperbarui plugin Anda. Jika tidak membantu mereka harap "
+"mengajukan laporan bug di bugtracker kami menggunakan link ini:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Ada kesalahan informasi yang tersedia di bawah sehingga harus sudah diisi "
+"untuk Anda. Harap masukan informasi bagaimana mereproduksi kesalahan dan "
+"mencoba memasok sedetail mungkin."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Alternatifnya, Jika itu tidak bekerja Anda dapat mengisi manual di informasi "
+"di bawah pada URL ini:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Teks telah disalin ke clipboard Anda.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15512,13 +15526,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -15527,7 +15541,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -15539,15 +15559,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -15644,6 +15661,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15668,13 +15688,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15821,10 +15841,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15877,29 +15897,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15947,6 +15966,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16007,6 +16029,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16043,10 +16068,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -16148,6 +16170,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -16157,6 +16182,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16841,6 +16869,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18253,6 +18286,12 @@ msgstr "Jalan"
msgid "Motorway"
msgstr "Jalan Tol"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -18838,9 +18877,6 @@ msgstr "Persimpangan Jalan Tol"
msgid "Number"
msgstr "Nomor"
-msgid "Exit to"
-msgstr "Keluar ke"
-
msgid "Services"
msgstr "Pelayanan"
@@ -19319,6 +19355,15 @@ msgstr "dataran pasang"
msgid "mangrove"
msgstr "bakau"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "lumpur"
@@ -20467,6 +20512,9 @@ msgstr ""
msgid "Fishing"
msgstr "Pemancingan"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -21735,6 +21783,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -23322,8 +23374,8 @@ msgstr "excrement_bags"
msgid "food"
msgstr "makanan"
-msgid "news_papers"
-msgstr "koran"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "Tiket_parkir"
@@ -23337,8 +23389,8 @@ msgstr "rencana_transportasi_umum"
msgid "public_transport_tickets"
msgstr "tiket_transportasi_umum"
-msgid "SIM-cards"
-msgstr "SIM-cards"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "perangko"
@@ -24594,6 +24646,21 @@ msgstr "alami"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -24618,9 +24685,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -24780,7 +24844,13 @@ msgstr "Perkemahan"
msgid "Test"
msgstr "Tes"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -24864,6 +24934,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24962,6 +25037,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24971,6 +25049,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "mempersingkat nama jalan"
@@ -28292,6 +28378,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -30714,6 +30860,15 @@ msgstr "Transportasi Umum: mengaktifkan waypoint"
msgid "Public Transport: Edit waypoint name"
msgstr "Transportasi Umum: Edit nama waypoint"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Pilihan tidak valid"
+
msgid "Public transport routes"
msgstr ""
@@ -31538,9 +31693,6 @@ msgstr "Menggambar bangunan"
msgid "Creates individual buildings from a long building."
msgstr "Buat bangunan individu dari sebuah bangunan yang panjang"
-msgid "Invalid selection"
-msgstr "Pilihan tidak valid"
-
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 "
@@ -33476,12 +33628,3 @@ msgstr "Pergi mengemudi"
msgid "Drive a race car on this layer"
msgstr "Mengendarai mobil balap pada layer ini"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Pola dasbor ilegal, setidaknya satu nilai harus > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Pola dasbor ilegal, nilai-nilai harus positif"
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 5a7959f..7058855 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:48+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:47+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "Java útgáfa {0}"
msgid "Homepage"
msgstr "Heimasíða"
-msgid "Bug Reports"
-msgstr "Villutilkynningar"
-
msgid "Info"
msgstr "Upplýsingar"
@@ -172,6 +169,12 @@ msgstr "Viðbætur"
msgid "About JOSM..."
msgstr "Um JOSM..."
+msgid "OK"
+msgstr "Í lagi"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -577,9 +580,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "Í lagi"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1169,9 +1169,6 @@ msgstr "Endurnefna skránna líka"
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1792,6 +1789,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Háspennustaur"
+msgid "Downloading changeset content"
+msgstr "Sæki innihald breytingar-setts"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Sæki breytingar-sett {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Sæki gögn frá breytingar-setti {2}..."
+
+msgid "Download changesets"
+msgstr "Sækja breytingar-sett"
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr "Villur þegar gögn voru sótt"
+
msgid "Download GPS"
msgstr ""
@@ -1941,9 +1962,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr "Villur þegar gögn voru sótt"
-
msgid "Error during download"
msgstr "Villa þegar gögn voru sótt"
@@ -2259,8 +2277,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3046,9 +3064,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3068,27 +3083,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Vensl"
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4146,6 +4140,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4793,6 +4790,12 @@ msgstr ""
msgid "Initializing"
msgstr "Upphafsstilli"
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Bý til aðal notandaviðmót"
+
msgid "Updating plugins"
msgstr ""
@@ -4802,12 +4805,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Bý til aðal notandaviðmót"
-
msgid "Loading plugins"
msgstr "Hleð inn viðbótum"
@@ -5778,6 +5775,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr "Vensl"
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6265,51 +6286,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "Sýna lista yfir öll lög."
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Sýna eða fela valið lag."
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr "Virkja valið lag"
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr "Sameina þetta lag öðru lagi"
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6332,12 +6308,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Færa valið lag upp í röðinni"
-
-msgid "Move the selected layer one row down."
-msgstr "Færa valið lag niður í röðinni"
-
msgid "Information about layer"
msgstr "Upplýsingar um lag"
@@ -6762,15 +6732,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr "Sæki innihald breytingar-setts"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Sæki breytingar-sett {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Sæki gögn frá breytingar-setti {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6876,9 +6837,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr "Sækja breytingar-sett"
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7032,14 +6990,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7124,15 +7074,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7150,6 +7091,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr "Virkja valið lag"
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Sameina þetta lag öðru lagi"
+
+msgid "Move the selected layer one row down."
+msgstr "Færa valið lag niður í röðinni"
+
+msgid "Move the selected layer one row up."
+msgstr "Færa valið lag upp í röðinni"
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Sýna eða fela valið lag."
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7465,10 +7475,10 @@ msgstr "Yfirvensl"
msgid "Child Relations"
msgstr "Undirvensl"
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9134,9 +9144,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9939,12 +9946,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11962,6 +11963,12 @@ msgstr "Tengistillingar"
msgid "Connection Settings for the OSM server."
msgstr "Stillingar sem þarf til að tengjast OSM þjóninum."
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12474,6 +12481,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13717,62 +13732,6 @@ msgstr ""
msgid "Error playing sound"
msgstr "Villa við að spila hljóð"
-msgid "Do nothing"
-msgstr "Gera ekkert"
-
-msgid "Report Bug"
-msgstr "Senda villutilkynningu"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "Óvænt villa"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "Textinn hefur verið þegar verið afritaður"
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14026,9 +13985,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14213,6 +14169,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Gera ekkert"
+
+msgid "Report Bug"
+msgstr "Senda villutilkynningu"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Óvænt villa"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "Textinn hefur verið þegar verið afritaður"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14547,13 +14563,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14562,7 +14578,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14574,15 +14596,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14679,6 +14698,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14703,13 +14725,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14856,10 +14878,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14912,29 +14934,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14982,6 +15003,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15042,6 +15066,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15078,10 +15105,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15183,6 +15207,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15192,6 +15219,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15848,6 +15878,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17205,6 +17240,12 @@ msgstr "Stræti"
msgid "Motorway"
msgstr "Hraðbraut"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17781,9 +17822,6 @@ msgstr ""
msgid "Number"
msgstr "Tilvísun"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Vegþjónustur"
@@ -18262,6 +18300,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Leðja"
@@ -19410,6 +19457,9 @@ msgstr ""
msgid "Fishing"
msgstr "Fiskveiðar"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20678,6 +20728,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22265,8 +22319,8 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
-msgstr "dagblöð"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr ""
@@ -22280,7 +22334,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23535,6 +23589,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23559,9 +23628,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23721,7 +23787,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23805,6 +23877,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23903,6 +23980,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23912,6 +23992,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27011,6 +27099,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29332,6 +29480,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30116,9 +30273,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 3f6aa10..28c0f30 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,16 +4,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm 20081003\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2015-09-21 07:50+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-03-26 10:48+0000\n"
"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:50+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:49+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -153,9 +153,6 @@ msgstr "Versione Java {0}"
msgid "Homepage"
msgstr "Pagina iniziale"
-msgid "Bug Reports"
-msgstr "Segnalazione errori"
-
msgid "Info"
msgstr "Informazioni"
@@ -177,6 +174,12 @@ msgstr "Estensioni"
msgid "About JOSM..."
msgstr "Informazioni su JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Segnala bug"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -472,7 +475,7 @@ msgid "Delete selected objects."
msgstr "Cancella gli oggetti selezionati."
msgid "Delete Layer"
-msgstr ""
+msgstr "Elimina livello"
msgid "Delete the active layer. Does not delete the associated file."
msgstr ""
@@ -610,9 +613,6 @@ msgstr "Regola la posizione di questo livello di immagini aeree"
msgid "Adjust imagery offset"
msgstr "Regola lo scostamento delle immagini aeree"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1282,9 +1282,6 @@ msgstr "Rinomina anche il file"
msgid "Could not rename file ''{0}''"
msgstr "Impossibile rinominare il file ''{0}''"
-msgid "Report bug"
-msgstr "Segnala bug"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Segnala un errore a bugtracker di JOSM"
@@ -1621,7 +1618,7 @@ msgid "Both nodes"
msgstr ""
msgid "New node"
-msgstr ""
+msgstr "Nuovo nodo"
msgid "Tags / Memberships"
msgstr "Etichette / Appartenenze"
@@ -1962,6 +1959,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avanzamento lento"
+msgid "Downloading changeset content"
+msgstr "Scaricamento del contenuto del gruppo di modifiche"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Scaricamento del gruppo di modifiche {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Scaricamento del contenuto del gruppo di modifiche {2}..."
+
+msgid "Download changesets"
+msgstr "Scarica gruppi di modifiche"
+
+msgid "Querying and downloading changesets"
+msgstr "Interrogazione e scaricamento dei gruppi di modifiche"
+
+msgid "Determine user id for current user..."
+msgstr "Determinazione identificativo dell''utente corrente..."
+
+msgid "Query and download changesets ..."
+msgstr "Interroga e scarica gruppi di modifiche ..."
+
+msgid "Errors during download"
+msgstr "Errore durante lo scaricamento"
+
msgid "Download GPS"
msgstr "Scarica GPS"
@@ -2129,9 +2150,6 @@ msgid "The following errors occurred during mass download: {0}"
msgstr ""
"Sono stati generati i seguenti errori durante lo scaricamento di massa: {0}"
-msgid "Errors during download"
-msgstr "Errore durante lo scaricamento"
-
msgid "Error during download"
msgstr "Errore durante lo scaricamento"
@@ -2490,8 +2508,8 @@ msgid "Add selection to relation"
msgstr "Aggiungi selezione alla relazione"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -2652,7 +2670,7 @@ msgid "Also include incomplete and deleted objects in search."
msgstr "Include nella ricerca anche gli oggetti incompleti ed eliminati."
msgid "standard"
-msgstr ""
+msgstr "standard"
msgid "regular expression"
msgstr "espressione regolare"
@@ -2902,7 +2920,7 @@ msgstr "RX"
msgctxt "search"
msgid "CSS"
-msgstr ""
+msgstr "CSS"
msgctxt "search"
msgid "A"
@@ -3338,9 +3356,6 @@ msgstr "Risolvi i conflitti nella lista dei nodi del percorso {0}"
msgid "Main dataset does not include node {0}"
msgstr "Il set di dati principale non include il node {0}"
-msgid "Apply?"
-msgstr "Applicare?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3370,27 +3385,6 @@ msgstr ""
"Durante l''inversione di questo percorso vengono suggerite le seguenti "
"modifiche in modo da mantenere la consistenza dei dati."
-msgid "Relation"
-msgstr "Relazione"
-
-msgid "Old role"
-msgstr "Vecchia regola"
-
-msgid "New role"
-msgstr "Nuova regola"
-
-msgid "Old key"
-msgstr "Chiave precedente"
-
-msgid "Old value"
-msgstr "Valore precedente"
-
-msgid "New key"
-msgstr "Nuova chiave"
-
-msgid "New value"
-msgstr "Nuovo valore"
-
msgid "Apply selected changes"
msgstr "Applica i cambiamenti selezionati"
@@ -4019,7 +4013,7 @@ msgid "Cassini-Soldner"
msgstr ""
msgid "Double Stereographic"
-msgstr ""
+msgstr "Doppia proiezione stereografica"
msgid "Lambert Azimuthal Equal Area"
msgstr ""
@@ -4052,7 +4046,7 @@ msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
msgstr ""
msgid "Sinusoidal"
-msgstr ""
+msgstr "Sinusoidale"
msgid "Swiss Oblique Mercator"
msgstr "Svizzera Obliqua di Mercatore"
@@ -4559,6 +4553,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problema nella verifica del ruolo"
@@ -5249,6 +5246,12 @@ msgstr "Livello di debug di dettaglio abilitato (traccia)"
msgid "Initializing"
msgstr "Inizializzazione"
+msgid "Setting defaults"
+msgstr "Impostazioni predefinite"
+
+msgid "Creating main GUI"
+msgstr "Creazione dell''interfaccia principale"
+
msgid "Updating plugins"
msgstr "Aggiornamento estensioni"
@@ -5258,12 +5261,6 @@ msgstr "Installando plugins aggiornati"
msgid "Loading early plugins"
msgstr "Caricamento vecchie estensioni"
-msgid "Setting defaults"
-msgstr "Impostazioni predefinite"
-
-msgid "Creating main GUI"
-msgstr "Creazione dell''interfaccia principale"
-
msgid "Loading plugins"
msgstr "Caricamento estensioni"
@@ -6356,6 +6353,30 @@ msgstr "Visualizza solamente le etichette con conflitti"
msgid "Show tags with multiple values only"
msgstr "Visualizza solamente le etichette con valori multipli"
+msgid "Apply?"
+msgstr "Applicare?"
+
+msgid "Relation"
+msgstr "Relazione"
+
+msgid "Old role"
+msgstr "Vecchia regola"
+
+msgid "New role"
+msgstr "Nuova regola"
+
+msgid "Old key"
+msgstr "Chiave precedente"
+
+msgid "Old value"
+msgstr "Valore precedente"
+
+msgid "New key"
+msgstr "Nuova chiave"
+
+msgid "New value"
+msgstr "Nuovo valore"
+
msgid "For selected objects only"
msgstr "Solamente per gli oggetti selezionati"
@@ -6896,51 +6917,6 @@ msgstr "Commuta la visibilità del livello: {0}"
msgid "Open a list of all loaded layers."
msgstr "Apre la lista di tutti i livelli caricati."
-msgid "Delete the selected layers."
-msgstr "Elimina i livelli selezionati."
-
-msgid "Show/hide"
-msgstr "Mostra/nascondi"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Commuta la visibilità del livello selezionato."
-
-msgid "Show/hide layer"
-msgstr "Mostra/nascondi livello"
-
-msgid "Opacity"
-msgstr "Opacità"
-
-msgid "Adjust opacity of the layer."
-msgstr "Regola opacità del livello."
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Aggiunsta il volare gamma del livello."
-
-msgid "Activate"
-msgstr "Attiva"
-
-msgid "Activate the selected layer"
-msgstr "Attiva il livello selezionato"
-
-msgid "Activate layer"
-msgstr "Attiva livello"
-
-msgid "Merge this layer into another layer"
-msgstr "Unisci questo livello con un altro livello"
-
-msgid "Duplicate this layer"
-msgstr "Duplica questo livello"
-
-msgid "Copy of {0}"
-msgstr "Copia di {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copia {1} di {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "il livello è attualmente visibile (clicca per nascondere il livello)"
@@ -6964,12 +6940,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Sposta il livello selezionato in su."
-
-msgid "Move the selected layer one row down."
-msgstr "Sposta il layer selezionato in giù."
-
msgid "Information about layer"
msgstr "Informazioni sul livello"
@@ -7412,15 +7382,6 @@ msgstr "Chiuso il"
msgid "Discussions"
msgstr "Discussioni"
-msgid "Downloading changeset content"
-msgstr "Scaricamento del contenuto del gruppo di modifiche"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Scaricamento del gruppo di modifiche {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Scaricamento del contenuto del gruppo di modifiche {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7540,9 +7501,6 @@ msgstr "Aggiorna le discussioni sulle modifiche dal server OSM"
msgid "Date"
msgstr "Data"
-msgid "Download changesets"
-msgstr "Scarica gruppi di modifiche"
-
msgid "{0} [incomplete]"
msgstr "{0} [incompleto]"
@@ -7720,16 +7678,6 @@ msgid "Please enter an integer value > 0"
msgstr "Inserire un valore intero > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Il valore corrente non è un nome utente valido.<br>Si prega di "
-"inserire un nome utente non vuoto.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Si prega di inserire un nome utente non vuoto"
-
-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 ""
@@ -7842,15 +7790,6 @@ msgid "Close the dialog and abort querying of changesets"
msgstr ""
"Chiudi la finestra e annulla l''interrogazione sui gruppi di modifiche"
-msgid "Querying and downloading changesets"
-msgstr "Interrogazione e scaricamento dei gruppi di modifiche"
-
-msgid "Determine user id for current user..."
-msgstr "Determinazione identificativo dell''utente corrente..."
-
-msgid "Query and download changesets ..."
-msgstr "Interroga e scarica gruppi di modifiche ..."
-
msgid "URL: "
msgstr "Indirizzo URL: "
@@ -7874,6 +7813,75 @@ msgid "This changeset query URL is invalid"
msgstr ""
"L’indirizzo URL per l’interrogazione sui gruppi di modifiche non è valido"
+msgid "Activate"
+msgstr "Attiva"
+
+msgid "Activate the selected layer"
+msgstr "Attiva il livello selezionato"
+
+msgid "Activate layer"
+msgstr "Attiva livello"
+
+msgid "Delete the selected layers."
+msgstr "Elimina i livelli selezionati."
+
+msgid "Duplicate this layer"
+msgstr "Duplica questo livello"
+
+msgid "Copy of {0}"
+msgstr "Copia di {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copia {1} di {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr "Mostra livello"
+
+msgid "Adjust opacity of the layer."
+msgstr "Regola opacità del livello."
+
+msgid "Opacity"
+msgstr "Opacità"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Aggiunsta il volare gamma del livello."
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Unisci questo livello con un altro livello"
+
+msgid "Move the selected layer one row down."
+msgstr "Sposta il layer selezionato in giù."
+
+msgid "Move the selected layer one row up."
+msgstr "Sposta il livello selezionato in su."
+
+msgid "Show/hide"
+msgstr "Mostra/nascondi"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Commuta la visibilità del livello selezionato."
+
+msgid "Show/hide layer"
+msgstr "Mostra/nascondi livello"
+
msgid "Discardable key: selection Foreground"
msgstr "Chiave scartabile: primo piano selezione"
@@ -7992,7 +8000,7 @@ msgid "Copy the key and value of all the tags to clipboard"
msgstr "Copia la chiave ed il valore di tutte le etichette negli appunti"
msgid "Copy Tags"
-msgstr ""
+msgstr "Copia i tag"
msgid "Search Key/Value/Type"
msgstr "Cerca chiave/valore/tipo"
@@ -8201,12 +8209,12 @@ msgstr "Relazioni da cui dipende"
msgid "Child Relations"
msgstr "Relazioni figlie"
-msgid "Apply Role:"
-msgstr "Applica ruolo:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Inserire un ruolo e applicarlo ai membri della relazione selezionata"
+msgid "Apply Role:"
+msgstr "Applica ruolo:"
+
msgid "New Relation"
msgstr "Nuova relazione"
@@ -9990,13 +9998,13 @@ msgid "Load tile"
msgstr ""
msgid "Auto zoom"
-msgstr ""
+msgstr "Zoom automatico"
msgid "Auto load tiles"
msgstr "Carica automaticamente i tasselli"
msgid "Show errors"
-msgstr ""
+msgstr "Mostra errori"
msgid "Load all tiles"
msgstr ""
@@ -10076,7 +10084,7 @@ msgid "Details..."
msgstr "Dettagli..."
msgid "Do not show this message again"
-msgstr ""
+msgstr "Non mostrare più questo messaggio"
msgid "Hide this message and never show it again"
msgstr "Nascondi questo messaggio e non visualizzarlo più"
@@ -10137,9 +10145,6 @@ msgstr "Dissolvenza delle immagini aeree"
msgid "Unsupported imagery type: {0}"
msgstr "Tipo di immagini non supportato: {0}"
-msgid "ERROR"
-msgstr "ERRORE"
-
msgid "Next marker"
msgstr "Contrassegno successivo"
@@ -11039,14 +11044,6 @@ msgstr "Esegui nuovamente i passaggi dell''autorizzazione automatica"
msgid "Test Access Token"
msgstr "Verifica il token di accesso"
-msgid "Please enter your OSM user name"
-msgstr "Si prega di inserire il proprio nome utente OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Il nome utente non può essere vuoto. Si prega di inserire il proprio nome "
-"utente OSM"
-
msgid "Please enter your OSM password"
msgstr "Si prega di inserire la propria password OSM"
@@ -12362,7 +12359,7 @@ msgid "{0} cache, total cache size: {1} bytes"
msgstr "{0} cache, dimensione totale cache : {1} bytes"
msgid "Cache name"
-msgstr ""
+msgstr "Nome della cache"
msgid "Object Count"
msgstr ""
@@ -12963,7 +12960,7 @@ msgid "LKS-92 (Latvia TM)"
msgstr "LKS-92 (Lettonia TM)"
msgid "Rijksdriehoekscoördinaten (Netherlands)"
-msgstr ""
+msgstr "Rijksdriehoekscoördinaten (Paesi Bassi)"
msgid "SWEREF99 13 30 / EPSG:3008 (Sweden)"
msgstr "SWEREF99 13 30 / EPSG:3008 (Svezia)"
@@ -13359,6 +13356,14 @@ msgstr "Impostazioni di connessione"
msgid "Connection Settings for the OSM server."
msgstr "Impostazioni di connessione al server OSM."
+msgid "Please enter your OSM user name"
+msgstr "Si prega di inserire il proprio nome utente OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Il nome utente non può essere vuoto. Si prega di inserire il proprio nome "
+"utente OSM"
+
msgid "Action"
msgstr "Azione"
@@ -13926,6 +13931,14 @@ msgstr ""
"Valore non valido per l''attributo ''{0}'' dell''elemento ''{1}'' nelle "
"capacità del server. Ottenuto ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Fallita l''analisi della data ''{0}'' restituita dal server."
@@ -15370,81 +15383,6 @@ msgstr "motivo non specificato"
msgid "Error playing sound"
msgstr "Impossibile riprodurre il suono"
-msgid "Do nothing"
-msgstr "Non fare niente"
-
-msgid "Report Bug"
-msgstr "Segnala bug"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"È stata generata una eccezione inaspettata.<br>Questo è sempre un errore di "
-"programmazione. Se si sta utilizzando l''ultima<br>versione di JOSM, si "
-"prega gentilmente di effettuare una segnalazione per questo problema."
-
-msgid "Update JOSM"
-msgstr "Aggiorna JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"E'' avvenuto un errore inatteso. Questo è sempre un errore di "
-"codifica.<br><br>In ogni caso si sta eseguendo una vecchia versione di JOSM "
-"({0}),<br>invece di utilizzare la versione testata corrente "
-"(<b>{1}</b>).<br><br><b>Si prega di aggiornare JOSM</b> prima di pensare a "
-"riportare il problema."
-
-msgid "Unexpected Exception"
-msgstr "Eccezione inattesa"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Non mostrare più le finestre di errore in questa sessione."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"È stato riscontrato un errore in JOSM. Prima di procedere con la "
-"segnalazione del problema, assicurarsi di aver aggiornato JOSM all''ultima "
-"versione che si trova qui:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Si dovrebbero aggiornare anche le proprie estensioni. Se nemmeno questo "
-"aiuta allora si prega di segnalare il problema nel nostro bugtracker "
-"utilizzando questo collegamento:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Le informazioni inerenti al problema sono state già riempite di seguito. Si "
-"prega di includere la procedura per riprodurre l''errore e di fornire il "
-"maggior numero di dettagli possibile."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"In alternativa, se non funziona, si possono riportare le informazioni "
-"manualmente su questo indirizzo URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Il testo è stato già copiato nei tuoi appunti)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Ci si è imbattuti in un bug di JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15829,9 +15767,6 @@ msgstr ""
"Sono stati individuati troppi reindirizzamenti all''indirizzo URL di "
"scarico. Annullo."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Impossibile trovare la traduzione per la stringa locale {0}. Ripristinata a "
@@ -16054,6 +15989,85 @@ msgstr "Ignoro le dimensioni e la posizione malformata: {0}"
msgid "Failed to load XML schema."
msgstr "Fallito il caricamento dello schema XML."
+msgid "Do nothing"
+msgstr "Non fare niente"
+
+msgid "Report Bug"
+msgstr "Segnala bug"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"È stata generata una eccezione inaspettata.<br>Questo è sempre un errore di "
+"programmazione. Se si sta utilizzando l''ultima<br>versione di JOSM, si "
+"prega gentilmente di effettuare una segnalazione per questo problema."
+
+msgid "Update JOSM"
+msgstr "Aggiorna JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"E'' avvenuto un errore inatteso. Questo è sempre un errore di "
+"codifica.<br><br>In ogni caso si sta eseguendo una vecchia versione di JOSM "
+"({0}),<br>invece di utilizzare la versione testata corrente "
+"(<b>{1}</b>).<br><br><b>Si prega di aggiornare JOSM</b> prima di pensare a "
+"riportare il problema."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Non mostrare più le finestre di errore in questa sessione."
+
+msgid "Unexpected Exception"
+msgstr "Eccezione inattesa"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Ci si è imbattuti in un bug di JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"È stato riscontrato un errore in JOSM. Prima di procedere con la "
+"segnalazione del problema, assicurarsi di aver aggiornato JOSM all''ultima "
+"versione che si trova qui:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Si dovrebbero aggiornare anche le proprie estensioni. Se nemmeno questo "
+"aiuta allora si prega di segnalare il problema nel nostro bugtracker "
+"utilizzando questo collegamento:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Le informazioni inerenti al problema sono state già riempite di seguito. Si "
+"prega di includere la procedura per riprodurre l''errore e di fornire il "
+"maggior numero di dettagli possibile."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"In alternativa, se non funziona, si possono riportare le informazioni "
+"manualmente su questo indirizzo URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Il testo è stato già copiato nei tuoi appunti)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16158,7 +16172,7 @@ msgstr "incolta"
msgctxt "natural"
msgid "wood"
-msgstr ""
+msgstr "bosco"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -16404,14 +16418,14 @@ msgstr "Mapbox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "Tracce GPS OpenStreetMap"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Livello standard)"
+msgid "OpenSeaMap"
+msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Bianco & Nero)"
@@ -16419,8 +16433,14 @@ msgstr "OpenStreetMap (Mapnik Bianco & Nero)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, senza etichette)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (alla francese)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Stile tedesco)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "Tracce GPS OpenStreetMap"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16431,15 +16451,12 @@ msgstr "Trasporto pubblico locale (TPL)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Stile tedesco)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingua"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (sovrapposta)"
@@ -16498,7 +16515,7 @@ msgid "OSM Inspector: Boundaries (EU)"
msgstr "OSM Inspector: Boundaries (EU)"
msgid "SIG Instituto Geográfico Nacional (WMTS)"
-msgstr ""
+msgstr "SIG Instituto Geográfico Nacional (WMTS)"
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI bianco-nero 2.5m"
@@ -16536,6 +16553,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mappa base)"
@@ -16560,14 +16580,14 @@ msgstr "VoGIS: Immagine a colori veri 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Piano di destinazione del terreno"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (modello del terreno)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (modello superficie)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr ""
@@ -16713,10 +16733,10 @@ msgstr "Géolittoral V2 - Orthofoto 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentieri"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16770,9 +16790,18 @@ msgstr "Bavaria (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
msgstr ""
+msgid "Stuttgart (aerial imagery)"
+msgstr "Stoccarda (immagini aeree)"
+
msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
@@ -16785,16 +16814,6 @@ msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr ""
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr ""
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16840,6 +16859,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16900,9 +16922,12 @@ msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
-msgid "Lombardia - Italy (CTR DBT)"
+msgid "Lombardia - Italy (CTR)"
msgstr ""
+msgid "Lombardia - Italy (CTR DBT)"
+msgstr "Lombardia - Italia (CTR DBT)"
+
msgid "Sicily - Italy"
msgstr "Sicilia -Italia"
@@ -16936,11 +16961,8 @@ msgstr "1.cikla ortofotokarte - Latvia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lituania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Lussemburgo Inspire Orto 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Lussemburgo Inspire Orto 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Lussemburgo Inspire Ferrovia"
@@ -17041,6 +17063,9 @@ msgstr "Powiat poznański: Budynki (edifici)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (Immagine Aerea)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (edifici)"
@@ -17050,6 +17075,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (Immagine Aerea)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (edifici)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (edifici)"
@@ -17754,6 +17782,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18468,16 +18501,16 @@ msgid "ice_cream"
msgstr "gelato"
msgid "international"
-msgstr ""
+msgstr "internazionale"
msgid "seafood"
msgstr ""
msgid "spanish"
-msgstr ""
+msgstr "spagnola"
msgid "vietnamese"
-msgstr ""
+msgstr "vietnamita"
msgid "fish"
msgstr ""
@@ -18489,10 +18522,10 @@ msgid "barbecue"
msgstr ""
msgid "vegetarian"
-msgstr ""
+msgstr "vegetariana"
msgid "korean"
-msgstr ""
+msgstr "coreana"
msgid "Internet access"
msgstr "Accesso ad Internet"
@@ -19201,6 +19234,12 @@ msgstr "Strade"
msgid "Motorway"
msgstr "Autostrada"
+msgid "Destination"
+msgstr "Destinazione"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -19731,11 +19770,11 @@ msgstr "Marciapiede dedicato"
msgctxt "footway"
msgid "sidewalk"
-msgstr ""
+msgstr "marciapiede"
msgctxt "footway"
msgid "crossing"
-msgstr ""
+msgstr "attraversamento"
msgid "Steps"
msgstr "Scalinata"
@@ -19797,9 +19836,6 @@ msgstr "Uscita autostradale"
msgid "Number"
msgstr "Numero"
-msgid "Exit to"
-msgstr "Uscita"
-
msgid "Services"
msgstr "Area di servizio"
@@ -19910,7 +19946,7 @@ msgstr ""
msgctxt "traffic_calming"
msgid "Island"
-msgstr ""
+msgstr "Isola"
msgid "Rumble strip"
msgstr ""
@@ -19934,7 +19970,7 @@ msgid "Second Name"
msgstr "Secondo nome"
msgid "Speed Limit Sign"
-msgstr ""
+msgstr "Limite di velocità"
msgid "Speed Camera"
msgstr "Autovelox"
@@ -20284,6 +20320,15 @@ msgstr "barena"
msgid "mangrove"
msgstr "mangrovie"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Zona fangosa (sabbie mobili)"
@@ -21166,10 +21211,10 @@ msgid "Reservation"
msgstr ""
msgid "required"
-msgstr ""
+msgstr "richiesta"
msgid "recommended"
-msgstr ""
+msgstr "raccomandata"
msgid "members_only"
msgstr ""
@@ -21396,7 +21441,7 @@ msgid "Water Park"
msgstr "Parco acquatico"
msgid "Swimming Pool"
-msgstr ""
+msgstr "Piscina"
msgid "Used for the water area only."
msgstr ""
@@ -21438,6 +21483,9 @@ msgstr "Braciere"
msgid "Fishing"
msgstr "Riserva di pesca"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Night Club"
@@ -21783,7 +21831,7 @@ msgid "Indoor"
msgstr "Interno"
msgid "Fire Hose"
-msgstr ""
+msgstr "Manichetta antincendio"
msgid "Fire Hydrant"
msgstr "Pompa antincendio"
@@ -21848,25 +21896,25 @@ msgid "Emergency Phone"
msgstr "Telefono di emergenza"
msgid "Siren"
-msgstr ""
+msgstr "Sirena d''allarme"
msgid "pneumatic"
msgstr ""
msgid "electronic"
-msgstr ""
+msgstr "elettronica"
msgid "mechanical"
-msgstr ""
+msgstr "meccanica"
msgid "Purpose"
msgstr ""
msgid "tornado"
-msgstr ""
+msgstr "tornado"
msgid "fire"
-msgstr ""
+msgstr "incendio"
msgid "air_raid"
msgstr ""
@@ -21887,7 +21935,7 @@ msgid "Group Home"
msgstr ""
msgid "For"
-msgstr ""
+msgstr "Per"
msgid "Assisted Living"
msgstr ""
@@ -21907,11 +21955,11 @@ msgstr "Bagni"
msgctxt "restroom"
msgid "Female"
-msgstr ""
+msgstr "Femminile"
msgctxt "restroom"
msgid "Male"
-msgstr ""
+msgstr "Maschile"
msgctxt "restroom"
msgid "Unisex"
@@ -22227,7 +22275,7 @@ msgstr ""
msgctxt "golf"
msgid "Hole"
-msgstr ""
+msgstr "Buca"
msgid "Par"
msgstr ""
@@ -22257,7 +22305,7 @@ msgstr ""
msgctxt "golf"
msgid "Green"
-msgstr ""
+msgstr "Green"
msgctxt "golf"
msgid "Fairway"
@@ -22631,7 +22679,7 @@ msgstr "ospedale"
msgctxt "building"
msgid "kindergarten"
-msgstr ""
+msgstr "asilo"
msgctxt "building"
msgid "manufacture"
@@ -22675,37 +22723,41 @@ msgstr "in costruzione"
msgctxt "building"
msgid "basilica"
-msgstr ""
+msgstr "basilica"
msgctxt "building"
msgid "cathedral"
-msgstr ""
+msgstr "cattedrale"
msgctxt "building"
msgid "chapel"
-msgstr ""
+msgstr "cappella"
msgctxt "building"
msgid "church"
-msgstr ""
+msgstr "chiesa"
msgctxt "building"
msgid "temple"
-msgstr ""
+msgstr "tempio"
msgctxt "building"
msgid "mosque"
-msgstr ""
+msgstr "moschea"
msgctxt "building"
msgid "synagogue"
-msgstr ""
+msgstr "sinagoga"
msgctxt "building"
msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Livelli"
@@ -22726,7 +22778,7 @@ msgstr "casa"
msgctxt "building"
msgid "hotel"
-msgstr ""
+msgstr "hotel"
msgctxt "building"
msgid "hut"
@@ -24192,7 +24244,7 @@ msgid "Beauty"
msgstr "Bellezza"
msgid "Tobacco"
-msgstr ""
+msgstr "Tabacco"
msgid "Hairdresser/Barber"
msgstr "Parrucchiere/Barbiere"
@@ -24264,7 +24316,7 @@ msgid "Pet"
msgstr "Animale"
msgid "Photo"
-msgstr ""
+msgstr "Fotografia"
msgid "Funeral Directors"
msgstr "Pompe funebri"
@@ -24296,8 +24348,8 @@ msgstr "sacchetti per escrementi"
msgid "food"
msgstr "cibo"
-msgid "news_papers"
-msgstr "giornali"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "biglietti per il parcheggio"
@@ -24311,8 +24363,8 @@ msgstr "orari del trasporto pubblico"
msgid "public_transport_tickets"
msgstr "biglietti per il trasporto pubblico"
-msgid "SIM-cards"
-msgstr "schede SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "francobolli"
@@ -24436,7 +24488,7 @@ msgstr ""
msgctxt "office"
msgid "Accountant"
-msgstr ""
+msgstr "Contabile"
msgctxt "office"
msgid "Administrative"
@@ -24448,7 +24500,7 @@ msgstr ""
msgctxt "office"
msgid "Architect"
-msgstr ""
+msgstr "Architetto"
msgctxt "office"
msgid "Association"
@@ -24480,7 +24532,7 @@ msgstr ""
msgctxt "office"
msgid "Insurance"
-msgstr ""
+msgstr "Assicurazione"
msgctxt "office"
msgid "It specialist"
@@ -24504,7 +24556,7 @@ msgstr ""
msgctxt "office"
msgid "Political party"
-msgstr ""
+msgstr "Sede di partito"
msgctxt "office"
msgid "Religion"
@@ -24532,7 +24584,7 @@ msgid "Shoemaker"
msgstr ""
msgid "Photographer"
-msgstr ""
+msgstr "Fotografo"
msgid "Metal construction"
msgstr ""
@@ -24583,7 +24635,7 @@ msgid "Beekeeper"
msgstr ""
msgid "Blacksmith"
-msgstr ""
+msgstr "Fabbro"
msgid "Locksmith"
msgstr ""
@@ -24966,23 +25018,23 @@ msgstr ""
msgctxt "crop"
msgid "corn"
-msgstr ""
+msgstr "mais"
msgctxt "crop"
msgid "grass"
-msgstr ""
+msgstr "erba"
msgctxt "crop"
msgid "rice"
-msgstr ""
+msgstr "riso"
msgctxt "crop"
msgid "wheat"
-msgstr ""
+msgstr "frumento"
msgctxt "crop"
msgid "hop"
-msgstr ""
+msgstr "luppolo"
msgid "Meadow"
msgstr "Prato"
@@ -24991,7 +25043,7 @@ msgid "Orchard"
msgstr "Frutteto"
msgid "Trees"
-msgstr ""
+msgstr "Alberi"
msgid "olive_trees"
msgstr ""
@@ -25588,6 +25640,21 @@ msgstr "elemento naturale"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Piste"
@@ -25612,9 +25679,6 @@ msgstr "alpino"
msgid "Detour Route"
msgstr "Deviazione"
-msgid "Destination"
-msgstr "Destinazione"
-
msgid "Ref of the way this is a detour to"
msgstr "Riferimento del percorso deviato"
@@ -25774,8 +25838,14 @@ msgstr "Campeggio"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Decremento numeri civici in interpolazione indirizzi"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} senza {1}"
@@ -25863,6 +25933,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -25968,6 +26043,9 @@ msgstr "{0} dovrebbe essere collegato ad un tracciato"
msgid "node connects waterway and bridge"
msgstr "nodo connette via navigabile e ponte"
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -25977,6 +26055,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nome abbreviato della strada"
@@ -28302,7 +28388,7 @@ msgid "Generate matches"
msgstr "Genera corrispondenze"
msgid "Layer:"
-msgstr ""
+msgstr "Livello:"
msgid "{0}: 0 / {1}: 0 / {2}: 0"
msgstr ""
@@ -28357,7 +28443,7 @@ msgid "Toggle the continuous download on/off"
msgstr ""
msgid "Download Settings"
-msgstr ""
+msgstr "Impostazioni di scaricamento"
msgid "Settings for the continuous download."
msgstr ""
@@ -28379,7 +28465,7 @@ msgid ""
msgstr ""
msgid "Requires restart"
-msgstr ""
+msgstr "Richiede il riavvio"
msgid "Max threads"
msgstr ""
@@ -28396,7 +28482,7 @@ msgid ""
msgstr ""
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "Tempo d''attesa (in millisecondi)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
@@ -29420,6 +29506,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -29939,16 +30085,16 @@ msgid "Rewrite imported images"
msgstr ""
msgid "Select a folder"
-msgstr ""
+msgstr "Selezionare una cartella"
msgid "Explore"
-msgstr ""
+msgstr "Esplora"
msgid "Select a directory"
-msgstr ""
+msgstr "Selezionare una cartella"
msgid "Speed limit"
-msgstr ""
+msgstr "Limite di velocità"
msgid "Give way"
msgstr ""
@@ -29972,19 +30118,19 @@ msgid "No overtaking"
msgstr ""
msgid "Pedestrian crossing"
-msgstr ""
+msgstr "Strisce pedonali"
msgid "No turn"
msgstr ""
msgid "Years"
-msgstr ""
+msgstr "Anni"
msgid "Months"
-msgstr ""
+msgstr "Mesi"
msgid "Days"
-msgstr ""
+msgstr "Giorni"
msgid "Imported images"
msgstr ""
@@ -30059,7 +30205,7 @@ msgid "Continues with the paused walk."
msgstr ""
msgid "Pause"
-msgstr ""
+msgstr "Metti in pausa"
msgid "Pauses the walk."
msgstr ""
@@ -30135,7 +30281,7 @@ msgid ""
msgstr ""
msgid "Downloading"
-msgstr ""
+msgstr "Download in corso"
msgid "Select mode"
msgstr ""
@@ -30156,7 +30302,7 @@ msgid "Total Mapillary images: {0}"
msgstr ""
msgid "No images found"
-msgstr ""
+msgstr "Nessuna immagine trovata"
msgid "Finished upload"
msgstr ""
@@ -31262,40 +31408,40 @@ msgid "coordinates"
msgstr "coordinate"
msgid "Latitude and longitude"
-msgstr ""
+msgstr "Latitudine e longitudine"
msgid "Edit Image Coordinates"
-msgstr ""
+msgstr "Modifica le coordinate dell''immagine"
msgid "Edit coordinates in separate editor"
msgstr ""
msgid "altitude"
-msgstr ""
+msgstr "altitudine"
msgid "Altitude:"
-msgstr ""
+msgstr "Altitudine:"
msgid "speed"
-msgstr ""
+msgstr "velocità"
msgid "positive number or empty"
msgstr ""
msgid "Speed:"
-msgstr ""
+msgstr "Velocità:"
msgid "direction"
-msgstr ""
+msgstr "direzione"
msgid "range -360.0 .. 360.0, or empty"
msgstr ""
msgid "Direction:"
-msgstr ""
+msgstr "Direzione:"
msgid "°"
-msgstr ""
+msgstr "°"
msgid "Undo changes made in this dialog"
msgstr ""
@@ -31878,6 +32024,15 @@ msgstr "Trasporto pubblico: Abilita punti del percorso"
msgid "Public Transport: Edit waypoint name"
msgstr "Trasporto pubblico: Modifica il nome del punto del percorso"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Selezione non valida"
+
msgid "Public transport routes"
msgstr ""
@@ -31891,7 +32046,7 @@ msgid "Visualize public transport routes"
msgstr ""
msgid "Filters"
-msgstr ""
+msgstr "Filtri"
msgid "Choose Filter"
msgstr ""
@@ -32159,7 +32314,7 @@ msgid "Show a selection of the most useful signs"
msgstr "Visualizza una selezione dei segnali più utili"
msgid "Belgium"
-msgstr ""
+msgstr "Belgio"
msgid "Spain"
msgstr "Spagna"
@@ -32720,9 +32875,6 @@ msgstr "Crea case a schiera da edificio"
msgid "Creates individual buildings from a long building."
msgstr "Crea edifici singoli da un edificio lungo"
-msgid "Invalid selection"
-msgstr "Selezione non valida"
-
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 "
@@ -32745,16 +32897,16 @@ msgid "Tool:To-fix"
msgstr ""
msgid "Skip"
-msgstr ""
+msgstr "Salta"
msgid "Skip Error"
msgstr ""
msgid "Fixed"
-msgstr ""
+msgstr "Corretto"
msgid "Fixed Error"
-msgstr ""
+msgstr "Errore corretto"
msgid "Not an error"
msgstr ""
@@ -34719,18 +34871,3 @@ msgstr "Inizia a guidare"
msgid "Drive a race car on this layer"
msgstr "Guida una macchina da corsa su questo livello"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Stile di tratteggio non valido, almeno un valore deve essere > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Stile di tratteggio non valido, i valori devono essere positivi"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Fallita l''analisi degli stili Mappaint da ''{0}''. L''errore è stato: "
-#~ "[{1}:{2}] {3}"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index c005649..b1c3ef3 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-03 07:08+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-14 15:14+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: 2016-03-13 04:51+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:49+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -156,9 +156,6 @@ msgstr "Java バージョン {0}"
msgid "Homepage"
msgstr "ホームページ"
-msgid "Bug Reports"
-msgstr "バグ報告"
-
msgid "Info"
msgstr "情報"
@@ -180,6 +177,12 @@ msgstr "プラグイン"
msgid "About JOSM..."
msgstr "JOSMについて..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "バグを報告"
+
msgid "Failed to locate resource ''{0}''."
msgstr "リソース ''{0}'' にアクセスできませんでした。"
@@ -583,9 +586,6 @@ msgstr "この画像レイヤーの位置を調整"
msgid "Adjust imagery offset"
msgstr "画像オフセットの調整"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1186,9 +1186,6 @@ msgstr "ファイル名も変更する"
msgid "Could not rename file ''{0}''"
msgstr "ファイル ''{0}'' をリネームできません"
-msgid "Report bug"
-msgstr "バグを報告"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "JOSMバグトラッカーにチケットを報告"
@@ -1800,6 +1797,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "ゆっくり進む"
+msgid "Downloading changeset content"
+msgstr "変更セットをダウンロード中"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "変更セット {2} をダウンロード中。({0}/{1})"
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "変更セット {2} の内容をダウンロード中。({0}/{1})"
+
+msgid "Download changesets"
+msgstr "変更セットをダウンロード"
+
+msgid "Querying and downloading changesets"
+msgstr "変更セットを問い合わせ及びダウンロード中"
+
+msgid "Determine user id for current user..."
+msgstr "現在のユーザー用のIDを決定..."
+
+msgid "Query and download changesets ..."
+msgstr "変更セットをクエリー及びダウンロード..."
+
+msgid "Errors during download"
+msgstr "ダウンロード中にエラー"
+
msgid "Download GPS"
msgstr "GPSをダウンロード"
@@ -1946,9 +1967,6 @@ msgstr "削除または移動されたオブジェクト"
msgid "The following errors occurred during mass download: {0}"
msgstr "一括ダウンロード中に次のエラーが発生: {0}"
-msgid "Errors during download"
-msgstr "ダウンロード中にエラー"
-
msgid "Error during download"
msgstr "ダウンロード中にエラー"
@@ -2270,8 +2288,8 @@ msgid "Add selection to relation"
msgstr "選択をリレーションに追加"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3053,9 +3071,6 @@ msgstr "ウェイ {0} のノードリスト中の競合を解決"
msgid "Main dataset does not include node {0}"
msgstr "主データセットはノード {0} を含んでいません"
-msgid "Apply?"
-msgstr "適用しますか？"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3076,27 +3091,6 @@ msgid ""
"maintain data consistency."
msgstr "このウェイを反転させると、データの一貫性を維持するために次の変更が提案されます。"
-msgid "Relation"
-msgstr "リレーション"
-
-msgid "Old role"
-msgstr "古いロール"
-
-msgid "New role"
-msgstr "新しいロール"
-
-msgid "Old key"
-msgstr "古いキー"
-
-msgid "Old value"
-msgstr "古い値"
-
-msgid "New key"
-msgstr "新しいキー"
-
-msgid "New value"
-msgstr "新しい値"
-
msgid "Apply selected changes"
msgstr "選択した変更を適用します"
@@ -4157,7 +4151,10 @@ msgid "Route relation contains a ''{0}'' role"
msgstr ""
msgid "Route relation contains a gap"
-msgstr ""
+msgstr "route リレーションが連続していない"
+
+msgid "Stop position not part of route"
+msgstr "stop_position が経路の一部ではない"
msgid "Role verification problem"
msgstr "ロール検証に問題"
@@ -4805,6 +4802,12 @@ msgstr "詳細デバッグレベル(トレース)を有効にしました"
msgid "Initializing"
msgstr "初期化中"
+msgid "Setting defaults"
+msgstr "デフォルト値を設定中"
+
+msgid "Creating main GUI"
+msgstr "メインGUIを作成中"
+
msgid "Updating plugins"
msgstr "プラグインを更新中"
@@ -4814,12 +4817,6 @@ msgstr "更新されたプラグインをインストール中"
msgid "Loading early plugins"
msgstr "早期読み込みプラグインのロード中"
-msgid "Setting defaults"
-msgstr "デフォルト値を設定中"
-
-msgid "Creating main GUI"
-msgstr "メインGUIを作成中"
-
msgid "Loading plugins"
msgstr "プラグインのロード中"
@@ -5795,6 +5792,30 @@ msgstr "競合のあるタグだけを表示"
msgid "Show tags with multiple values only"
msgstr "複数の値を持つタグのみを表示"
+msgid "Apply?"
+msgstr "適用しますか？"
+
+msgid "Relation"
+msgstr "リレーション"
+
+msgid "Old role"
+msgstr "古いロール"
+
+msgid "New role"
+msgstr "新しいロール"
+
+msgid "Old key"
+msgstr "古いキー"
+
+msgid "Old value"
+msgstr "古い値"
+
+msgid "New key"
+msgstr "新しいキー"
+
+msgid "New value"
+msgstr "新しい値"
+
msgid "For selected objects only"
msgstr "選択したオブジェクトのみ表示"
@@ -6293,51 +6314,6 @@ msgstr "レイヤー {0} の表示/非表示"
msgid "Open a list of all loaded layers."
msgstr "レイヤーの一覧"
-msgid "Delete the selected layers."
-msgstr "選択したレイヤーを削除します。"
-
-msgid "Show/hide"
-msgstr "表示/隠す"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "選択したレイヤーの表示・非表示を切り替えます。"
-
-msgid "Show/hide layer"
-msgstr "レイヤー表示/非表示"
-
-msgid "Opacity"
-msgstr "透明度"
-
-msgid "Adjust opacity of the layer."
-msgstr "レイヤーの透明度を調整"
-
-msgid "Gamma"
-msgstr "ガンマ"
-
-msgid "Adjust gamma value of the layer."
-msgstr "レイヤのガンマ値を調整します。"
-
-msgid "Activate"
-msgstr "有効化"
-
-msgid "Activate the selected layer"
-msgstr "選択されたレイヤーを有効化します"
-
-msgid "Activate layer"
-msgstr "アクティブレイヤー"
-
-msgid "Merge this layer into another layer"
-msgstr "このレイヤーを他のレイヤーに結合"
-
-msgid "Duplicate this layer"
-msgstr "このレイヤーを複製"
-
-msgid "Copy of {0}"
-msgstr "{0}のコピー"
-
-msgid "Copy {1} of {0}"
-msgstr "{0}のコピー({1})"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "レイヤーは現在表示中です(クリックで非表示)"
@@ -6360,12 +6336,6 @@ msgstr "他のレイヤーにおける本来の解像度で表示（クリック
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "選択したレイヤーを一つ上に移動します。"
-
-msgid "Move the selected layer one row down."
-msgstr "選択したレイヤーを一つ下に移動します。"
-
msgid "Information about layer"
msgstr "レイヤーについての情報"
@@ -6791,15 +6761,6 @@ msgstr "保存日時"
msgid "Discussions"
msgstr "議論"
-msgid "Downloading changeset content"
-msgstr "変更セットをダウンロード中"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "変更セット {2} をダウンロード中。({0}/{1})"
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "変更セット {2} の内容をダウンロード中。({0}/{1})"
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6904,9 +6865,6 @@ msgstr "OSMサーバーから変更セットの議論を更新"
msgid "Date"
msgstr "日付"
-msgid "Download changesets"
-msgstr "変更セットをダウンロード"
-
msgid "{0} [incomplete]"
msgstr "{0}[未完了]"
@@ -7058,14 +7016,6 @@ msgid "Please enter an integer value > 0"
msgstr "1以上の整数を入力してください。"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr "<html>不正なユーザー名です。<br>ユーザー名は空白以外を指定してください。</html>"
-
-msgid "Please enter an non-empty user name"
-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>"
@@ -7158,15 +7108,6 @@ msgstr "不正な変更セットクエリーURLです"
msgid "Close the dialog and abort querying of changesets"
msgstr "ダイアログを閉じて変更セットのクエリを終了します"
-msgid "Querying and downloading changesets"
-msgstr "変更セットを問い合わせ及びダウンロード中"
-
-msgid "Determine user id for current user..."
-msgstr "現在のユーザー用のIDを決定..."
-
-msgid "Query and download changesets ..."
-msgstr "変更セットをクエリー及びダウンロード..."
-
msgid "URL: "
msgstr "URL: "
@@ -7184,6 +7125,75 @@ msgstr "変更セットクエリは現状では常に ''{0}'' に投稿されま
msgid "This changeset query URL is invalid"
msgstr "この変更セットクエリURLは不正です"
+msgid "Activate"
+msgstr "有効化"
+
+msgid "Activate the selected layer"
+msgstr "選択されたレイヤーを有効化します"
+
+msgid "Activate layer"
+msgstr "アクティブレイヤー"
+
+msgid "Delete the selected layers."
+msgstr "選択したレイヤーを削除します。"
+
+msgid "Duplicate this layer"
+msgstr "このレイヤーを複製"
+
+msgid "Copy of {0}"
+msgstr "{0}のコピー"
+
+msgid "Copy {1} of {0}"
+msgstr "{0}のコピー({1})"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "レイヤーの透明度を調整"
+
+msgid "Opacity"
+msgstr "透明度"
+
+msgid "Adjust gamma value of the layer."
+msgstr "レイヤのガンマ値を調整します。"
+
+msgid "Gamma"
+msgstr "ガンマ"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr "鮮明度"
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "このレイヤーを他のレイヤーに結合"
+
+msgid "Move the selected layer one row down."
+msgstr "選択したレイヤーを一つ下に移動します。"
+
+msgid "Move the selected layer one row up."
+msgstr "選択したレイヤーを一つ上に移動します。"
+
+msgid "Show/hide"
+msgstr "表示/隠す"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "選択したレイヤーの表示・非表示を切り替えます。"
+
+msgid "Show/hide layer"
+msgstr "レイヤー表示/非表示"
+
msgid "Discardable key: selection Foreground"
msgstr "削除可能なキー: 選択の前景色"
@@ -7262,7 +7272,7 @@ msgid "Edit Tags"
msgstr "タグを編集"
msgid "Go to OSM wiki for tag help"
-msgstr "タグの説明を OSM ウィきで見る"
+msgstr "タグの説明を OSM ウィキで見る"
msgid "Launch browser with wiki help for selected object"
msgstr "選択されたオブジェクトのためのwikiヘルプのためにブラウザーを起動"
@@ -7421,7 +7431,7 @@ msgid "Ignore tag ''{0}''"
msgstr ""
msgid "Edit ignore list"
-msgstr ""
+msgstr "無視リストを編集"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr "''{0}''の値を''{1}''から''{2}''に変更しました。"
@@ -7489,12 +7499,12 @@ msgstr "親リレーション"
msgid "Child Relations"
msgstr "子リレーション"
-msgid "Apply Role:"
-msgstr "ロールを適用"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "ロールを入力して選択されたリレーションメンバーに適用"
+msgid "Apply Role:"
+msgstr "ロールを適用"
+
msgid "New Relation"
msgstr "新しいリレーション"
@@ -9208,9 +9218,6 @@ msgstr "画像の混合色"
msgid "Unsupported imagery type: {0}"
msgstr "サポートされていない画像種別: {0}"
-msgid "ERROR"
-msgstr "ERROR"
-
msgid "Next marker"
msgstr "次のマーカー"
@@ -10041,12 +10048,6 @@ msgstr "自動認証手順を再実行"
msgid "Test Access Token"
msgstr "アクセストークンをテスト"
-msgid "Please enter your OSM user name"
-msgstr "あなたのOSMユーザー名を入力してください"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "ユーザー名は空白にできません。あなたのOSMユーザー名を入力してください。"
-
msgid "Please enter your OSM password"
msgstr "あなたのOSMパスワードを入力してください"
@@ -12118,6 +12119,12 @@ msgstr "接続設定"
msgid "Connection Settings for the OSM server."
msgstr "OSMサーバーへの接続設定"
+msgid "Please enter your OSM user name"
+msgstr "あなたのOSMユーザー名を入力してください"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "ユーザー名は空白にできません。あなたのOSMユーザー名を入力してください。"
+
msgid "Action"
msgstr "アクション"
@@ -12635,6 +12642,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr "サーバー能力において要素''{1}''の属性''{0}''に不正な値''{2}''が設定されています"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "サーバーから返されたデータ ''{0}'' が解析できません"
@@ -13880,73 +13895,13 @@ msgid "Processing plugin list from site ''{0}''"
msgstr "サイト ''{0}'' からのプラグインリストを処理しています"
msgid "This is after the end of the recording"
-msgstr "これは記録の最後より後ろにあります。"
-
-msgid "unspecified reason"
-msgstr "不明な理由"
-
-msgid "Error playing sound"
-msgstr "サウンドの再生でエラーが発生しています"
-
-msgid "Do nothing"
-msgstr "何もしない"
-
-msgid "Report Bug"
-msgstr "バグを報告する"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"予期せぬ例外が発生。<br>これはたいていコーディングエラーです。最新の<br>JOSMを実行している場合は、おおらかな気持ちでバグレポートをファイルして"
-"ください。"
-
-msgid "Update JOSM"
-msgstr "JOSMの更新"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"予期しない例外が発生しました。これはコーディングエラーです。<br><br>ただし、あなたはJOSMの最新のテスト済みバージョン(<b>{1}</b>)で"
-"はなく<br>古いバージョン({0})を実行しています。<br><br>バグを報告しようとする前に、<b>JOSMをアップデートしてください</b>。"
-
-msgid "Unexpected Exception"
-msgstr "予想外の例外"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "このセッションにおいて、これ以降のエラーダイアログを抑制します。"
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr "JOSMでエラーが発生しました。バグレポートをファイルする前にJOSMの最新バージョンに更新したかどうかこちらで確認してください:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr "プラグインも更新する必要があります。どちらも役に立たない場合はこのリンクを使ってバグトラッカーにバグレポートをファイルしてください:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr "下記エラー情報には既にあなたのために情報が埋められています。エラーを再現するための情報をできるだけ詳細に追加してみてください。"
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr "ちゃんと機能していない場合は、代わりに次のURLで手作業で情報を入力できます:"
+msgstr "これは記録の最後より後ろにあります。"
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(テキストはクリップボードにコピーされています。)"
+msgid "unspecified reason"
+msgstr "不明な理由"
-msgid "You have encountered a bug in JOSM"
-msgstr "JOSMのバグです"
+msgid "Error playing sound"
+msgstr "サウンドの再生でエラーが発生しています"
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
@@ -14244,9 +14199,6 @@ msgstr "ダウンロードは ''{0}'' にリダイレクトされました"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "ダウンロードURLに対するリダイレクトが多すぎます。異常終了します。"
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14438,6 +14390,70 @@ msgstr "不正な形の図形 {0} を無視しました。"
msgid "Failed to load XML schema."
msgstr "XMLスキーマのロードに失敗。"
+msgid "Do nothing"
+msgstr "何もしない"
+
+msgid "Report Bug"
+msgstr "バグを報告する"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"予期せぬ例外が発生。<br>これはたいていコーディングエラーです。最新の<br>JOSMを実行している場合は、おおらかな気持ちでバグレポートをファイルして"
+"ください。"
+
+msgid "Update JOSM"
+msgstr "JOSMの更新"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"予期しない例外が発生しました。これはコーディングエラーです。<br><br>ただし、あなたはJOSMの最新のテスト済みバージョン(<b>{1}</b>)で"
+"はなく<br>古いバージョン({0})を実行しています。<br><br>バグを報告しようとする前に、<b>JOSMをアップデートしてください</b>。"
+
+msgid "Suppress further error dialogs for this session."
+msgstr "このセッションにおいて、これ以降のエラーダイアログを抑制します。"
+
+msgid "Unexpected Exception"
+msgstr "予想外の例外"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "JOSMのバグです"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr "JOSMでエラーが発生しました。バグレポートをファイルする前にJOSMの最新バージョンに更新したかどうかこちらで確認してください:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr "プラグインも更新する必要があります。どちらも役に立たない場合はこのリンクを使ってバグトラッカーにバグレポートをファイルしてください:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr "下記エラー情報には既にあなたのために情報が埋められています。エラーを再現するための情報をできるだけ詳細に追加してみてください。"
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr "ちゃんと機能していない場合は、代わりに次のURLで手作業で情報を入力できます:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(テキストはクリップボードにコピーされています。)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14774,14 +14790,14 @@ msgstr "Mapbox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS トレース"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap （標準レイヤー）"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Black & White)"
@@ -14789,8 +14805,14 @@ msgstr "OpenStreetMap (Mapnik Black & White)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, no labels)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (French Style)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (German Style)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS トレース"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -14801,15 +14823,12 @@ msgstr "Public Transport (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (German Style)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -14906,6 +14925,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -14930,14 +14952,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: Echtfarbenbild 2015 (10cm)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Terrain model)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: Höhen und Gelände"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15083,11 +15105,11 @@ msgstr "Géolittoral V2 - Orthophotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr ""
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr ""
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15141,6 +15163,15 @@ msgstr "Bavaria (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Berlin aerial photograph 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Berlin aerial photograph 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Berlin aerial photograph 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (aerial imagery)"
@@ -15156,17 +15187,6 @@ msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Physical map (natural regions)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Physical map (natural regions)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15212,6 +15232,9 @@ msgstr "Törökbálint ortophoto 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 "Danube flood ortophoto 2013"
msgstr "Danube flood ortophoto 2013"
@@ -15272,6 +15295,9 @@ msgstr "OSMIE T.ie Land not in Counties"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Lombardia - Italy (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardia - Italy (CTR DBT)"
@@ -15308,11 +15334,8 @@ msgstr "1.cikla ortofotokarte - Latvia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Railway"
@@ -15413,6 +15436,9 @@ msgstr "Powiat poznański: Budynki (buildings)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (Aerial image)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (buildings)"
@@ -15422,6 +15448,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (Aerial image)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (buildings)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (buildings)"
@@ -16096,6 +16125,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr "現在のレイヤーのオブジェクトに関する拡張情報のポップアップ - 現在は GPX 測位点の情報"
@@ -16594,7 +16628,7 @@ msgid "Service type"
msgstr "線路の種別"
msgid "yard"
-msgstr "ヤード"
+msgstr "車両基地"
msgid "siding"
msgstr "側線"
@@ -17474,6 +17508,12 @@ msgstr "ストリート"
msgid "Motorway"
msgstr "自動車専用道路"
+msgid "Destination"
+msgstr "目的地"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr "配置"
@@ -18050,9 +18090,6 @@ msgstr "自動車道のIC/JCT"
msgid "Number"
msgstr "番号"
-msgid "Exit to"
-msgstr "出口方面"
-
msgid "Services"
msgstr "サービスエリア"
@@ -18533,6 +18570,15 @@ msgstr "干潟"
msgid "mangrove"
msgstr "マングローブ"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "泥地"
@@ -19130,7 +19176,7 @@ msgid "Public Transport"
msgstr "公共交通"
msgid "Public Transport Route (Rail)"
-msgstr ""
+msgstr "路線（鉄道）"
msgid "Route type"
msgstr "ルート種類"
@@ -19166,7 +19212,7 @@ msgid "route segment"
msgstr "ルート区間"
msgid "Public Transport Route (Bus)"
-msgstr ""
+msgstr "路線(バス)"
msgid "trolleybus"
msgstr "トロリーバス"
@@ -19681,6 +19727,9 @@ msgstr "焚火場所"
msgid "Fishing"
msgstr "つり場"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "ナイトクラブ"
@@ -20026,7 +20075,7 @@ msgid "Indoor"
msgstr "室内"
msgid "Fire Hose"
-msgstr ""
+msgstr "消火ホース"
msgid "Fire Hydrant"
msgstr "消火栓"
@@ -20079,10 +20128,10 @@ msgid "Count"
msgstr "本数"
msgid "Water Tank"
-msgstr ""
+msgstr "防火用水タンク"
msgid "Volume (in liters)"
-msgstr ""
+msgstr "容量（リットル単位）"
msgid "Assembly Point"
msgstr ""
@@ -20100,16 +20149,16 @@ msgid "electronic"
msgstr "電気"
msgid "mechanical"
-msgstr ""
+msgstr "機械式"
msgid "Purpose"
-msgstr ""
+msgstr "用途"
msgid "tornado"
-msgstr ""
+msgstr "竜巻"
msgid "fire"
-msgstr ""
+msgstr "火事"
msgid "air_raid"
msgstr ""
@@ -20118,7 +20167,7 @@ msgid "civil_defense"
msgstr ""
msgid "Range (in meters)"
-msgstr ""
+msgstr "範囲（メートル単位）"
msgid "Social Facility"
msgstr ""
@@ -20189,10 +20238,10 @@ msgstr "小便器"
msgctxt "toilets"
msgid "Diaper"
-msgstr ""
+msgstr "おむつ交換台"
msgid "room"
-msgstr ""
+msgstr "個室"
msgid "Post Box"
msgstr "郵便ポスト"
@@ -20830,7 +20879,7 @@ msgstr "オフィスビル"
msgctxt "building"
msgid "service"
-msgstr ""
+msgstr "機械室"
msgctxt "building"
msgid "train_station"
@@ -20842,7 +20891,7 @@ msgstr "納屋"
msgctxt "building"
msgid "stable"
-msgstr ""
+msgstr "馬小屋"
msgctxt "building"
msgid "cabin"
@@ -20946,6 +20995,10 @@ msgstr "シナゴーグ"
msgctxt "building"
msgid "transformer_tower"
+msgstr "変電塔"
+
+msgctxt "building"
+msgid "public"
msgstr ""
msgctxt "building"
@@ -21920,7 +21973,7 @@ msgid "Power Street Cabinet"
msgstr ""
msgid "Transformer Tower"
-msgstr ""
+msgstr "変電塔"
msgid "Power Portal"
msgstr ""
@@ -22432,7 +22485,7 @@ msgid "Beauty"
msgstr "美容"
msgid "Tobacco"
-msgstr ""
+msgstr "たばこ"
msgid "Hairdresser/Barber"
msgstr "理美容店"
@@ -22536,8 +22589,8 @@ msgstr "糞袋"
msgid "food"
msgstr "食品"
-msgid "news_papers"
-msgstr "新聞"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "パーキングチケット"
@@ -22551,8 +22604,8 @@ msgstr "時刻表"
msgid "public_transport_tickets"
msgstr "乗車券"
-msgid "SIM-cards"
-msgstr "携帯の契約"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "切手"
@@ -22763,52 +22816,52 @@ msgid "Telecommunication"
msgstr "通信会社"
msgid "Craft"
-msgstr ""
+msgstr "工房"
msgid "Carpenter"
-msgstr ""
+msgstr "工務店"
msgid "Shoemaker"
-msgstr ""
+msgstr "靴工場"
msgid "Photographer"
-msgstr ""
+msgstr "写真スタジオ"
msgid "Metal construction"
-msgstr ""
+msgstr "金属加工所"
msgid "Electrician"
-msgstr ""
+msgstr "電気工事店"
msgid "Brewery"
-msgstr ""
+msgstr "地ビール醸造所"
msgid "Plumber"
-msgstr ""
+msgstr "水道工事店"
msgid "Sawmill"
-msgstr ""
+msgstr "製材所"
msgid "Gardener"
-msgstr ""
+msgstr "造園"
msgid "Winery"
-msgstr ""
+msgstr "ワイン製造所"
msgid "Hvac"
-msgstr ""
+msgstr "空調設備"
msgid "Painter"
-msgstr ""
+msgstr "塗装店"
msgid "Stonemason"
-msgstr ""
+msgstr "石材加工店"
msgid "Handicraft"
msgstr ""
msgid "Pottery"
-msgstr ""
+msgstr "窯元"
msgid "Key cutter"
msgstr ""
@@ -22817,25 +22870,25 @@ msgid "Caterer"
msgstr ""
msgid "Roofer"
-msgstr ""
+msgstr "屋根屋"
msgid "Beekeeper"
-msgstr ""
+msgstr "養蜂場"
msgid "Blacksmith"
-msgstr ""
+msgstr "鍛冶場"
msgid "Locksmith"
-msgstr ""
+msgstr "錠前屋"
msgid "Window construction"
msgstr ""
msgid "Upholsterer"
-msgstr ""
+msgstr "家具製造所"
msgid "Tiler"
-msgstr ""
+msgstr "タイル店"
msgid "Geography"
msgstr "地理"
@@ -23278,7 +23331,7 @@ msgid "Grass"
msgstr "芝生"
msgid "Village Green"
-msgstr "里山"
+msgstr "緑地公園"
msgid "Common"
msgstr "共有地"
@@ -23807,6 +23860,21 @@ msgstr "自然"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "スキールート"
@@ -23831,9 +23899,6 @@ msgstr "アルペン"
msgid "Detour Route"
msgstr "回り道"
-msgid "Destination"
-msgstr "目的地"
-
msgid "Ref of the way this is a detour to"
msgstr "迂回元道路の参照"
@@ -23993,8 +24058,14 @@ msgstr "キャンプ場"
msgid "Test"
msgstr "テスト"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "住所の補完で住居番号が減少している"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0}があるのに{1}がない"
@@ -24077,6 +24148,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24175,6 +24251,9 @@ msgstr "{0} はウェイに接続している必要があります"
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24184,6 +24263,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "通り名が略称になっている"
@@ -27440,6 +27527,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -27835,7 +27982,7 @@ msgid "Could not read font-file from ''{0}''"
msgstr ""
msgid "Mapillary"
-msgstr ""
+msgstr "Mapillary"
msgid "Create Mapillary layer"
msgstr ""
@@ -28622,10 +28769,10 @@ msgid "XLS files"
msgstr "XLSファイル"
msgid "View OSM Wiki page"
-msgstr "OSMのWikiページを見る"
+msgstr "OSM のウィキページを見る"
msgid "Launch browser to the OSM Wiki page of the selected data set"
-msgstr "選択されたデータセットのOSMのWikiページをブラウザーで開く"
+msgstr "選択されたデータセットの OSM のウィキページをブラウザーで開く"
msgid "View Local Portal page"
msgstr "地域ポータルページを見る"
@@ -29782,6 +29929,15 @@ msgstr "公共交通: ウェイポイントを有効化"
msgid "Public Transport: Edit waypoint name"
msgstr "公共交通: ウェイポイント名を編集"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "選択が無効です"
+
msgid "Public transport routes"
msgstr ""
@@ -30576,9 +30732,6 @@ msgstr "建物のテラス"
msgid "Creates individual buildings from a long building."
msgstr "長い建物から個別の建物を生成"
-msgid "Invalid selection"
-msgstr "選択が無効です"
-
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 "
@@ -32393,16 +32546,3 @@ msgstr "ドライブに行く"
msgid "Drive a race car on this layer"
msgstr "このレイヤーでレースカーをドライブします。"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "不正なマイナス符号、値は正でないといけません。"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr "''{0}''から地図描画スタイルの解析に失敗しました。エラー: [{1}:{2}] {3}"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "不正なマイナス符号。1以上の正の値にしてください。"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 7cf9fa0..38406a4 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:43+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:43+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "ჯავას ვერსია {0}"
msgid "Homepage"
msgstr "მთავარი გვერდი"
-msgid "Bug Reports"
-msgstr "პატაკი შეცდომებზე"
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr "JOSM-ის შესახებ"
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -579,9 +582,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1171,9 +1171,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1783,6 +1780,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1932,9 +1953,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2250,8 +2268,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3032,9 +3050,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3054,27 +3069,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4132,6 +4126,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4777,6 +4774,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "ინტერფეისის შექმნა"
+
msgid "Updating plugins"
msgstr ""
@@ -4786,12 +4789,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "ინტერფეისის შექმნა"
-
msgid "Loading plugins"
msgstr ""
@@ -5762,6 +5759,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6249,51 +6270,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6316,12 +6292,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6744,15 +6714,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6858,9 +6819,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7012,14 +6970,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7104,15 +7054,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7130,6 +7071,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7445,10 +7455,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9104,9 +9114,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9909,12 +9916,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11922,6 +11923,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12432,6 +12439,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13673,62 +13688,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13980,9 +13939,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14167,6 +14123,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14501,13 +14517,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14516,7 +14532,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14528,15 +14550,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14633,6 +14652,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14657,13 +14679,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14810,10 +14832,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14866,29 +14888,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14936,6 +14957,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14996,6 +15020,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15032,10 +15059,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15137,6 +15161,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15146,6 +15173,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15801,6 +15831,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17158,6 +17193,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17734,9 +17775,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18215,6 +18253,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19363,6 +19410,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20631,6 +20681,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22218,7 +22272,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22233,7 +22287,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23488,6 +23542,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23512,9 +23581,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23674,7 +23740,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23758,6 +23830,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23856,6 +23933,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23865,6 +23945,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26964,6 +27052,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29285,6 +29433,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30069,9 +30226,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 04483d6..a2752b7 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:51+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:50+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -151,9 +151,6 @@ msgstr "កំណែ Java {0}"
msgid "Homepage"
msgstr "គេហទំព័រ"
-msgid "Bug Reports"
-msgstr "របាយការណ៍កំហុស"
-
msgid "Info"
msgstr "ព័ត៌មាន"
@@ -175,6 +172,12 @@ msgstr "កម្មវិធីជំនួយខាងក្នុង
msgid "About JOSM..."
msgstr "អំពី JOSM..."
+msgid "OK"
+msgstr "យល់ព្រម"
+
+msgid "Report bug"
+msgstr "រាយការណ៍កំហុស"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -590,9 +593,6 @@ msgstr "លៃតម្រូវទីតាំងស្រទាប់
msgid "Adjust imagery offset"
msgstr "លៃតម្រូវអុហ្វសិតរូបភាពនេះ"
-msgid "OK"
-msgstr "យល់ព្រម"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1241,9 +1241,6 @@ msgstr "ប្ដូរឈ្មោះឯកសារផងដែរ
msgid "Could not rename file ''{0}''"
msgstr "មិនអាចប្ដូរឈ្មោះឯកសារ ''{0}''"
-msgid "Report bug"
-msgstr "រាយការណ៍កំហុស"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "រាយការណ៍សំបុត្រទៅកាន់កម្មវិធីតាមដានកំហុស JOSM"
@@ -1896,6 +1893,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "ទៅមុខយឺតជាង"
+msgid "Downloading changeset content"
+msgstr "ការទាញយកមាតិកាសំណុំផ្លាស់ប្ដូរ"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) កំពុងទាញយកសំណុំផ្លាស់ប្ដូរ {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) កំពុងទាញយកមាតិការសម្រាប់សំណុំផ្លាស់ប្ដូរ {2}..."
+
+msgid "Download changesets"
+msgstr "ទាញយកសំណុំផ្លាស់ប្ដូរ"
+
+msgid "Querying and downloading changesets"
+msgstr "ការជ្រើស និងការទាញយកសំណុំផ្លាស់ប្ដូរ"
+
+msgid "Determine user id for current user..."
+msgstr "កំណត់លេខសម្គាល់សម្រាប់អ្នកប្រើបច្ចុប្បន្ន..."
+
+msgid "Query and download changesets ..."
+msgstr "ជ្រើស និងទាញយកសំណុំផ្លាស់ប្ដូរ..."
+
+msgid "Errors during download"
+msgstr "កំហុសពេលទាញយក"
+
msgid "Download GPS"
msgstr "ទាញយកជីភីអេស"
@@ -2048,9 +2069,6 @@ msgstr "វត្ថុដែលបានលុប ឬបាន
msgid "The following errors occurred during mass download: {0}"
msgstr "កំហុសខាងក្រោមបានកើតឡើងពេលទាញយក៖ {0}"
-msgid "Errors during download"
-msgstr "កំហុសពេលទាញយក"
-
msgid "Error during download"
msgstr "កំហុសពេលទាញយក"
@@ -2390,8 +2408,8 @@ msgid "Add selection to relation"
msgstr "បន្ថែមជ្រើសទៅទំនាក់ទំនង"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3201,9 +3219,6 @@ msgstr "ដោះស្រាយការប៉ះទង្គិចន
msgid "Main dataset does not include node {0}"
msgstr "សំណុំទិន្នន័យមេមិនរួមបញ្ចូលតំណ {0}"
-msgid "Apply?"
-msgstr "អនុវត្ត?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3229,27 +3244,6 @@ msgstr ""
"វានឹងមានការស្នើសុំការផ្លាស់ប្ដូរដូចខាងក្រោមដើម្បីថែរក្សាភាពប្រក្"
"រតីនៃទិន្នន័យ។"
-msgid "Relation"
-msgstr "ទំនាក់ទំនង"
-
-msgid "Old role"
-msgstr "តួនាទីចាស់"
-
-msgid "New role"
-msgstr "តួនាទីថ្មី"
-
-msgid "Old key"
-msgstr "កូនសោចាស់"
-
-msgid "Old value"
-msgstr "តម្លៃចាស់"
-
-msgid "New key"
-msgstr "កូនសោថ្មី"
-
-msgid "New value"
-msgstr "តម្លៃថ្មី"
-
msgid "Apply selected changes"
msgstr "អនុវត្តការផ្លាស់ប្ដូរដែលបានជ្រើស"
@@ -4379,6 +4373,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "បញ្ហាការបញ្ជាក់តួនាទី"
@@ -5053,6 +5050,12 @@ msgstr "បានបើកកម្រិតបំបាត់កំ
msgid "Initializing"
msgstr "កំពុងចាប់ផ្តើម"
+msgid "Setting defaults"
+msgstr "ការកំណត់លំនាំដើម"
+
+msgid "Creating main GUI"
+msgstr "បង្កើត GUI ដើម"
+
msgid "Updating plugins"
msgstr "ការធ្វើបច្ចុប្បន្នភាពកម្មវិធីជំនួយ"
@@ -5062,12 +5065,6 @@ msgstr "ការដំឡើងកម្មវិធីជំនួយ
msgid "Loading early plugins"
msgstr "ការផ្ទុកកម្មវិធីជំនួយថ្មី"
-msgid "Setting defaults"
-msgstr "ការកំណត់លំនាំដើម"
-
-msgid "Creating main GUI"
-msgstr "បង្កើត GUI ដើម"
-
msgid "Loading plugins"
msgstr "ការផ្ទុកកម្មវិធីជំនួយ"
@@ -6125,6 +6122,30 @@ msgstr "បង្ហាញតែស្លាកដែលប៉ះទ
msgid "Show tags with multiple values only"
msgstr "បង្ហាញតែស្លាកដែលមានតម្លៃច្រើនប៉ុណ្ណោះ"
+msgid "Apply?"
+msgstr "អនុវត្ត?"
+
+msgid "Relation"
+msgstr "ទំនាក់ទំនង"
+
+msgid "Old role"
+msgstr "តួនាទីចាស់"
+
+msgid "New role"
+msgstr "តួនាទីថ្មី"
+
+msgid "Old key"
+msgstr "កូនសោចាស់"
+
+msgid "Old value"
+msgstr "តម្លៃចាស់"
+
+msgid "New key"
+msgstr "កូនសោថ្មី"
+
+msgid "New value"
+msgstr "តម្លៃថ្មី"
+
msgid "For selected objects only"
msgstr "សម្រាប់តែវត្ថុដែលបានជ្រើសប៉ុណ្ណោះ"
@@ -6640,51 +6661,6 @@ msgstr "បិទ/បើកលទ្ធភាពមើលឃើញន
msgid "Open a list of all loaded layers."
msgstr "បើកបញ្ជីស្រទាប់ទាំងអស់ដែលបានផ្ទុក។"
-msgid "Delete the selected layers."
-msgstr "លុបស្រទាប់ដែលបានជ្រើស។"
-
-msgid "Show/hide"
-msgstr "បង្ហាញ/លាក់"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "បិទ/បើកសភាពមើលឃើញនៃស្រទាប់ដែលបានជ្រើស។"
-
-msgid "Show/hide layer"
-msgstr "បង្ហាញ/លាក់ស្រទាប់"
-
-msgid "Opacity"
-msgstr "ភាពស្រអាប់"
-
-msgid "Adjust opacity of the layer."
-msgstr "លៃតម្រូវភាពស្រអាប់នៃស្រទាប់។"
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "ធ្វើឲ្យសកម្ម"
-
-msgid "Activate the selected layer"
-msgstr "ធ្វើឲ្យស្រទាប់ដែលបានជ្រើសសកម្ម"
-
-msgid "Activate layer"
-msgstr "ធ្វើឲ្យស្រទាប់សកម្ម"
-
-msgid "Merge this layer into another layer"
-msgstr "បញ្ចូលស្រទាប់នេះទៅក្នុងស្រទាប់ផ្សេងទៀត"
-
-msgid "Duplicate this layer"
-msgstr "ស្ទួនស្រទាប់នេះ"
-
-msgid "Copy of {0}"
-msgstr "ចម្លង {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "ចម្លង {1} នៃ {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "ស្រទាប់បច្ចុប្បន្នគឺមើលឃើញ (ចុចដើម្បីលាក់)"
@@ -6707,12 +6683,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "ផ្លាស់ទីស្រទាប់ដែលបានជ្រើសឡើងលើមួយជួរដេក។"
-
-msgid "Move the selected layer one row down."
-msgstr "ផ្លាស់ទីស្រទាប់ដែលបានជ្រើសចុះក្រោមមួយជួរដេក។"
-
msgid "Information about layer"
msgstr "ព័ត៌មានស្រទាប់"
@@ -7150,15 +7120,6 @@ msgstr "បានបិទនៅ"
msgid "Discussions"
msgstr "ការពិភាក្សា"
-msgid "Downloading changeset content"
-msgstr "ការទាញយកមាតិកាសំណុំផ្លាស់ប្ដូរ"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) កំពុងទាញយកសំណុំផ្លាស់ប្ដូរ {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) កំពុងទាញយកមាតិការសម្រាប់សំណុំផ្លាស់ប្ដូរ {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7272,9 +7233,6 @@ msgstr "ធ្វើបច្ចុប្បន្នភាពការ
msgid "Date"
msgstr "កាលបរិច្ឆេទ"
-msgid "Download changesets"
-msgstr "ទាញយកសំណុំផ្លាស់ប្ដូរ"
-
msgid "{0} [incomplete]"
msgstr "{0} [មិនបញ្ចប់]"
@@ -7455,16 +7413,6 @@ msgid "Please enter an integer value > 0"
msgstr "សូមបញ្ចូលតម្លៃចំនួនគត់ > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>តម្លៃបច្ចុប្បន្នមិនមែនជាឈ្មោះអ្នកប្រើត្រឹមត្រូវ។<br>សូមបញ្ចូលឈ្"
-"មោះអ្នកប្រើដែលមិនទទេ។</html>"
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7569,15 +7517,6 @@ msgstr "URL ការជ្រើសសំណុំផ្លាស់
msgid "Close the dialog and abort querying of changesets"
msgstr "បិទប្រអប់ រួចបោះបង់ការជ្រើសសំណុំផ្លាស់ប្ដូរ"
-msgid "Querying and downloading changesets"
-msgstr "ការជ្រើស និងការទាញយកសំណុំផ្លាស់ប្ដូរ"
-
-msgid "Determine user id for current user..."
-msgstr "កំណត់លេខសម្គាល់សម្រាប់អ្នកប្រើបច្ចុប្បន្ន..."
-
-msgid "Query and download changesets ..."
-msgstr "ជ្រើស និងទាញយកសំណុំផ្លាស់ប្ដូរ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7598,6 +7537,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "URL ការជ្រើសសំណុំផ្លាស់ប្ដូរនេះមិនត្រឹមត្រូវ"
+msgid "Activate"
+msgstr "ធ្វើឲ្យសកម្ម"
+
+msgid "Activate the selected layer"
+msgstr "ធ្វើឲ្យស្រទាប់ដែលបានជ្រើសសកម្ម"
+
+msgid "Activate layer"
+msgstr "ធ្វើឲ្យស្រទាប់សកម្ម"
+
+msgid "Delete the selected layers."
+msgstr "លុបស្រទាប់ដែលបានជ្រើស។"
+
+msgid "Duplicate this layer"
+msgstr "ស្ទួនស្រទាប់នេះ"
+
+msgid "Copy of {0}"
+msgstr "ចម្លង {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "ចម្លង {1} នៃ {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "លៃតម្រូវភាពស្រអាប់នៃស្រទាប់។"
+
+msgid "Opacity"
+msgstr "ភាពស្រអាប់"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "បញ្ចូលស្រទាប់នេះទៅក្នុងស្រទាប់ផ្សេងទៀត"
+
+msgid "Move the selected layer one row down."
+msgstr "ផ្លាស់ទីស្រទាប់ដែលបានជ្រើសចុះក្រោមមួយជួរដេក។"
+
+msgid "Move the selected layer one row up."
+msgstr "ផ្លាស់ទីស្រទាប់ដែលបានជ្រើសឡើងលើមួយជួរដេក។"
+
+msgid "Show/hide"
+msgstr "បង្ហាញ/លាក់"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "បិទ/បើកសភាពមើលឃើញនៃស្រទាប់ដែលបានជ្រើស។"
+
+msgid "Show/hide layer"
+msgstr "បង្ហាញ/លាក់ស្រទាប់"
+
msgid "Discardable key: selection Foreground"
msgstr "ពាក្យគន្លឹះដែលអាចបោះបង់បាន៖ ជម្រើសផ្ទៃខាងមុខ"
@@ -7912,12 +7920,12 @@ msgstr "ទំនាក់ទំនងមេ"
msgid "Child Relations"
msgstr "ទំនាក់ទំនងកូន"
-msgid "Apply Role:"
-msgstr "អនុវត្តតួនាទី៖"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "បញ្ចូលតួនាទី រួចអនុវត្តវាទៅសមាជិកទំនាក់ទំនងដែលបានជ្រើស"
+msgid "Apply Role:"
+msgstr "អនុវត្តតួនាទី៖"
+
msgid "New Relation"
msgstr "ទំនាក់ទំនងថ្មី"
@@ -9778,9 +9786,6 @@ msgstr "រូបភាពថយពណ៌"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "កំហុស"
-
msgid "Next marker"
msgstr "អ្នកធ្វើបន្ទាប់"
@@ -10662,13 +10667,6 @@ msgstr "ដំណើរការជំហានអនុញ្ញាត
msgid "Test Access Token"
msgstr "សាកល្បងថូខឹនចូលដំណើរការ"
-msgid "Please enter your OSM user name"
-msgstr "សូមបញ្ចូលឈ្មោះអ្នកប្រើ OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"ឈ្មោះអ្នកប្រើមិនអាចទទេបានឡើយ។ សូមបញ្ចូលឈ្មោះអ្នកប្រើ OSM របស់អ្នក"
-
msgid "Please enter your OSM password"
msgstr "សូមបញ្ចូលពាក្យសម្ងាត់ OSM"
@@ -12915,6 +12913,13 @@ msgstr "កំណត់ការតភ្ជាប់"
msgid "Connection Settings for the OSM server."
msgstr "កំណត់ការតភ្ជាប់សម្រាប់ម៉ាស៊ីនមេ OSM ។"
+msgid "Please enter your OSM user name"
+msgstr "សូមបញ្ចូលឈ្មោះអ្នកប្រើ OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"ឈ្មោះអ្នកប្រើមិនអាចទទេបានឡើយ។ សូមបញ្ចូលឈ្មោះអ្នកប្រើ OSM របស់អ្នក"
+
msgid "Action"
msgstr "សកម្មភាព"
@@ -13473,6 +13478,14 @@ msgstr ""
"តម្លៃមិនត្រឹមត្រូវនៃគុណលក្ខណៈ ''{0}'' របស់ធាតុ ''{1}'' "
"នៅក្នុងសមត្ថភាពម៉ាស៊ីនមេ។ បានទទួល ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
"បានបរាជ័យក្នុងការញែកកាលបរិច្ឆេទ ''{0}'' បានឆ្លើយតបដោយម៉ាស៊ីនមេ។"
@@ -14876,81 +14889,6 @@ msgstr "មិនបានបញ្ជាក់ហេតុផល"
msgid "Error playing sound"
msgstr "កំហុសក្នុងការចាក់សំឡេង"
-msgid "Do nothing"
-msgstr "កុំធ្វើអ្វីទាំងអស់"
-
-msgid "Report Bug"
-msgstr "រាយការណ៍កំហុស"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"មានករណីមិនរំពឹងទុកបានកើតឡើង។<br>ជាទូទៅវាជាកំហុសការសរសេរកូដ។ "
-"បើអ្នកកំពុងប្រើកំណែ<br>ចុងក្រោយបំផុតរបស់ JOSM, "
-"សូមចាត់ទុកថាវាជាឯកសាររបាយការណ៍កំហុស។"
-
-msgid "Update JOSM"
-msgstr "ធ្វើបច្ចុប្បន្នភាព JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"មានករណីលើកលែងមិនរំពឹងទុកបានកើតឡើង។ "
-"ជាទូទៅវាជាកំហុសការសរសេរកូដ។<br><br>ទោះបីជាអ្នកកំពុងប្រើកំណែចាស់រប"
-"ស់ JOSM ({0}),<br>ជំនួសឲ្យការប្រើកំណែសាកល្បងថ្មីក៏ដោយ "
-"(<b>{1}</b>)។<br><br><b>សូមធ្វើបច្ចុប្បន្នភាព JOSM</b> "
-"មុននឹងចាត់ទុកថាវាជាឯកសាររបាយការណ៍កំហុស។"
-
-msgid "Unexpected Exception"
-msgstr "ករណីលើកលែងមិនរំពឹងទុក"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "ប្រអប់កំហុសទប់ស្កាត់សម្រាប់សម័យនេះ។"
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"អ្នកបានជួបកំហុសនៅក្នុង JOSM ។ មុននឹងផ្ញើរបាយការណ៍កំហុស "
-"សូមប្រាកដថាអ្នកបានធ្វើបច្ចុប្បន្នភាពទៅកំណែចុងក្រោយបំផុតរបស់ JOSM "
-"នៅទីនេះ៖"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"អ្នកក៏គួរតែធ្វើបច្ចុប្បន្នភាពកម្មវិធីជំនួយរបស់អ្នកផងដែរ។ "
-"បើវានៅតែមិនអាចជួយបានទៀត "
-"សូមផ្ញើរបាយការណ៍កំហុសនៅក្នុងកម្មវិធីតាមដានកំហុសរបស់យើងដោយប្រើតំណ"
-"នេះ៖"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"ព័ត៌មានកំហុសដែលបានផ្ដល់ខាងក្រោមគួរតែបានបំពេញសម្រាប់អ្នក។ "
-"សូមរួមបញ្ចូលព័ត៌មានអំពីមូលហេតុដែលនាំឲ្យកើតមានកំហុសឡើងវិញ "
-"និងព្យាយាមផ្ដល់ព័ត៌មានលម្អិតឲ្យបានច្រើនតាមដែលអាចធ្វើទៅបាន។"
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"ម្យ៉ាងទៀតបើវាមិនបង្ហាញទេ អ្នកអាចបំពេញវាដោយដៃដោយប្រើ URL នេះ៖"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(អត្ថបទត្រូវបានចម្លងទៅក្ដារតម្បៀតខ្ទាស់របស់អ្នក)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "អ្នកបានជួបបញ្ហារបាយការណ៍កំហុសនីក្នុង JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15287,9 +15225,6 @@ msgstr "ទាញយកការប្ដូរទិសទៅ ''
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "បានរកឃើញការប្ដូរទិសច្រើនពេកទៅកាន់ URL ទាញយក។ កំពុងបោះបង់។"
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "មិនអាចរកឃើញការបកប្រែសម្រាប់ភាសា {0}។ ត្រឡប់ទៅ {1}។"
@@ -15506,6 +15441,85 @@ msgstr "មិនអើពើធរណីមាត្រមិនត
msgid "Failed to load XML schema."
msgstr "បានបរាជ័យក្នុងការផ្ទុកដ្យាក្រាម XML ។"
+msgid "Do nothing"
+msgstr "កុំធ្វើអ្វីទាំងអស់"
+
+msgid "Report Bug"
+msgstr "រាយការណ៍កំហុស"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"មានករណីមិនរំពឹងទុកបានកើតឡើង។<br>ជាទូទៅវាជាកំហុសការសរសេរកូដ។ "
+"បើអ្នកកំពុងប្រើកំណែ<br>ចុងក្រោយបំផុតរបស់ JOSM, "
+"សូមចាត់ទុកថាវាជាឯកសាររបាយការណ៍កំហុស។"
+
+msgid "Update JOSM"
+msgstr "ធ្វើបច្ចុប្បន្នភាព JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"មានករណីលើកលែងមិនរំពឹងទុកបានកើតឡើង។ "
+"ជាទូទៅវាជាកំហុសការសរសេរកូដ។<br><br>ទោះបីជាអ្នកកំពុងប្រើកំណែចាស់រប"
+"ស់ JOSM ({0}),<br>ជំនួសឲ្យការប្រើកំណែសាកល្បងថ្មីក៏ដោយ "
+"(<b>{1}</b>)។<br><br><b>សូមធ្វើបច្ចុប្បន្នភាព JOSM</b> "
+"មុននឹងចាត់ទុកថាវាជាឯកសាររបាយការណ៍កំហុស។"
+
+msgid "Suppress further error dialogs for this session."
+msgstr "ប្រអប់កំហុសទប់ស្កាត់សម្រាប់សម័យនេះ។"
+
+msgid "Unexpected Exception"
+msgstr "ករណីលើកលែងមិនរំពឹងទុក"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "អ្នកបានជួបបញ្ហារបាយការណ៍កំហុសនីក្នុង JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"អ្នកបានជួបកំហុសនៅក្នុង JOSM ។ មុននឹងផ្ញើរបាយការណ៍កំហុស "
+"សូមប្រាកដថាអ្នកបានធ្វើបច្ចុប្បន្នភាពទៅកំណែចុងក្រោយបំផុតរបស់ JOSM "
+"នៅទីនេះ៖"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"អ្នកក៏គួរតែធ្វើបច្ចុប្បន្នភាពកម្មវិធីជំនួយរបស់អ្នកផងដែរ។ "
+"បើវានៅតែមិនអាចជួយបានទៀត "
+"សូមផ្ញើរបាយការណ៍កំហុសនៅក្នុងកម្មវិធីតាមដានកំហុសរបស់យើងដោយប្រើតំណ"
+"នេះ៖"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"ព័ត៌មានកំហុសដែលបានផ្ដល់ខាងក្រោមគួរតែបានបំពេញសម្រាប់អ្នក។ "
+"សូមរួមបញ្ចូលព័ត៌មានអំពីមូលហេតុដែលនាំឲ្យកើតមានកំហុសឡើងវិញ "
+"និងព្យាយាមផ្ដល់ព័ត៌មានលម្អិតឲ្យបានច្រើនតាមដែលអាចធ្វើទៅបាន។"
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"ម្យ៉ាងទៀតបើវាមិនបង្ហាញទេ អ្នកអាចបំពេញវាដោយដៃដោយប្រើ URL នេះ៖"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(អត្ថបទត្រូវបានចម្លងទៅក្ដារតម្បៀតខ្ទាស់របស់អ្នក)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15856,13 +15870,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -15871,7 +15885,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -15883,15 +15903,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -15988,6 +16005,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -16012,13 +16032,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -16165,10 +16185,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16221,29 +16241,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16291,6 +16310,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16351,6 +16373,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16387,10 +16412,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -16492,6 +16514,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -16501,6 +16526,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -17201,6 +17229,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18601,6 +18634,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -19177,9 +19216,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -19658,6 +19694,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -20806,6 +20851,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -22074,6 +22122,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -23661,7 +23713,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -23676,7 +23728,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -24931,6 +24983,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -24955,9 +25022,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -25117,7 +25181,13 @@ msgstr ""
msgid "Test"
msgstr "សាកល្បង"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -25201,6 +25271,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -25299,6 +25374,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -25308,6 +25386,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -28407,6 +28493,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -30728,6 +30874,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -31512,9 +31667,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -33249,18 +33401,3 @@ msgstr ""
msgid "Drive a race car on this layer"
msgstr ""
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "លំនាំសញ្ញាដកមិនត្រឹមត្រូវ ត្រូវតែមានតម្លៃយ៉ាងហោចមួយ > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "លំនាំសញ្ញាដកមិនត្រឹមត្រូវ តម្លៃត្រូវតែវិជ្ជមាន"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "បានបរាជ័យក្នុងការញែករចនាប័ទ្មគំនូរផែនទីពី ''{0}'' ។ កំហុសគឺ៖ "
-#~ "[{1}:{2}] {3}"
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index c495547..ab72374 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: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2015-12-17 12:48+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-01 12:42+0000\n"
"Last-Translator: Myeongjin <aranet100 at gmail.com>\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: 2016-03-13 04:52+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:51+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -150,9 +150,6 @@ msgstr "자바 버전 {0}"
msgid "Homepage"
msgstr "홈페이지"
-msgid "Bug Reports"
-msgstr "버그 보고"
-
msgid "Info"
msgstr "정보"
@@ -174,6 +171,12 @@ msgstr "플러그인"
msgid "About JOSM..."
msgstr "JOSM 정보..."
+msgid "OK"
+msgstr "확인"
+
+msgid "Report bug"
+msgstr "버그 보고"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -575,9 +578,6 @@ msgstr "이 이미지 레이어의 위치 조정"
msgid "Adjust imagery offset"
msgstr "이미지 오프셋 조정"
-msgid "OK"
-msgstr "확인"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1160,9 +1160,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr "''{0}'' 파일 이름을 바꿀 수 없습니다"
-msgid "Report bug"
-msgstr "버그 보고"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "JOSM 버그트래커에 티켓 보고"
@@ -1770,6 +1767,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1919,9 +1940,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2236,8 +2254,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3013,9 +3031,6 @@ msgstr "way {0}의 node 리스트 충돌 해결"
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr "적용?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3035,27 +3050,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr "예전 규칙"
-
-msgid "New role"
-msgstr "새 규칙"
-
-msgid "Old key"
-msgstr "예전 key"
-
-msgid "Old value"
-msgstr "예전 값"
-
-msgid "New key"
-msgstr "새 key"
-
-msgid "New value"
-msgstr "새 값"
-
msgid "Apply selected changes"
msgstr "선택된 변경 적용"
@@ -4111,6 +4105,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4755,19 +4752,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5740,6 +5737,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "적용?"
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr "예전 규칙"
+
+msgid "New role"
+msgstr "새 규칙"
+
+msgid "Old key"
+msgstr "예전 key"
+
+msgid "Old value"
+msgstr "예전 값"
+
+msgid "New key"
+msgstr "새 key"
+
+msgid "New value"
+msgstr "새 값"
+
msgid "For selected objects only"
msgstr ""
@@ -6227,51 +6248,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "로드된 모든 레이어의 리스트 열기"
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6294,12 +6270,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "선택된 레이어 한줄 위로 이동"
-
-msgid "Move the selected layer one row down."
-msgstr "선택된 레이어 한줄 아래로 이동"
-
msgid "Information about layer"
msgstr ""
@@ -6722,15 +6692,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6836,9 +6797,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -6990,14 +6948,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7082,15 +7032,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7108,6 +7049,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr "선택된 레이어 한줄 아래로 이동"
+
+msgid "Move the selected layer one row up."
+msgstr "선택된 레이어 한줄 위로 이동"
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7423,10 +7433,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9087,9 +9097,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9892,12 +9899,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11905,6 +11906,12 @@ msgstr "연결 설정"
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12415,6 +12422,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13656,62 +13671,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr "아무 것도 하지 않음."
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "의외의 예외"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13963,9 +13922,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14150,6 +14106,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "아무 것도 하지 않음."
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "의외의 예외"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14484,13 +14500,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14499,7 +14515,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14511,15 +14533,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14616,6 +14635,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14640,13 +14662,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14793,10 +14815,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14849,29 +14871,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14919,6 +14940,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14979,6 +15003,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15015,10 +15042,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15120,6 +15144,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15129,6 +15156,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15784,6 +15814,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17141,6 +17176,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17717,9 +17758,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18198,6 +18236,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19346,6 +19393,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20614,6 +20664,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22201,7 +22255,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22216,7 +22270,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23471,6 +23525,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23495,9 +23564,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23657,7 +23723,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23741,6 +23813,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23839,6 +23916,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23848,6 +23928,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26947,6 +27035,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29268,6 +29416,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30052,9 +30209,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -31758,7 +31912,7 @@ msgid "Clipboard"
msgstr "클립보드"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "시스템 클립보드에서 위키백과 문서 붙여넣기"
msgid "clipboard"
msgstr "클립보드"
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index e494472..526f6cf 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:52+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:51+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -147,9 +147,6 @@ msgstr "Java версиясы {0}"
msgid "Homepage"
msgstr "Үйбарак"
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr "Маалымат"
@@ -171,6 +168,12 @@ msgstr "Модулдар"
msgid "About JOSM..."
msgstr "JOSM жөнүндө..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -573,9 +576,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1165,9 +1165,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1777,6 +1774,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1926,9 +1947,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2244,8 +2262,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3026,9 +3044,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3048,27 +3063,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4126,6 +4120,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4771,19 +4768,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5756,6 +5753,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6243,51 +6264,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6310,12 +6286,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6738,15 +6708,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6852,9 +6813,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7006,14 +6964,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7098,15 +7048,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7124,6 +7065,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7439,10 +7449,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9098,9 +9108,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9903,12 +9910,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11916,6 +11917,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12426,6 +12433,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13667,62 +13682,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13974,9 +13933,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14161,6 +14117,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14495,13 +14511,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14510,7 +14526,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14522,15 +14544,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14627,6 +14646,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14651,13 +14673,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14804,10 +14826,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14860,29 +14882,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14930,6 +14951,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14990,6 +15014,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15026,10 +15053,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15131,6 +15155,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15140,6 +15167,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15795,6 +15825,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17152,6 +17187,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17728,9 +17769,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18209,6 +18247,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19357,6 +19404,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20625,6 +20675,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22212,7 +22266,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22227,7 +22281,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23482,6 +23536,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23506,9 +23575,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23668,7 +23734,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23752,6 +23824,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23850,6 +23927,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23859,6 +23939,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26958,6 +27046,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29279,6 +29427,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30063,9 +30220,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/wae.po b/i18n/po/lb.po
similarity index 99%
copy from i18n/po/wae.po
copy to i18n/po/lb.po
index 0fa353e..b24c778 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/lb.po
@@ -1,4 +1,4 @@
-# Walser translation for josm
+# Luxembourgish translation for josm
# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
# This file is distributed under the same license as the josm package.
# FIRST AUTHOR <EMAIL at ADDRESS>, 2016.
@@ -7,28 +7,28 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-09 22:17+0000\n"
-"Last-Translator: Simon Legner <Unknown>\n"
-"Language-Team: Walser <wae at li.org>\n"
+"POT-Creation-Date: 2016-04-29 03:36+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:14+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:53+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}:D''Optioun \"{1}\" ass net eendeiteg"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: D''Optioun ''--{1}'' erlaabt keen Argument"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: D''Optioun ''{1}{2}'' erlaabt keen Argument"
msgid "{0}: option ''{1}'' requires an argument"
-msgstr ""
+msgstr "{0}: D''Optioun ''{1}'' brauch een Argument"
msgid "{0}: unrecognized option ''--{1}''"
msgstr ""
@@ -147,9 +147,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -171,6 +168,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -573,9 +576,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1165,9 +1165,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1777,6 +1774,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1926,9 +1947,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2244,8 +2262,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3026,9 +3044,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3048,27 +3063,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4126,6 +4120,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4771,19 +4768,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5756,6 +5753,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6169,7 +6190,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "mapcss"
-msgstr "MapCSS"
+msgstr ""
msgid "unknown"
msgstr ""
@@ -6243,51 +6264,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6310,12 +6286,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6738,15 +6708,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6852,9 +6813,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7006,14 +6964,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7098,15 +7048,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7124,6 +7065,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7439,10 +7449,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9098,9 +9108,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9903,12 +9910,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11916,6 +11917,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12426,6 +12433,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13667,62 +13682,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13974,9 +13933,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14161,6 +14117,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14495,13 +14511,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14510,7 +14526,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14522,15 +14544,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14627,6 +14646,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14651,13 +14673,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14804,10 +14826,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14860,29 +14882,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14930,6 +14951,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14990,6 +15014,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15026,10 +15053,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15131,6 +15155,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15140,6 +15167,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15795,6 +15825,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17152,6 +17187,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17728,9 +17769,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18209,6 +18247,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19357,6 +19404,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20625,6 +20675,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22212,7 +22266,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22227,7 +22281,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23482,6 +23536,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23506,9 +23575,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23668,7 +23734,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23752,6 +23824,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23850,6 +23927,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23859,6 +23939,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26958,6 +27046,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29279,6 +29427,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30063,9 +30220,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index f263dcc..a8a4f51 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:53+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:52+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr "ຫນ້າຫລັກ"
-msgid "Bug Reports"
-msgstr "ລາຍງານບັນຫາ"
-
msgid "Info"
msgstr "ຂໍ້ມູນ"
@@ -172,6 +169,12 @@ msgstr "ຕົວເສີມ"
msgid "About JOSM..."
msgstr "ກ່ຽວກັບ JOSM..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,6 +4769,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "ສ້າງໜ້າຕາຫຼັກ"
+
msgid "Updating plugins"
msgstr ""
@@ -4781,12 +4784,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "ສ້າງໜ້າຕາຫຼັກ"
-
msgid "Loading plugins"
msgstr ""
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index b18e724..6a58efe 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-12 13:30+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-28 17:55+0000\n"
"Last-Translator: Aurimas Fišeras <Unknown>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:54+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:53+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -99,7 +99,7 @@ msgid "Updating user interface"
msgstr "Atnaujinama naudotojo sąsaja"
msgid "Failed to save default preferences."
-msgstr ""
+msgstr "Nepavyko išsaugoti numatytųjų nustatymų."
msgid "Ignoring malformed URL: \"{0}\""
msgstr "Ignoruojamas blogai suformuotas URL: „{0}“"
@@ -152,9 +152,6 @@ msgstr "Java versija {0}"
msgid "Homepage"
msgstr "Interneto svetainė"
-msgid "Bug Reports"
-msgstr "Klaidų pranešimai"
-
msgid "Info"
msgstr "Informacija"
@@ -176,8 +173,14 @@ msgstr "Papildiniai"
msgid "About JOSM..."
msgstr "Apie JOSM..."
+msgid "OK"
+msgstr "Gerai"
+
+msgid "Report bug"
+msgstr "Pranešti apie klaidą"
+
msgid "Failed to locate resource ''{0}''."
-msgstr ""
+msgstr "Nepavyko aptikto resurso ''{0}''."
msgid "Failed to load resource ''{0}'', error is {1}."
msgstr "Nepavyko įkelti resurso „{0}, klaida yra {1}."
@@ -474,7 +477,7 @@ msgid "Delete Layer"
msgstr "Pašalinti sluoksnį"
msgid "Delete the active layer. Does not delete the associated file."
-msgstr ""
+msgstr "Pašalinkite aktyvųjį sluoksnį. Neištrina susijusio failo."
msgid "Toggle dialogs panel"
msgstr "Perjungti dialogų skiltį"
@@ -603,9 +606,6 @@ msgstr "Derinti vaizdų sluoksnio poziciją"
msgid "Adjust imagery offset"
msgstr "Derinti vaizdų poslinkį"
-msgid "OK"
-msgstr "Gerai"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1141,13 +1141,13 @@ msgid "Builds an Overpass query using the Overpass Turbo query wizard"
msgstr "Sukuria Overpass užklausą naudojant Overpass Turbo užklausų vediklį"
msgid "Build query"
-msgstr ""
+msgstr "Sukurti užklausą"
msgid "<html>The Overpass wizard could not parse the following query:"
msgstr "<html>Overpass vediklius negalėjo išnagrinėti šios užklausos:"
msgid "Parse error"
-msgstr ""
+msgstr "Apdorojimo klaida"
msgid "Overpass query: "
msgstr "Overpass užklausa: "
@@ -1260,9 +1260,6 @@ msgstr "Failą taip pat pervadinti"
msgid "Could not rename file ''{0}''"
msgstr "Nepavyko pervadinti failo „{0}“"
-msgid "Report bug"
-msgstr "Pranešti apie klaidą"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Praneškite apie JOSM problemą"
@@ -1456,6 +1453,7 @@ msgstr "Perskirti kelią ties parinktu tašku."
msgid "Cannot split since another split operation is already in progress"
msgstr ""
+"Negalima padalinti, nes šiuo metu vykdomas kitas padalinimo veiksmas."
msgid ""
"The current selection cannot be used for splitting - no node is selected."
@@ -1924,6 +1922,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Lėtesnis pirmyn"
+msgid "Downloading changeset content"
+msgstr "Parsiunčiamas pakeitimo turinys"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Parsiunčiamas pakeitimas {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Parsiunčiamas turinys pakeitimui {2}..."
+
+msgid "Download changesets"
+msgstr "Atsiųsti pakeitimus"
+
+msgid "Querying and downloading changesets"
+msgstr "Užklausiami ir atsiunčiami pakeitimai"
+
+msgid "Determine user id for current user..."
+msgstr "Nustatyti dabartinio naudotojo id..."
+
+msgid "Query and download changesets ..."
+msgstr "Užklausti ir atsiųsti pakeitimus..."
+
+msgid "Errors during download"
+msgstr "Klaidos atsiuntimo metu"
+
msgid "Download GPS"
msgstr "Atsiųsti GPS"
@@ -2096,9 +2118,6 @@ msgstr "Pašalinti arba perkelti objektai"
msgid "The following errors occurred during mass download: {0}"
msgstr "Vykdant masinį atsiuntimą įvyko šios klaidos: {0}"
-msgid "Errors during download"
-msgstr "Klaidos atsiuntimo metu"
-
msgid "Error during download"
msgstr "Klaida atsiuntimo metu"
@@ -2370,6 +2389,8 @@ msgid ""
"Are you sure that you want to move elements with attached ways that are "
"hidden by filters?"
msgstr ""
+"Ar jūs užtikrintas, kad jūs norite perkelti elementus su pridėtais keliais, "
+" kurie yra paslėpti filtrų?"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2453,8 +2474,8 @@ msgid "Add selection to relation"
msgstr "Pridėti pažymėjimą į ryšį"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -2504,10 +2525,10 @@ msgid "Confirmation"
msgstr "Patvirtinimas"
msgid "List of recent relations"
-msgstr ""
+msgstr "Paskiausių ryšių sąrašas"
msgid "Open recent relation"
-msgstr ""
+msgstr "Atidaryti paskiausius ryšius"
msgid "Relation Editor: {0}"
msgstr "Ryšių tvarkytuvė: {0}"
@@ -2792,10 +2813,10 @@ msgid "all parents of objects matching the expression"
msgstr "išraišką atitinkančių objektų tėvai"
msgid "relation containing a member of role <i>stop</i>"
-msgstr ""
+msgstr "ryšyje yra narys rolės <i>stop</i>"
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr ""
+msgstr "objektai, esantis dalis ryšio kaip rolė <i>stop</i>"
msgid "n-th member of relation and/or n-th node of way"
msgstr "n-tasis ryšio narys ir/arba n-tasis kelio taškas"
@@ -2825,8 +2846,9 @@ msgstr "Ieškoma"
msgid "Searching in {0} object"
msgid_plural "Searching in {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ieškoma {0} objecte"
+msgstr[1] "Ieškoma {0} objektuose"
+msgstr[2] "Ieškoma {0} objekte (-uose)"
msgid "No match found for ''{0}''"
msgstr "„{0}“ nerasta"
@@ -2857,7 +2879,7 @@ msgstr "RX"
msgctxt "search"
msgid "CSS"
-msgstr ""
+msgstr "CSS"
msgctxt "search"
msgid "A"
@@ -2883,10 +2905,10 @@ msgstr ""
"{1}"
msgid "Cannot parse timestamp ''{0}''"
-msgstr ""
+msgstr "Negalima išnagrinėti laiko žymos ''{0}''"
msgid "Expecting {0} after {1}"
-msgstr ""
+msgstr "Tikimasi {0} po {1}"
msgid "Range of primitive ids expected"
msgstr "Tikimasi primityvių id intervalo"
@@ -3307,9 +3329,6 @@ msgstr "Išspręsti kelio {0} taškų sąrašo konfliktą"
msgid "Main dataset does not include node {0}"
msgstr "Pagrindiniame duomenų rinkinyje nėra taško {0}"
-msgid "Apply?"
-msgstr "Pritaikyti?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3341,27 +3360,6 @@ msgstr ""
"Keičiant kelio kryptį, siūlomi šie pakeitimai, kad būtų išlaikytas duomenų "
"nuoseklumas"
-msgid "Relation"
-msgstr "Ryšys"
-
-msgid "Old role"
-msgstr "Senoji rolė"
-
-msgid "New role"
-msgstr "Nauja rolė"
-
-msgid "Old key"
-msgstr "Senasis raktas"
-
-msgid "Old value"
-msgstr "Sena reikšmė"
-
-msgid "New key"
-msgstr "Naujas raktas"
-
-msgid "New value"
-msgstr "Nauja reikšmė"
-
msgid "Apply selected changes"
msgstr "Pritaikyti pažymėtus pakeitimus"
@@ -3400,13 +3398,13 @@ msgid "Restoring files"
msgstr "Atkuriami failai"
msgid "Unable to delete backup file {0}"
-msgstr ""
+msgstr "Nepavyko ištrinti atsarginio failo {0}"
msgid "Unable to delete PID file {0}"
-msgstr ""
+msgstr "Nepavyko ištrinti PID failo {0}"
msgid "Unable to delete archived backup file {0}"
-msgstr ""
+msgstr "Nepavyko ištrinti archyvuoto atsarginio failo {0}"
msgid "Illegal latitude value ''{0}''"
msgstr "Netinkama platumos reikšmė „{0}“"
@@ -3517,7 +3515,7 @@ msgstr ""
"numatytuoju: {0}"
msgid "Failed to load defaults cache file: {0}"
-msgstr ""
+msgstr "Nepavyko įkelti numatyto podėlio failo: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr "Nepavyko pašalinti klaidingo numatytųjų reikšmių podėlio failo: {0}"
@@ -3597,7 +3595,7 @@ msgid "E"
msgstr "R"
msgid "Update default entries"
-msgstr ""
+msgstr "Atnaujinti numatytuosius įrašus"
msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr "Projekcija „{0}“ nerasta, žymelė „{1}“ nepanaudojama"
@@ -3622,13 +3620,13 @@ msgid "Select WMTS layer"
msgstr "Pasirinkti WMTS sluoksnį"
msgid "Layer name"
-msgstr ""
+msgstr "Sluoksnio pavadinimas"
msgid "Projection"
msgstr "Projekcija"
msgid "Matrix set identifier"
-msgstr ""
+msgstr "Matricos rinkinio identifikatorius"
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Jokie sluoksniai nebuvo apibrėžti getCapabilities dokumento: {0}"
@@ -3639,6 +3637,8 @@ msgstr "Neparinktas joks sluoksnis"
msgid ""
"WMTS Parser error - start element {0} has different name than end element {2}"
msgstr ""
+"WMTS Analizatoriaus klaida - pradžios elementas {0} turi kitokį "
+"pavadinimą, nei pabaigos elementas {2}"
msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
@@ -3859,10 +3859,10 @@ msgid "areatext"
msgstr "ploto tekstas"
msgid "Expected element ''{0}'', but got ''{1}''"
-msgstr ""
+msgstr "Tikėtąsi elemento ''{0}'', bet gauta ''{1}''"
msgid "value expected"
-msgstr ""
+msgstr "tikimasi vertės"
msgid " (at line {0}, column {1})"
msgstr " (eilutėje {0}, stulpelyje {1})"
@@ -3874,7 +3874,7 @@ msgid "Expected integer value in range 1-60 for ''+zone=...'' parameter."
msgstr "Parametrui „+zone=...“ tikėtasi sveiko skaičiaus intervale 1-60"
msgid "No unit found for: {0}"
-msgstr ""
+msgstr "Šiam nerasta vieneto: {0}"
msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
msgstr "Parametras turi prasidėti „+“ simboliu (rasta „{0}“)"
@@ -3951,22 +3951,22 @@ msgid "WGS84"
msgstr "WGS84"
msgid "Albers Equal Area"
-msgstr ""
+msgstr "Alberso lygiaplotė"
msgid "Parameter ''{0}'' required."
msgstr "Parametras „{0}“ privalomas."
msgid "standard parallels are opposite"
-msgstr ""
+msgstr "standartinės pararelės yra priešingos"
msgid "Cassini-Soldner"
-msgstr ""
+msgstr "Cassini-Soldner"
msgid "Double Stereographic"
-msgstr ""
+msgstr "Dviguba stereografija"
msgid "Lambert Azimuthal Equal Area"
-msgstr ""
+msgstr "Lamberto azimutinė lygiaplotė"
msgid "Lambert Conformal Conic"
msgstr "Lambert Conformal Conic"
@@ -3978,25 +3978,25 @@ msgid "Mercator"
msgstr "Merkaratorius"
msgid "Oblique Mercator"
-msgstr ""
+msgstr "Įstrižas Merkatorius"
msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
-msgstr ""
+msgstr "Netinkami parametrai ''{0}'' ir ''{1}'' dviejų taškų metodui."
msgid "Illegal value for parameter ''{0}'': {1}"
-msgstr ""
+msgstr "Negalima vertė parametrui ''{0}'': {1}"
msgid "error in initialization"
-msgstr ""
+msgstr "Inicializacijos klaida"
msgid "Polar Stereographic"
-msgstr ""
+msgstr "Polinė stereografija"
msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
-msgstr ""
+msgstr "Polinė stereografija: Parametras ''{0}'' turi būti 90 arba -90."
msgid "Sinusoidal"
-msgstr ""
+msgstr "Sinusoidinė"
msgid "Swiss Oblique Mercator"
msgstr "Swiss Oblique Mercator"
@@ -4033,7 +4033,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "E-pašto adrese yra netinkamas domenas: {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Elektroninio pašto validatorius"
msgid "URL is invalid"
msgstr "URL netinkamas"
@@ -4054,7 +4054,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "URL aptiktas netinkamas fragmentas: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "URL validatorius"
msgid "Addresses"
msgstr "Adresai"
@@ -4368,6 +4368,8 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"the area style"
msgstr ""
+"Su dabar naudojamu mappaint stiliumi, išorinio kelio stilius neatitinka "
+"ploto stiliaus"
msgid "Area style on outer way"
msgstr "Ploto stilius išoriniame kelyje"
@@ -4480,12 +4482,15 @@ msgid "Missing power tower/pole within power line"
msgstr "Elektros linijoje trūksta bokšto/stulpo"
msgid "Public Transport Route"
-msgstr ""
+msgstr "Viešojo transporto maršrutas"
msgid "Route relation contains a ''{0}'' role"
-msgstr ""
+msgstr "Maršruto ryšyje yra ''{0}'' rolė"
msgid "Route relation contains a gap"
+msgstr "Maršruto ryšyje yra tarpas"
+
+msgid "Stop position not part of route"
msgstr ""
msgid "Role verification problem"
@@ -4601,16 +4606,16 @@ msgid "Property values start or end with white space"
msgstr "Savybės reikšmė prasideda ar baigiasi tarpu"
msgid "Property values contain multiple white spaces"
-msgstr ""
+msgstr "Savybės vertės turi daug baltų plotų"
msgid "Property values contain HTML entity"
msgstr "Savybės reikšmėje yra HTML esybė"
msgid "Key ''{0}'' looks like ''{1}''."
-msgstr ""
+msgstr "Raktas ''{0}'' atrodo kaip ''{1}''."
msgid "Misspelled property key"
-msgstr ""
+msgstr "Klaidingai parašytas savybės raktas"
msgid "Key ''{0}'' not in presets."
msgstr "Rakto „{0}“ nėra ruošiniuose."
@@ -4712,7 +4717,7 @@ msgid "No \"to\" way found"
msgstr "Nerastas „to“ (į) kelias"
msgid "\"from\" way equals \"to\" way"
-msgstr ""
+msgstr "\"from\" (iš) kelias atitinka \"to\" (į) kelią"
msgid "No \"via\" node or way found"
msgstr "Nerastas „via“ (per) taškas arba kelias"
@@ -5156,6 +5161,12 @@ msgstr "Įjungtas detalus tinkinimo lygis (pėdsakai)"
msgid "Initializing"
msgstr "Inicijuojama"
+msgid "Setting defaults"
+msgstr "Nustatomos numatytosios reikšmės"
+
+msgid "Creating main GUI"
+msgstr "Kuriama pagrindinė grafinė sąsaja"
+
msgid "Updating plugins"
msgstr "Atnaujinami papildiniai"
@@ -5165,12 +5176,6 @@ msgstr "Diegiami atnaujinti papildiniai"
msgid "Loading early plugins"
msgstr "Įkeliami ankstyvieji papildiniai"
-msgid "Setting defaults"
-msgstr "Nustatomos numatytosios reikšmės"
-
-msgid "Creating main GUI"
-msgstr "Kuriama pagrindinė grafinė sąsaja"
-
msgid "Loading plugins"
msgstr "Įkeliami papildiniai"
@@ -5294,7 +5299,7 @@ msgstr "Daugiau..."
msgctxt "menu"
msgid "GPS"
-msgstr ""
+msgstr "GPS"
msgctxt "menu"
msgid "Windows"
@@ -5420,10 +5425,10 @@ msgid "Do not hide status bar"
msgstr "Neslėpti būsenos juostos"
msgid "The northing at the mouse pointer."
-msgstr ""
+msgstr "Nuokrypis į šiaurę ant pelės žymeklio."
msgid "The easting at the mouse pointer."
-msgstr ""
+msgstr "Nuokrypis į rytus ant pelės žymeklio."
msgid "The geographic latitude at the mouse pointer."
msgstr "Pelės žymeklio geografinė platuma"
@@ -5498,6 +5503,10 @@ msgid ""
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
+"<html>Alternatyviai, jūs galimai įvedėte <strong>kaladėlės adresą</strong> "
+"vienai kaladėlei formate <i>zoomlevel/x/y</i>, pvz. <i>15/256/223</i>. "
+"Kaladėlės adresai formate <i>zoom,x,y</i> arba <i>zoom;x;y</i> galimi taip "
+"pat.</html>"
msgid "Tile address:"
msgstr "Kaladėlių adresas:"
@@ -6241,6 +6250,30 @@ msgstr "Rodyti tik žymas su konfliktais"
msgid "Show tags with multiple values only"
msgstr "Rodyti žymas tik su sudėtinėmis reikšmėmis"
+msgid "Apply?"
+msgstr "Pritaikyti?"
+
+msgid "Relation"
+msgstr "Ryšys"
+
+msgid "Old role"
+msgstr "Senoji rolė"
+
+msgid "New role"
+msgstr "Nauja rolė"
+
+msgid "Old key"
+msgstr "Senasis raktas"
+
+msgid "Old value"
+msgstr "Sena reikšmė"
+
+msgid "New key"
+msgstr "Naujas raktas"
+
+msgid "New value"
+msgstr "Nauja reikšmė"
+
msgid "For selected objects only"
msgstr "Tik pažymėtiems objektams"
@@ -6336,16 +6369,16 @@ msgid "Open a merge dialog of all selected items in the list above."
msgstr "Atverti suliejimo dialogą visiems aukščiau rodomo sąrašo elementams."
msgid "Resolve to my versions"
-msgstr ""
+msgstr "Išspręsti į mano versijas"
msgid "Resolves all unresolved conflicts to ''my'' version"
-msgstr ""
+msgstr "Išsprendžia visus neišspręstus konfliktus ''my'' (mano) versijai"
msgid "Resolve to their versions"
-msgstr ""
+msgstr "Išspręsti į jų versijas"
msgid "Resolves all unresolved conflicts to ''their'' version"
-msgstr ""
+msgstr "Išspręsti visus neišspręstus konfliktus į ''their'' (jų) versiją"
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
@@ -6399,13 +6432,15 @@ msgstr "Išspręsti „{0}“ konfliktus"
msgid "Please confirm to remove <strong>{0} object</strong>."
msgid_plural "Please confirm to remove <strong>{0} objects</strong>."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Prašome patvirtinti <strong>{0} objekto</strong> ištrinimą."
+msgstr[1] "Prašome patvirtinti <strong>{0} objektų</strong> ištrinimą."
+msgstr[2] "Prašome patvirtinti <strong>{0} objektų (-o)</strong> ištrinimą."
msgid "{0} relation is affected."
msgid_plural "{0} relations are affected."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} ryšys yra paveiktas."
+msgstr[1] "{0} ryšiai yra paveikti."
+msgstr[2] "{0} ryšis (-iai) yra paveiktas (-i)."
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -6471,7 +6506,7 @@ msgid "Filter Hidden:{0} Disabled:{1}"
msgstr "Pagal filtrą paslėpta: {0}, išjungta: {1}"
msgid "<html>Error in filter <code>{0}</code>:<br>{1}"
-msgstr ""
+msgstr "<html>Klaida filtre <code>{0}</code>:<br>{1}"
msgid "Error in filter"
msgstr "Klaida filtre"
@@ -6692,48 +6727,59 @@ msgid "unknown"
msgstr "nežinoma"
msgid "Enter the coordinates for the new node."
-msgstr ""
+msgstr "Įveskite koordinates naujam taškui."
msgid ""
"You can separate longitude and latitude with space, comma or semicolon."
msgstr ""
+"Jūs galite atskirti ilgumą ir platumą su tarpu, kableliu arba kabliataškiu."
msgid ""
"Use positive numbers or N, E characters to indicate North or East cardinal "
"direction."
msgstr ""
+"Naudokite teigiamus skaičius arba N, E simbolius, kad nustatyti šiaurės arba "
+"rytų kryptį."
msgid ""
"For South and West cardinal directions you can use either negative numbers "
"or S, W characters."
msgstr ""
+"Pietų ir vakarų kryptims, jūs galite naudoti tiek neigiamus skaičius, tiek "
+"S, W simbolius."
msgid "Coordinate value can be in one of three formats:"
-msgstr ""
+msgstr "Koordinatės vertė galima būti viename iš trijų formatų:"
msgid "<i>degrees</i><tt>°</tt>"
-msgstr ""
+msgstr "<i>laipsniai</i><tt>°</tt>"
msgid "<i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt>"
-msgstr ""
+msgstr "<i>laipsniai</i><tt>°</tt> <i>minutės</i><tt>'</tt>"
msgid ""
"<i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt> "
"<i>seconds</i><tt>"</tt>"
msgstr ""
+"<i>laipsniai</i><tt>°</tt> <i>minutės</i><tt>'</tt> "
+"<i>sekundės</i><tt>"</tt>"
msgid ""
"Symbols <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
"<tt>″</tt> are optional."
msgstr ""
+"Simboliai <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
+"<tt>″</tt> yra neprivalomi."
msgid ""
"You can also use the syntax <tt>lat=\"...\" lon=\"...\"</tt> or "
"<tt>lat=''...'' lon=''...''</tt>."
msgstr ""
+"Jūs taip pat galite naudoti sintaksę <tt>lat=\"...\" lon=\"...\"</tt> or "
+"<tt>lat=''...'' lon=''...''</tt>."
msgid "Some examples:"
-msgstr ""
+msgstr "Šiek tiek pavyzdžių:"
msgid "Projected coordinates:"
msgstr "Projektuotos koordinatės:"
@@ -6761,51 +6807,6 @@ msgstr "Perjungti sluoksnio matomumą: {0}"
msgid "Open a list of all loaded layers."
msgstr "Atverti visų įkeltų sluoksnių sąrašą."
-msgid "Delete the selected layers."
-msgstr "Šalinti pažymėtus sluoksnius."
-
-msgid "Show/hide"
-msgstr "Rodyti/slėpti"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Perjungti pažymėto sluoksnio matomumą."
-
-msgid "Show/hide layer"
-msgstr "Rodyti/slėpti sluoksnį"
-
-msgid "Opacity"
-msgstr "Permatomumas"
-
-msgid "Adjust opacity of the layer."
-msgstr "Keisti sluoksnio permatomumą."
-
-msgid "Gamma"
-msgstr "Gama"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Keisti sluoksnio gamos reikšmę."
-
-msgid "Activate"
-msgstr "Aktyvinti"
-
-msgid "Activate the selected layer"
-msgstr "Aktyvuoti pažymėtą sluoksnį"
-
-msgid "Activate layer"
-msgstr "Aktyvuoti sluoksnį"
-
-msgid "Merge this layer into another layer"
-msgstr "Sulieti šį sluoksnį su kitu sluoksniu"
-
-msgid "Duplicate this layer"
-msgstr "Kopijuoti šį sluoksnį"
-
-msgid "Copy of {0}"
-msgstr "{0} kopija"
-
-msgid "Copy {1} of {0}"
-msgstr "{0} kopija {1}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "sluoksnis šiuo metu matomas (spauskite, kad paslėptumėte)"
@@ -6820,20 +6821,16 @@ msgstr ""
"šis sluoksnis šiuo metu neaktyvus (spauskite, kad padarytumėte aktyviu)"
msgid "scale follows native resolution of this layer"
-msgstr ""
+msgstr "skalė seka savąją sluoksnio rezoliuciją"
msgid ""
"scale follows native resolution of another layer (click to set this layer)"
msgstr ""
+"skalė seka kito sluoksnio sąvąją rezoliuciją (paspauskite, kad nustatytumėte "
+"šį sluosknį)"
msgid "this layer has no native resolution"
-msgstr ""
-
-msgid "Move the selected layer one row up."
-msgstr "Perkelti pažymėtą sluoksnį viena eilute aukštyn."
-
-msgid "Move the selected layer one row down."
-msgstr "Perkelti pažymėtą sluoksnį viena eilute žemyn."
+msgstr "šis sluoksnis neturi savosios rezoliucijos"
msgid "Information about layer"
msgstr "Sluoksnio informacija"
@@ -6932,7 +6929,7 @@ msgid "Mini map"
msgstr "Mini žemėlapis"
msgid "Displays a small map of the current edit location"
-msgstr ""
+msgstr "Prie dabartinės keitimo vietos rodo nedidelį žemėlapį"
msgid "List of notes"
msgstr "Pastabų sąrašas"
@@ -7270,15 +7267,6 @@ msgstr "Užvertas"
msgid "Discussions"
msgstr "Diskusijos"
-msgid "Downloading changeset content"
-msgstr "Parsiunčiamas pakeitimo turinys"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Parsiunčiamas pakeitimas {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Parsiunčiamas turinys pakeitimui {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7302,7 +7290,7 @@ msgid "Download objects"
msgstr "Atsiųsti objektus"
msgid "Download the current version of the selected objects"
-msgstr ""
+msgstr "Atsisiųsti pasirinktų objektų dabartinę versiją"
msgid "Select in layer"
msgstr "Parinkti sluoksnyje"
@@ -7394,9 +7382,6 @@ msgstr "Atnaujinti pakeitimo aptarimą iš OSM serverio"
msgid "Date"
msgstr "Data"
-msgid "Download changesets"
-msgstr "Atsiųsti pakeitimus"
-
msgid "{0} [incomplete]"
msgstr "{0} [nebaigta]"
@@ -7564,16 +7549,6 @@ msgid "Please enter an integer value > 0"
msgstr "Prašome įvesti teigiamą sveiką skaičių"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Ši reikšmė nėra tinkamas naudotojo vardas.<br>Prašome įvesti ne tuščią "
-"naudotojo vardą.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Prašome įvesti ne tuščią naudotoo vardą"
-
-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 ""
@@ -7674,15 +7649,6 @@ msgstr "Netinkamas pakeitimų užklausos URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Užverti dialogo langą ir nutraukti pakeitimų užklausą"
-msgid "Querying and downloading changesets"
-msgstr "Užklausiami ir atsiunčiami pakeitimai"
-
-msgid "Determine user id for current user..."
-msgstr "Nustatyti dabartinio naudotojo id..."
-
-msgid "Query and download changesets ..."
-msgstr "Užklausti ir atsiųsti pakeitimus..."
-
msgid "URL: "
msgstr "URL: "
@@ -7702,6 +7668,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Šis pakeitimų užklausos URL yra netinkamas"
+msgid "Activate"
+msgstr "Aktyvinti"
+
+msgid "Activate the selected layer"
+msgstr "Aktyvuoti pažymėtą sluoksnį"
+
+msgid "Activate layer"
+msgstr "Aktyvuoti sluoksnį"
+
+msgid "Delete the selected layers."
+msgstr "Šalinti pažymėtus sluoksnius."
+
+msgid "Duplicate this layer"
+msgstr "Kopijuoti šį sluoksnį"
+
+msgid "Copy of {0}"
+msgstr "{0} kopija"
+
+msgid "Copy {1} of {0}"
+msgstr "{0} kopija {1}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Pakeisti pasirinkto sluoksnio matomumą."
+
+msgid "Show layer"
+msgstr "Rodyti sluoksnį"
+
+msgid "Adjust opacity of the layer."
+msgstr "Keisti sluoksnio permatomumą."
+
+msgid "Opacity"
+msgstr "Permatomumas"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Keisti sluoksnio gamos reikšmę."
+
+msgid "Gamma"
+msgstr "Gama"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Keisti sluoksnio ryškumo reikšmę."
+
+msgid "Sharpness"
+msgstr "Ryškumas"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Keisti sluoksnio spalvingumą."
+
+msgid "Colorfulness"
+msgstr "Spalvingumas"
+
+msgid "Merge this layer into another layer"
+msgstr "Sulieti šį sluoksnį su kitu sluoksniu"
+
+msgid "Move the selected layer one row down."
+msgstr "Perkelti pažymėtą sluoksnį viena eilute žemyn."
+
+msgid "Move the selected layer one row up."
+msgstr "Perkelti pažymėtą sluoksnį viena eilute aukštyn."
+
+msgid "Show/hide"
+msgstr "Rodyti/slėpti"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Perjungti pažymėto sluoksnio matomumą."
+
+msgid "Show/hide layer"
+msgstr "Rodyti/slėpti sluoksnį"
+
msgid "Discardable key: selection Foreground"
msgstr "Išmetamas raktas: pažymėjimo tekstas"
@@ -7748,7 +7783,7 @@ msgid "Position"
msgstr "Padėtis"
msgid "Tag filter"
-msgstr ""
+msgstr "Žymų filtras"
msgid "Objects: {2} / Tags: {0} / Memberships: {1}"
msgstr "Objektai: {2} / Žymos: {0} / Narystės: {1}"
@@ -7784,7 +7819,7 @@ msgid "Edit Tags"
msgstr "Keisti žymas"
msgid "Go to OSM wiki for tag help"
-msgstr ""
+msgstr "Eikite į OSM wiki, dėl pagalbos dėl žymų"
msgid "Launch browser with wiki help for selected object"
msgstr "Paleisti naršyklę su pažymėto objekto wiki pagalba"
@@ -7793,7 +7828,7 @@ msgid "Go to Taginfo"
msgstr "Į Taginfo"
msgid "Launch browser with Taginfo statistics for selected object"
-msgstr ""
+msgstr "Paleisti naršyklę su Taginfo statistika pasirinktam objektui"
msgid "Paste Value"
msgstr "Įdėti reikšmę"
@@ -7896,25 +7931,25 @@ msgid "Remember last used tags after a restart"
msgstr "Atsiminti paskutines naudotas žymas paleidus iš naujo"
msgid "Recent tags with existing key"
-msgstr ""
+msgstr "Paskiausios žymos, su egzistuojančiu raktu"
msgid "Enable"
-msgstr ""
+msgstr "Įgalinti"
msgid "Hide"
-msgstr ""
+msgstr "Slėpti"
msgid "Refresh recent tags list after applying tag"
-msgstr ""
+msgstr "Įkelti iš naujo paskesnių žymų sąrašą, pabaigus žymos pritaikymą"
msgid "No refresh"
-msgstr ""
+msgstr "Nėra įkėlimo iš naujo"
msgid "Refresh tag status only (enabled / disabled)"
-msgstr ""
+msgstr "Įkelti iš naujo tik žymos statusą (įjungtas / išjungtas)"
msgid "Refresh tag status and list of recently added tags"
-msgstr ""
+msgstr "Įkelti iš naujo žymos statusą ir sąrašą anksčiau įkeltų žymų"
msgid "to apply first suggestion"
msgstr "pirmam pasiūlymui pritaikyti"
@@ -7947,13 +7982,13 @@ msgid "The key ''{0}'' is already used"
msgstr "Raktas „{0}“ jau naudojamas"
msgid "Ignore key ''{0}''"
-msgstr ""
+msgstr "Nepaisyti rakto ''{0}''"
msgid "Ignore tag ''{0}''"
-msgstr ""
+msgstr "Nepaisyti žymos ''{0}''"
msgid "Edit ignore list"
-msgstr ""
+msgstr "Keisti ignoravimo sąrašą"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr "Jūs pakeitėte „{0}“ reikšmę iš „{1}“ į „{2}“."
@@ -8031,12 +8066,12 @@ msgstr "Tėviniai ryšiai"
msgid "Child Relations"
msgstr "Vaikiniai ryšiai"
-msgid "Apply Role:"
-msgstr "Pritaikyti rolę:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Įveskite rolę ir pritaikykite ją pažymėtiems ryšio nariams"
+msgid "Apply Role:"
+msgstr "Pritaikyti rolę:"
+
msgid "New Relation"
msgstr "Naujas ryšys"
@@ -8105,7 +8140,7 @@ msgid "Refers to"
msgstr "Nurodo į"
msgid "Cannot add {0} since it is not part of dataset"
-msgstr ""
+msgstr "Negalima pridėti {0} nes nėra duomenų aibės dalis"
msgid "Download referring relations"
msgstr "Atsiųsti susijusius ryšius"
@@ -8236,10 +8271,10 @@ msgstr ""
"Negalima įkelti narių iš įkėlimo buferio, nes jų nėra dabartiniame sluoksnyje"
msgid "Relation Editor: Refresh"
-msgstr ""
+msgstr "Ryšių tvarkytuvė: įkelti iš naujo"
msgid "Refresh relation from data layer"
-msgstr ""
+msgstr "Įkelti iš naujo ryšį iš duomenų sluoksnio"
msgid "Refresh"
msgstr "Atnaujinti"
@@ -8258,7 +8293,7 @@ msgstr ""
"šiuos pakeitimus ir iš naujo įkelti duomenis iš sluoksnio?</html>"
msgid "Click to close window"
-msgstr ""
+msgstr "Paspauskite, kad uždaryti langą"
msgid "No, continue editing"
msgstr "Ne, tęsti keitimą"
@@ -8267,9 +8302,11 @@ msgid ""
"<html>Relation has been deleted outside editor.<br><br>Do you want to close "
"this window?</html>"
msgstr ""
+"<html>Žyma buvo ištrinta už rengyklės ribų.<br><br>Ar jūs norite uždaryti šį "
+"langą?</html>"
msgid "Deleted relation"
-msgstr ""
+msgstr "Ištrintas ryšys"
msgid "Relation Editor: Remove"
msgstr "Ryšių tvarkytuvė: išimti"
@@ -8319,7 +8356,7 @@ msgstr ""
"pradžių išspręsti šį konfliktą<br>ir tada bandyti dar kartą.</html>"
msgid "Select objects for selected relation members"
-msgstr "Parinktio objektus pažymėtiems ryšio nariams"
+msgstr "Pažymėti objektus pažymėtiems ryšio nariams"
msgid ""
"Select relation members which refer to objects in the current selection"
@@ -8750,7 +8787,7 @@ msgid "Node {0}"
msgstr "Taškas {0}"
msgid "The nodes of this way are in reverse order"
-msgstr ""
+msgstr "Žymos šiame kelyje yra apsuktu nuoseklumu"
msgid "Zoom to node"
msgstr "Padidinti tašką"
@@ -8797,8 +8834,9 @@ msgstr ""
msgid "This changeset has {0} comment"
msgid_plural "This changeset has {0} comments"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pakeitimas turi {0} komentarą"
+msgstr[1] "Pakeitimas turi {0} komentarų"
+msgstr[2] "Pakeitimas turi {0} komentarų (-ą)"
msgid "Changeset"
msgstr "Pakeitimas"
@@ -8929,12 +8967,16 @@ msgid ""
"Select which actions to perform for this layer, if you click the leftmost "
"button."
msgstr ""
+"Pasirinkite, kuriuos veiksmus vykdyti šiame sluoksnyje, jei paspaudi "
+"kairiausiąjį mygtuką."
msgid "Check \"Upload\" to upload the changes to the OSM server."
-msgstr ""
+msgstr "Patikrinti punktą \"Įkėlimas\", kad įkelti pakeitimus į OSM serverį."
msgid "Check \"Save\" to save the layer to the file specified on the left."
msgstr ""
+"Patikrinti punktą \"Išsaugoti\", kad išsaugoti sluoksnį į failą, nurodytą "
+"kairėje."
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Trumpas aprašymas jūsų išsiunčiamiems pakeitimams:"
@@ -9765,13 +9807,13 @@ msgid "Load tile"
msgstr "Įkelti kaladėlę"
msgid "Auto zoom"
-msgstr ""
+msgstr "Auto artinimas"
msgid "Auto load tiles"
msgstr "Automatiškai įkelti kaladėles"
msgid "Show errors"
-msgstr ""
+msgstr "Rodyti klaidas"
msgid "Load all tiles"
msgstr "Įkelti visas kaladėles"
@@ -9853,7 +9895,7 @@ msgid "Details..."
msgstr "Išsamiau..."
msgid "Do not show this message again"
-msgstr ""
+msgstr "Daugiau nerodyti šio pranešimo"
msgid "Hide this message and never show it again"
msgstr "Slėpti šį pranešimą ir niekada jo daugiau nerodyti"
@@ -9918,9 +9960,6 @@ msgstr "Vaizdų stelbimas"
msgid "Unsupported imagery type: {0}"
msgstr "Nepalaikomas vaizdo tipas: {0}"
-msgid "ERROR"
-msgstr "KLAIDA"
-
msgid "Next marker"
msgstr "Kitas žymeklis"
@@ -9939,18 +9978,22 @@ msgid ""
"http://forum.openstreetmap.org/viewtopic.php?id=25677).\n"
"Currently you have {1,number,#}MB memory allocated for JOSM"
msgstr ""
+"Kad pridėti kitą sluoksnį, jūs turite naudoti bent {0,number,#}MB atminties "
+"į JOSM, naudojant -Xmx{0,number,#}M parinktį (žiūrėti "
+"http://forum.openstreetmap.org/viewtopic.php?id=25677).\n"
+"Šiuo metu jūs turite {1,number,#}MB atminties, kuri naudojama JOSM"
msgid "All projections are supported"
msgstr "Palaikomos visos projekcijos"
msgid "The layer {0} does not support the new projection {1}."
-msgstr ""
+msgstr "Sluoksnis {0} nepalaiko naujos projekcijos {1}."
msgid "Supported projections are: {0}"
-msgstr ""
+msgstr "Palaikomos projekcijos yra: {0}"
msgid "Change the projection again or remove the layer."
-msgstr ""
+msgstr "Pakeisti projekciją vėl arba pašalinti sluoksnį."
msgid "Save Layer"
msgstr "Išsaugoti sluoksnį"
@@ -10642,6 +10685,8 @@ msgid ""
"JOSM does no longer support mappaint styles written in the old XML format.\n"
"Please update ''{0}'' to MapCSS"
msgstr ""
+"JOSM nebepalaiko žemėlapių paišymo stiliaus, parašytos senu XML formatu.\n"
+"Prašome atnaujinti ''{0}'' į MapCSS"
msgid "loading style ''{0}''..."
msgstr "įkeliamas stilius „{0}“..."
@@ -10704,10 +10749,10 @@ msgid "Authorize URL:"
msgstr "Autorizavimo URL:"
msgid "OSM login URL:"
-msgstr ""
+msgstr "OSM prisijungimo internetinis adresas:"
msgid "OSM logout URL:"
-msgstr ""
+msgstr "OSM atsijungimo internetinis adresas:"
msgid "Click to reset the OAuth settings to default values"
msgstr "Spauskite OAuth nustatymų atkūrimui į numatytąsias reikšmes"
@@ -10816,13 +10861,6 @@ msgstr "Paleisti automatinius autorizavimo žingsnius dabar"
msgid "Test Access Token"
msgstr "Tikrinti prieigos raktą"
-msgid "Please enter your OSM user name"
-msgstr "Įveskite savo OSM naudotojo vardą"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Naudotojo vardas negali būti tuščias. Įveskite savo OSM naudotojo vardą"
-
msgid "Please enter your OSM password"
msgstr "Įveskite savo OSM slaptažodį"
@@ -10927,6 +10965,9 @@ msgid ""
"sure to set an OAuth consumer key and secret in the <i>Advanced OAuth "
"parameters</i>."
msgstr ""
+"<strong>Dėmesio:</strong> Kadangi jūs nenaudojate numatytosios OSM API, "
+"nepamirškite nustatyti OAuth naudotojo rakto ir paslapties <i>Advanced OAuth "
+"parametruose</i>."
msgid "Get an Access Token for ''{0}''"
msgstr "Gauti prieigos raktą „{0}“"
@@ -11878,6 +11919,8 @@ msgid ""
"Colors points and track segments by dilution of position (HDOP). Your "
"capture device needs to log that information."
msgstr ""
+"Spalvos taškai ir pėdsakų segmentai, pozicijos skiedim (HDOPu). Jūsų "
+"fiksavimo įtaisas turi turėti prieigą prie šios informacijos."
msgid "Colors points and track segments by its timestamp."
msgstr "Spalvina taškus ir pėdsako segmentus pagal laiko žymą."
@@ -11929,10 +11972,10 @@ msgstr ""
"Naudoti savąjį failų parinkiklį (gražesnis, bet nepalaiko failų filtrų)"
msgid "Reverse zoom with mouse wheel"
-msgstr ""
+msgstr "Apsukti artinimą su pelės ratuku"
msgid "Intermediate steps between native resolutions"
-msgstr ""
+msgstr "Tarpiniai žingsniai tarp savųjų rezoliucijų"
msgid "Show localized name in selection lists, if available"
msgstr "Jei yra, rodyti lokalizuotą vardą pažymėjimo sąrašuose"
@@ -11962,19 +12005,23 @@ msgstr ""
"bet nepalaiko kai kurių galimybių, pvz., failų filtrų"
msgid "Check if you feel opposite direction more convenient"
-msgstr ""
+msgstr "Patikrinkite, jei jaučiate, kad priešinga kryptis yra patogesnė"
msgid ""
"Divide intervals between native resolution levels to smaller steps if they "
"are much larger than zoom ratio"
msgstr ""
+"Padalinti intervalus tarp savųjų rezoliucijos lygių į mažesnius žingsnius, "
+"jei jie yra daug didesni, nei artinimo koeficentas"
msgid "Zoom steps to get double scale"
-msgstr ""
+msgstr "Artinimo žingsniai, kad gauti dvigubą skalę"
msgid ""
"Higher value means more steps needed, therefore zoom steps will be smaller"
msgstr ""
+"Aukštesnė vertė reiškia, kad reikia daugiau žingsnių, todėl artinimo "
+"žingsniai bus mažesni"
msgid "Look and Feel"
msgstr "Išvaizda ir elgsena"
@@ -12031,7 +12078,7 @@ msgid "4. Enter name for this layer"
msgstr "4. Įveskite šio sluoksnio vardą"
msgid "Store WMS endpoint only, select layers at usage"
-msgstr ""
+msgstr "Įrašyti tik WMS paskutinį tašką, pasirinkti naudojamus sluosknius"
msgid "Show bounds"
msgstr "Rodyti ribas"
@@ -12361,7 +12408,7 @@ msgstr ""
"jį naudoti?<br><br><table width=600>Klaida: {1}</table></html>"
msgid "Sort presets menu alphabetically"
-msgstr ""
+msgstr "Suskirstyti ruošinius abėcėlės tvarka"
msgid "Tagging Presets"
msgstr "Žymėjimo ruošiniai"
@@ -12643,7 +12690,7 @@ msgid "LKS-92 (Latvia TM)"
msgstr "LKS-92 (Latvija TM)"
msgid "Rijksdriehoekscoördinaten (Netherlands)"
-msgstr ""
+msgstr "Rijksdriehoekscoördinaten (Nyderlandai)"
msgid "SWEREF99 13 30 / EPSG:3008 (Sweden)"
msgstr "SWEREF99 13 30 / EPSG:3008 (Švedija)"
@@ -12964,13 +13011,13 @@ msgid "Please enter the OSM API URL."
msgstr "Prašome įvesti OSM API URL."
msgid "Use Overpass server for object downloads"
-msgstr ""
+msgstr "Naudokite Overpass serverį duomenų atsisiuntimui"
msgid "Overpass server: "
msgstr "Overpass serveris: "
msgid "Overpass server"
-msgstr ""
+msgstr "Overpass serveris"
msgid "Proxy settings"
msgstr "Įgaliotojo serverio nuostatos"
@@ -13026,6 +13073,13 @@ msgstr "Ryšio nustatymai"
msgid "Connection Settings for the OSM server."
msgstr "Ryšio nustatymai OSM serveriui."
+msgid "Please enter your OSM user name"
+msgstr "Įveskite savo OSM naudotojo vardą"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Naudotojo vardas negali būti tuščias. Įveskite savo OSM naudotojo vardą"
+
msgid "Action"
msgstr "Veiksmas"
@@ -13228,7 +13282,7 @@ msgid "Elements of type {0} are supported."
msgstr "Palaikomi „{0}“ tipo elementai."
msgid "This preset also sets: {0}"
-msgstr ""
+msgstr "Šis ruošinys taip pat nustato: {0}"
msgid "Edit also …"
msgstr "Taip pat redaguoti …"
@@ -13349,7 +13403,7 @@ msgstr ""
"privalo būti toks pat kaip „values“"
msgid "Detailed information: {0} <> {1}"
-msgstr ""
+msgstr "Detali informacija: {0} <> {1}"
msgid ""
"Broken tagging preset \"{0}-{1}\" - number of items in "
@@ -13359,7 +13413,7 @@ msgstr ""
"skaičius privalo būti toks pat kaip „values“"
msgid "This corresponds to the key ''{0}''"
-msgstr ""
+msgstr "Tai atitinka raktą ''{0}''"
msgid "More information about this feature"
msgstr "Daugiau informacijos apie šią priemonę"
@@ -13550,7 +13604,7 @@ msgid "Contacting OSM Server..."
msgstr "Susisiekiama su OSM serveriu..."
msgid "Downloading notes"
-msgstr ""
+msgstr "Atsiunčiamos pastabos"
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
@@ -13574,6 +13628,14 @@ msgstr ""
"Neleistina elemento „{1}“ atributo „{0}“ reikšmė serverio charakteristikose. "
"Gauta „{2}“."
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13642,7 +13704,7 @@ msgid "Parsing response from server..."
msgstr "Nagrinėjamas serverio atsakymas..."
msgid "Unexpected XML element with name ''{0}''"
-msgstr ""
+msgstr "Netikėtas XML elementas, su vardu ''{0}''"
msgid "Could not export ''{0}''."
msgstr "Negalima eksportuoti ''{0}''."
@@ -13734,7 +13796,7 @@ msgid "Parse error: invalid document structure for GPX document."
msgstr ""
msgid "(at line {0}, column {1})"
-msgstr ""
+msgstr "(eilutėje {0}, skiltis {1})"
msgid "Unknown mode {0}."
msgstr "Nežinoma veiksena {0}."
@@ -13802,7 +13864,7 @@ msgid "Fetching relation with id {0} from ''{1}''"
msgstr "Gaunamas ryšys su id {0} iš „{1}“"
msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "Serveris atsakė su atsakymo kodu 404, id {0}. Praleidžiama."
msgid "NMEA-0183 Files"
msgstr "NMEA-0183 failai"
@@ -13885,19 +13947,19 @@ msgid "No changeset present for diff upload."
msgstr "Nėra pakeitimo skirtumų išsiuntimui."
msgid "Preparing upload request..."
-msgstr ""
+msgstr "Pasiruošiama įkėlimo užklausai..."
msgid "Waiting 10 seconds ... "
msgstr "Laukiama 10 sekundžių ... "
msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr ""
+msgstr "Pradedamas bandymas iš naujo {0}, iš {1}, per {2} sekundes ..."
msgid "OK - trying again."
msgstr "Gerai - bandoma vėl."
msgid "Starting retry {0} of {1}."
-msgstr ""
+msgstr "Pradedama bandymą iš naujo {0} iš {1}."
msgid "Current changeset is null. Cannot upload data."
msgstr "Dabartinis pakeitimas yra nulis. Negalima išsiųsti duomenų."
@@ -13918,7 +13980,7 @@ msgid "(Code={0})"
msgstr "(Kodas={0})"
msgid "The server replied an error with code {0}."
-msgstr ""
+msgstr "Severis išvedė klaidą, su kodu {0}."
msgid "OSM Server Files bzip2 compressed"
msgstr ""
@@ -13928,6 +13990,7 @@ msgstr ""
msgid "Prolog of OsmChange document not written yet. Please write first."
msgstr ""
+"OsmChange dokumento prologas dar neparašytas. Prašome parašyti tai pirmi."
msgid "OsmChange File"
msgstr "OsmChange failas"
@@ -14011,7 +14074,7 @@ msgid "Parsing OSM history data ..."
msgstr "Nagrinėjami OSM istorijos duomenys ..."
msgid "Invalid dataset"
-msgstr ""
+msgstr "Klaidinga duomenų aibė"
msgid "No data found for layer ''{0}''."
msgstr "Nerasta duomenų sluoksniui ''{0}''."
@@ -14097,7 +14160,7 @@ msgid "Illegal value for attribute ''changeset''. Got {0}."
msgstr "Neleistina atributo „changeset“ reikšmė. Gauta {0}."
msgid "Missing required attribute ''{0}''."
-msgstr ""
+msgstr "Trūksta reikalaujamo atributo ''{0}''."
msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
msgstr ""
@@ -14118,10 +14181,10 @@ msgid "Line {0} column {1}: "
msgstr "Eilutė {0} stulpelis {1}: "
msgid "Downloading referring ways ..."
-msgstr ""
+msgstr "Atsiunčiami priklausantys keliai ..."
msgid "Downloading referring relations ..."
-msgstr ""
+msgstr "Atsiunčiami priklausantys ryšiai ..."
msgid "Reading changesets..."
msgstr "Skaitomi pakeitimai..."
@@ -14163,7 +14226,7 @@ msgstr ""
"internetu."
msgid "Reading error text failed."
-msgstr ""
+msgstr "Klaidos teksto skaitymas nepavyko."
msgid "XML tag <user> is missing."
msgstr "XML žyma <vartotojas> yra trūkstama."
@@ -14308,19 +14371,19 @@ msgid "RemoteControl::Accepting secure remote connections on {0}:{1}"
msgstr "RemoteControl::Priimami saugūs nuotoliniai prisijungimai per {0}:{1}"
msgid "Remote Control has been asked to create a new node."
-msgstr ""
+msgstr "Per nuotolinį valdymą buvo paprašyta sukurti naują tašką."
msgid "There is no layer opened to add node"
-msgstr ""
+msgstr "Kad pridėti tašką, neatidarytas joks sluoksnis"
msgid "Remote Control has been asked to create a new way."
-msgstr ""
+msgstr "Per nuotolinį valdymą prašoma sukurti naują kelią."
msgid "Invalid coordinates: {0}"
msgstr "Neteisingos koordinatės: {0}"
msgid "There is no layer opened to add way"
-msgstr ""
+msgstr "Neatidarytas joks sluoksnis, kad sukurti kelią"
msgid "Add way"
msgstr "Pridėti kelią"
@@ -14329,6 +14392,8 @@ msgid ""
"Remote Control has been asked to report its supported features. This enables "
"web sites to guess a running JOSM version"
msgstr ""
+"Per nuotolinį valdymą buvo paprašyta pranešti jo palaikomus ypatybes. Tai "
+"leidžia interneto svetainėms nustatyti veikiančią JOSM versiją"
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
@@ -14340,9 +14405,11 @@ msgstr "Nuotoliniai vaizdai"
msgid "Remote Control has been asked to import data from the following URL:"
msgstr ""
+"Per nuotolinį valdymą buvo paprašyta įkelti duomenis iš duoto interneto "
+"adreso:"
msgid "Remote Control has been asked to load data from the API."
-msgstr ""
+msgstr "Per nuotolinį valdymą buvo paprašyta įkelti duomenis iš API."
msgid "The latitudes must be between {0} and {1}"
msgstr "Platumos turi būti tarp {0} ir {1}"
@@ -14354,7 +14421,7 @@ msgid "The minima must be less than the maxima"
msgstr "Minima turi būti mažesnė nei maksima"
msgid "Remote Control has been asked to load the following data:"
-msgstr ""
+msgstr "Per nuotolinį valdymą buvo paprašyta įkelti duotus duomenus:"
msgid "Loading data"
msgstr "Įkeliami duomenys"
@@ -14363,9 +14430,11 @@ msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
msgstr ""
+"Per nuotolinį valdymą buvo paprašyta įkelti objektus (nurodytus per jų id) "
+"iš API"
msgid "Remote Control has been asked to open a local file."
-msgstr ""
+msgstr "Per nuotolinį valdymą buvo paprašyta atidaryti vietinį failą"
msgid "Do you want to allow this?"
msgstr "Ar norite tai leisti?"
@@ -14377,6 +14446,8 @@ msgid ""
"Remote Control has been asked to report its protocol version. This enables "
"web sites to detect a running JOSM."
msgstr ""
+"Per nuotolinį valdymą buvo paprašyta pranešti jo protokolo versiją. Tai "
+"leidžia interneto svetainėms aptikti veikiantį JOSM."
msgid "local file"
msgstr "vietinis failas"
@@ -14385,7 +14456,7 @@ msgid "include"
msgstr "įtraukti"
msgid "Layer contains unsaved data - save to file."
-msgstr ""
+msgstr "Sluoksnis turi neišsaugotų duomenų - išsaugoti į failą"
msgid "Layer does not contain unsaved data."
msgstr "Sluoksnis neturi neišsaugotų duomenų."
@@ -14400,13 +14471,13 @@ msgid "Include OSM data in the .joz session file."
msgstr "Įtraukti OSM duomenis į .joz seanso failą."
msgid "Link to a GPX data file on your local disk."
-msgstr ""
+msgstr "Nuoroda į GPX duomenų failą jūsų vietiniame diske."
msgid "Include GPX data in the .joz session file."
msgstr "Įtraukti GPX duomenis į .joz seanso failą."
msgid "No file association"
-msgstr ""
+msgstr "Nėra asociacijos su failu"
msgid "GPX data will be included in the session file."
msgstr "GPX duomenys bus įtraukti į seanso failą."
@@ -14425,7 +14496,7 @@ msgid ""
msgstr ""
msgid "File name expected for layer no. {0}"
-msgstr ""
+msgstr "Tikėtąsi failo vardo, sluoksniui nr. {0}"
msgid ""
"Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
@@ -14895,70 +14966,6 @@ msgstr "nenurodyta priežastis"
msgid "Error playing sound"
msgstr "Klaida grojant garsą"
-msgid "Do nothing"
-msgstr "Nieko nedaryti"
-
-msgid "Report Bug"
-msgstr "Pranešti apie klaidą"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Įvyko išimtinė situacija.<br>Tai visuomet programavimo klaida. Jei naudojate "
-"naujausią<br>JOSM versiją, praneškite apie klaidą."
-
-msgid "Update JOSM"
-msgstr "Atnaujinti JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Įvyko išimtinė situacija.<br>Tai visuomet programavimo klaida.<br><br>Tačiau "
-"jūs naudojate seną JOSM versiją ({0}),<br>vietoje dabartinės ištestuotos "
-"versijos (<b>{1}</b>).<br><br><b>Atnaujinkite JOSM</b> prieš pranešdami apie "
-"klaidą."
-
-msgid "Unexpected Exception"
-msgstr "Išimtinė situacija"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Nerodyti kitų klaidos dialogų langų šiame seanse."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Taip pat turėtumėte atnaujinti papildinius. Jei niekas nepadeda, praneškite "
-"apie klaidą mūsų klaidų sekimo sistemoje:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Tekstas jau buvo nukopijuotas į jūsų iškarpinę.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Susidūrėte su JOSM klaida"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15325,9 +15332,6 @@ msgstr "Atsisiuntimas perkeltas į ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Per daug aptikta nukreipimų į atsiųstą URL. Atmetama."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -15541,6 +15545,74 @@ msgstr "Ignoruojama blogai suformuota geometrija: {0}"
msgid "Failed to load XML schema."
msgstr "Nepavyko įkelti XML schemos."
+msgid "Do nothing"
+msgstr "Nieko nedaryti"
+
+msgid "Report Bug"
+msgstr "Pranešti apie klaidą"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Įvyko išimtinė situacija.<br>Tai visuomet programavimo klaida. Jei naudojate "
+"naujausią<br>JOSM versiją, praneškite apie klaidą."
+
+msgid "Update JOSM"
+msgstr "Atnaujinti JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Įvyko išimtinė situacija.<br>Tai visuomet programavimo klaida.<br><br>Tačiau "
+"jūs naudojate seną JOSM versiją ({0}),<br>vietoje dabartinės ištestuotos "
+"versijos (<b>{1}</b>).<br><br><b>Atnaujinkite JOSM</b> prieš pranešdami apie "
+"klaidą."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Nerodyti kitų klaidos dialogų langų šiame seanse."
+
+msgid "Unexpected Exception"
+msgstr "Išimtinė situacija"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Susidūrėte su JOSM klaida"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Taip pat turėtumėte atnaujinti papildinius. Jei niekas nepadeda, praneškite "
+"apie klaidą mūsų klaidų sekimo sistemoje:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Tekstas jau buvo nukopijuotas į jūsų iškarpinę.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15875,13 +15947,13 @@ msgstr "Mapbox palydovinis"
msgid "MapQuest Open Aerial"
msgstr "MapQuest atviros aeronuotraukos"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS trasos"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap (pritaikyta dviračiams)"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Standartinis sluoksnis)"
+msgid "OpenSeaMap"
+msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -15890,8 +15962,14 @@ msgstr "OpenStreetMap (Mapnik nespalvinis)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, be žymių)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap (pritaikyta dviračiams)"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Vokiško stiliaus)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS trasos"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -15902,15 +15980,12 @@ msgstr "Viešasis transportas (ÖPNV)"
msgid "Hike & Bike"
msgstr "Žygiams ir dviračiams"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Vokiško stiliaus)"
+msgid "skobbler"
+msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Kambodžos, Laoso, Tailando, Vietnamo daugiakalbinė"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT žemėlapis (padengtis)"
@@ -16007,6 +16082,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Gracas: Basiskarte (bazinis žemėlapis)"
@@ -16031,14 +16109,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (reljefo modelis)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (paviršiaus modelis)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) aeronuotraukos (taip pat apima Briuselio regioną)"
@@ -16184,10 +16262,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16242,6 +16320,15 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr "Bavarija (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr ""
@@ -16259,16 +16346,6 @@ msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
"Senasis Pegau žemėlapis - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr ""
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr ""
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16314,6 +16391,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16374,6 +16454,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr "Lodis - Italija"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16396,7 +16479,7 @@ msgid "South Tyrol Topomap"
msgstr "Pietų Tirolio topožemėlapis"
msgid "USSR - Latvia"
-msgstr ""
+msgstr "Sovietinis - Latvija"
msgid "50cm ortho - Latvia"
msgstr "50cm ortho - Latvija"
@@ -16410,11 +16493,8 @@ msgstr "1.cikla ortofotokarte - Latvija"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lietuva)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Liuksemburgo Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Liuksemburgo inspiruota - Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Liuksemburgo Inspiruota - geležinkeliai"
@@ -16515,6 +16595,9 @@ msgstr "Poznanės pavietas: Budynki (pastatai)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Poznanės pavietas: Ortofotomapa (oro nuotrauka)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Žešuvo pavietas: Budynki (pastatai)"
@@ -16524,6 +16607,9 @@ msgstr "Žešuvo pavietas: Ortofotomapa (Oro nuotrauka)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Stalovovolskio pavietas: Budynki (pastatai)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Pžemišlis (Peremislis): Budynki (pastatai)"
@@ -17074,7 +17160,7 @@ msgid "Create a grid of ways."
msgstr "Sukurti kelių tinklelį."
msgid "Customization of public transport stops."
-msgstr ""
+msgstr "Viešojo transporto stotelių pritaikymas"
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17185,6 +17271,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17327,6 +17418,7 @@ msgstr ""
msgid "Displays stops of selected public transport routes as graph"
msgstr ""
+"Rodo stoteles iš pasirinkto viešojo transporto maršruto, kaip grafiką"
msgid ""
"The RasterFiltersPlugin allows to choose and apply some images'' filters to "
@@ -17580,7 +17672,7 @@ msgstr ""
msgctxt "riding"
msgid "track"
-msgstr ""
+msgstr "takas"
msgid "clay"
msgstr ""
@@ -18551,6 +18643,12 @@ msgstr "Gatvės"
msgid "Motorway"
msgstr "Automagistralė/Greitkelis"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -18769,7 +18867,7 @@ msgstr ""
msgctxt "Highway"
msgid "track"
-msgstr ""
+msgstr "takas"
msgctxt "Highway"
msgid "footway"
@@ -18890,7 +18988,7 @@ msgid "Ways"
msgstr "Keliai"
msgid "Track"
-msgstr ""
+msgstr "Vėžė"
msgid "Tracktype"
msgstr "Vėžės būklė"
@@ -19012,13 +19110,13 @@ msgid "lane"
msgstr "juosta"
msgid "track"
-msgstr "kelias"
+msgstr "takas"
msgid "opposite_lane"
msgstr "priešinga_juosta"
msgid "opposite_track"
-msgstr ""
+msgstr "priešingos_krypties_takas"
msgid "opposite"
msgstr ""
@@ -19127,9 +19225,6 @@ msgstr "Greitkelio sankryža"
msgid "Number"
msgstr "Skaičius"
-msgid "Exit to"
-msgstr "Išvažiavimas į"
-
msgid "Services"
msgstr "Paslaugos"
@@ -19608,6 +19703,15 @@ msgstr "jūros užliejama dumblėta sekluma"
msgid "mangrove"
msgstr "mangrovė"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Purvynė"
@@ -20205,7 +20309,7 @@ msgid "Public Transport"
msgstr "Viešasis transportas"
msgid "Public Transport Route (Rail)"
-msgstr ""
+msgstr "Viešojo transporto maršrutas (geležinkelis)"
msgid "Route type"
msgstr "Maršruto tipas"
@@ -20241,7 +20345,7 @@ msgid "route segment"
msgstr "maršruto segmentas"
msgid "Public Transport Route (Bus)"
-msgstr ""
+msgstr "Viešojo transporto maršrutas (autobusas)"
msgid "trolleybus"
msgstr "troleibusas"
@@ -20338,10 +20442,10 @@ msgid "Reference Number"
msgstr "Nuorodos numeris"
msgid "Public Transport (Legacy)"
-msgstr ""
+msgstr "Viešasis transportas (legatas)"
msgid "Public transport route (Legacy)"
-msgstr ""
+msgstr "Viešojo transporto maršrutas (legatas)"
msgid "forward segment"
msgstr ""
@@ -20371,7 +20475,7 @@ msgid "Railway Platform"
msgstr "Geležinkelio platforma"
msgid "Reference (track number)"
-msgstr ""
+msgstr "Tako numeris"
msgid "Bus Station"
msgstr "Autobusų stotis"
@@ -20756,6 +20860,9 @@ msgstr "Ugniavietė"
msgid "Fishing"
msgstr "Žvejyba"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Naktinis klubas"
@@ -21609,7 +21716,7 @@ msgstr ""
msgctxt "running"
msgid "track"
-msgstr ""
+msgstr "takelis"
msgid "Nine-pin Bowling"
msgstr ""
@@ -21621,7 +21728,7 @@ msgid "Archery"
msgstr "Šaudymas iš Lanko"
msgid "Track and Field Athletics"
-msgstr ""
+msgstr "Lengvoji atletika"
msgid "Running"
msgstr ""
@@ -21646,7 +21753,7 @@ msgstr ""
msgctxt "racing"
msgid "track"
-msgstr ""
+msgstr "trasa"
msgid "Dog Racing"
msgstr "Šunų lenktynės"
@@ -21871,7 +21978,7 @@ msgstr ""
msgctxt "aerialway"
msgid "track"
-msgstr ""
+msgstr "trasa"
msgid "RC Car"
msgstr "RC Mašina"
@@ -22024,6 +22131,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -23611,7 +23722,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -23626,7 +23737,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -24888,6 +24999,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -24912,9 +25038,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -25074,8 +25197,14 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Mažėjantys namų numeriai adresų interpoliacijoje"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr ""
@@ -25160,6 +25289,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -25260,6 +25394,9 @@ msgstr "{0} privalo būti prijungta prie kelio"
msgid "node connects waterway and bridge"
msgstr "taškas jungia vandens kelią ir tiltą"
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -25269,6 +25406,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr "Per didelis pastatas"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "sutrumpintas gatvės pavadinimas"
@@ -25342,7 +25487,7 @@ msgid "unusual {0} specification"
msgstr ""
msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
+msgstr "nestandartinė geležinkelio vežė; naudokite mm be tarpo"
msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
@@ -25532,13 +25677,13 @@ msgid "Create a grid of ways"
msgstr ""
msgid "Download Track ..."
-msgstr ""
+msgstr "Atsiunčiamas kelias ..."
msgid "Download GPX track from openstreetmap.org"
-msgstr ""
+msgstr "Atsisiųskite GPX kelią iš openstreetmap.org"
msgid "Download Track"
-msgstr ""
+msgstr "Atsisiųsti Kelią"
msgid "Filename"
msgstr ""
@@ -25565,6 +25710,7 @@ msgstr ""
msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
msgstr ""
+"Stebima (dalinamasi tik anonimiškai, sudelioti taškai su laiko žymomis)"
msgid ""
"Identifiable (shown in trace list and as identifiable, ordered points with "
@@ -25596,7 +25742,7 @@ msgid "Please enter tags about your trace."
msgstr ""
msgid "Selected track: {0}"
-msgstr ""
+msgstr "Pasirinktos trasos: {0}"
msgid "No GPX layer selected. Cannot upload a trace."
msgstr ""
@@ -25665,10 +25811,10 @@ msgid "Gain"
msgstr ""
msgid "Tracks"
-msgstr ""
+msgstr "Trasos"
msgid "Elevation profile for track ''{0}''."
-msgstr ""
+msgstr "Aukščio profilis trasai ''{0}''."
msgid "Elevation profile"
msgstr ""
@@ -27535,7 +27681,7 @@ msgid " adding {0} {1}"
msgstr ""
msgid "Layer for editing GPX tracks"
-msgstr ""
+msgstr "Sluoksnis naudojamas GPX trasų keitimui"
msgid "Convert to GPX layer with anonymised time"
msgstr ""
@@ -27544,7 +27690,7 @@ msgid "EditGpx"
msgstr ""
msgid "edit gpx tracks"
-msgstr ""
+msgstr "keisti gpx trasas"
msgid "Import path from GPX layer"
msgstr ""
@@ -27947,10 +28093,11 @@ msgid ""
msgstr ""
msgid "max. tracktype grade"
-msgstr ""
+msgstr "maks. vėžės būklė"
msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
msgstr ""
+"Blogiausia vėžės būklė (1-5): galima naudoti transporto priemonę, 0: negalima"
msgid "Change bookmark"
msgstr ""
@@ -28093,7 +28240,7 @@ msgid ""
msgstr ""
msgid "Tracktype grades must be given as integers between 0 and 5."
-msgstr ""
+msgstr "Vežės būklė turi būti nurodyta sveikaisiais skaičiais tarp 0 ir 5."
msgid ""
"Surface values must not contain any of the following characters: '','', '' "
@@ -28407,6 +28554,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -28428,7 +28635,7 @@ msgid "km/h"
msgstr "km/h"
msgid "Track name: "
-msgstr ""
+msgstr "Trasos pavadinimas: "
msgid "Update IRS adjustment layer"
msgstr ""
@@ -28753,7 +28960,7 @@ msgid "LiveGPS layer"
msgstr ""
msgid "Capture GPS Track"
-msgstr ""
+msgstr "Sulaikyti GPS trasą"
msgid "Connect to gpsd server and show current position in LiveGPS layer."
msgstr ""
@@ -30499,16 +30706,16 @@ msgid "added"
msgstr ""
msgid "Public Transport: Enable GTFSStops"
-msgstr ""
+msgstr "Viešasis transportas: įjungti GTFSStops"
msgid "Public Transport: Catch GTFS stops"
-msgstr ""
+msgstr "Viešasis transportas: pagauti GTFS stoteles"
msgid "skipped"
msgstr ""
msgid "Public Transport: Disable GTFS"
-msgstr ""
+msgstr "Viešasis transportas: išjungti GTFS"
msgid "Create Stops from GTFS ..."
msgstr ""
@@ -30585,7 +30792,7 @@ msgid "moved"
msgstr ""
msgid "Public Transport: Join GTFS stops"
-msgstr ""
+msgstr "Viešasis transportas: bendros GTFS stotelės"
msgid "Id"
msgstr "Id"
@@ -30615,7 +30822,7 @@ msgid "Route patterns ..."
msgstr ""
msgid "Edit Route patterns for public transport"
-msgstr ""
+msgstr "Keisti maršruto paternus viešąjam transportui"
msgid "Route Patterns"
msgstr ""
@@ -30669,7 +30876,7 @@ msgid "Maximum distance from route"
msgstr ""
msgid "Public Transport: Change stop type"
-msgstr ""
+msgstr "Viešasis transportas: pakeisti stotelės tipą"
msgid "Create Stops from GPX ..."
msgstr ""
@@ -30707,44 +30914,53 @@ msgid "unnamed"
msgstr "bevardis"
msgid "Public Transport: Add track stop"
-msgstr ""
+msgstr "Viešasis transportas: pridėti stotelę trasoje"
msgid "Public Transport: Delete track stop"
-msgstr ""
+msgstr "Viešasis transportas: panaikinti stotelę trasoje"
msgid "Public Transport: Detach track stop list"
-msgstr ""
+msgstr "Viešasis transportas: atskirti trasos stotelių sąrašą"
msgid "Public Transport: Edit track stop list"
-msgstr ""
+msgstr "Viešasis transportas: keisti trasos stotelių sąrašą"
msgid "Public Transport: Relocate nodes in track stoplist"
-msgstr ""
+msgstr "Viešasis transportas: pakeisti taškų vietas, trasos stotelių sąraše"
msgid "Public Transport: sort track stop list"
-msgstr ""
+msgstr "Viešasis transportas: suskirstyti trasos stotelių sąrašą"
msgid "Public Transport: Suggest stops"
-msgstr ""
+msgstr "Viešasis transportas: pasiūlyti stotelių"
msgid "Stopname"
msgstr ""
msgid "Public Transport: Detach waypoints"
-msgstr ""
+msgstr "Viešasis transportas: atjungti tarpinius taškus"
msgid "Public Transport: Disable waypoints"
-msgstr ""
+msgstr "Viešasis transportas: išjungti tarpinius taškus"
msgid "Public Transport: Enable waypoints"
-msgstr ""
+msgstr "Viešasis transportas: įjungti tarpinius taškus"
msgid "Public Transport: Edit waypoint name"
+msgstr "Viešasis transportas: keisti tarpinio taško pavadinimą"
+
+msgid "Distance between stops"
msgstr ""
-msgid "Public transport routes"
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
msgstr ""
+msgid "Public transport routes"
+msgstr "Viešojo transporto maršrutai"
+
msgid "Toggle direction arrows"
msgstr ""
@@ -30752,7 +30968,7 @@ msgid "Toggle reference labels"
msgstr ""
msgid "Visualize public transport routes"
-msgstr ""
+msgstr "Pavaizduoti viešojo transporto maršrutus"
msgid "Filters"
msgstr ""
@@ -31532,9 +31748,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr "Sukuria individualius pastatus iš ilgo pastato."
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -33293,22 +33506,7 @@ msgid "The Ultimate WMS Super-speed Turbo Challenge II"
msgstr ""
msgid "Go driving"
-msgstr ""
+msgstr "Važiuokite"
msgid "Drive a race car on this layer"
-msgstr ""
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Neteisingas punktyro šablonas, bent viena reikšmė turi būti > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Neteisingas punktyro šablonas, reikšmės turi būti teigiamos"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Nepavyko išnagrinėti žemėlapio braižymo stilių iš „{0}“. Klaida: [{1}:{2}] "
-#~ "{3}"
+msgstr "Vairuokite lenktyninį automobilį ant šio sluoksnio"
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 10f28cc..fdbd17b 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:53+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:52+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "Java versija {0}"
msgid "Homepage"
msgstr "Mājas lapa"
-msgid "Bug Reports"
-msgstr "Kļūdu atskaites"
-
msgid "Info"
msgstr "Informācija"
@@ -172,6 +169,12 @@ msgstr "Spraudņi"
msgid "About JOSM..."
msgstr "Par JOSM..."
+msgid "OK"
+msgstr "Labi"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -579,9 +582,6 @@ msgstr "Pielabot attēlu slāņa pozīciju"
msgid "Adjust imagery offset"
msgstr "Pielabot attēla nobīdi"
-msgid "OK"
-msgstr "Labi"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1177,9 +1177,6 @@ msgstr "Pārsaukt arī failu"
msgid "Could not rename file ''{0}''"
msgstr "Nevarēja pārsaukt failu ''{0}''"
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1789,6 +1786,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1938,9 +1959,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2256,8 +2274,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3038,9 +3056,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3060,27 +3075,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4138,6 +4132,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4782,6 +4779,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Izveidoju galveno saskarni"
+
msgid "Updating plugins"
msgstr ""
@@ -4791,12 +4794,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Izveidoju galveno saskarni"
-
msgid "Loading plugins"
msgstr ""
@@ -5767,6 +5764,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6254,51 +6275,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "Kopija no {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopija {1} no {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6321,12 +6297,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6749,15 +6719,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6863,9 +6824,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7017,14 +6975,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7109,15 +7059,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7135,6 +7076,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "Kopija no {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopija {1} no {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7450,10 +7460,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9109,9 +9119,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9914,12 +9921,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11927,6 +11928,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12437,6 +12444,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13682,62 +13697,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13989,9 +13948,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14176,6 +14132,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14510,13 +14526,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14525,7 +14541,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14537,15 +14559,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14642,6 +14661,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14666,13 +14688,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14819,10 +14841,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14875,29 +14897,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14945,6 +14966,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15005,6 +15029,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15041,10 +15068,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15146,6 +15170,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15155,6 +15182,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15810,6 +15840,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17167,6 +17202,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17743,9 +17784,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18224,6 +18262,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19372,6 +19419,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20640,6 +20690,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22227,7 +22281,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22242,7 +22296,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23497,6 +23551,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23521,9 +23590,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23683,7 +23749,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23767,6 +23839,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23865,6 +23942,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23874,6 +23954,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26973,6 +27061,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29294,6 +29442,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30078,9 +30235,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index 83e4146..9169816 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:54+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:53+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -149,9 +149,6 @@ msgstr "Java — верзија {0}"
msgid "Homepage"
msgstr "Домашна страница"
-msgid "Bug Reports"
-msgstr "Известувања за грешки"
-
msgid "Info"
msgstr "Инфо"
@@ -173,6 +170,12 @@ msgstr "Приклучоци"
msgid "About JOSM..."
msgstr "За JOSM..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -577,9 +580,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1169,9 +1169,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1781,6 +1778,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1930,9 +1951,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2248,8 +2266,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3030,9 +3048,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3052,27 +3067,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4130,6 +4124,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4775,6 +4772,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Создавање на главниот графички интерфејс"
+
msgid "Updating plugins"
msgstr ""
@@ -4784,12 +4787,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Создавање на главниот графички интерфејс"
-
msgid "Loading plugins"
msgstr ""
@@ -5760,6 +5757,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6247,51 +6268,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6314,12 +6290,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6742,15 +6712,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6856,9 +6817,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7010,14 +6968,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7102,15 +7052,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7128,6 +7069,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7443,10 +7453,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9102,9 +9112,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9907,12 +9914,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11921,6 +11922,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12431,6 +12438,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13672,62 +13687,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13979,9 +13938,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14166,6 +14122,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14500,13 +14516,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14515,7 +14531,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14527,15 +14549,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14632,6 +14651,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14656,13 +14678,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14809,10 +14831,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14865,29 +14887,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14935,6 +14956,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14995,6 +15019,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15031,10 +15058,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15136,6 +15160,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15145,6 +15172,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15800,6 +15830,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17157,6 +17192,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17733,9 +17774,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18214,6 +18252,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19362,6 +19409,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20630,6 +20680,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22217,7 +22271,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22232,7 +22286,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23487,6 +23541,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23511,9 +23580,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23673,7 +23739,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23757,6 +23829,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23855,6 +23932,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23864,6 +23944,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26963,6 +27051,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29284,6 +29432,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30068,9 +30225,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index 55160b1..8990495 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:55+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:54+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: mr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -151,9 +151,6 @@ msgstr "जावा आवृत्ती {0}"
msgid "Homepage"
msgstr "मुखपृष्ठ"
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr "माहिती"
@@ -175,6 +172,12 @@ msgstr ""
msgid "About JOSM..."
msgstr "JOSM बद्दल..."
+msgid "OK"
+msgstr "ठीक"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -584,9 +587,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "ठीक"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1187,9 +1187,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1808,6 +1805,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1957,9 +1978,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2275,8 +2293,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3058,9 +3076,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3080,27 +3095,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "संबंध"
-
-msgid "Old role"
-msgstr "जुनी भूमिका"
-
-msgid "New role"
-msgstr "नवी भूमिका"
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4158,6 +4152,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4803,19 +4800,19 @@ msgstr ""
msgid "Initializing"
msgstr "प्रारंभत आहे"
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5788,6 +5785,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr "संबंध"
+
+msgid "Old role"
+msgstr "जुनी भूमिका"
+
+msgid "New role"
+msgstr "नवी भूमिका"
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6275,51 +6296,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr "दाखवा/लपवा"
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr "थर दाखवा/लपवा"
-
-msgid "Opacity"
-msgstr "अपारदर्शकता"
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "{0}ची प्रत"
-
-msgid "Copy {1} of {0}"
-msgstr "{0}ची प्रत {1}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6342,12 +6318,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6770,15 +6740,6 @@ msgstr ""
msgid "Discussions"
msgstr "चर्चा"
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6884,9 +6845,6 @@ msgstr ""
msgid "Date"
msgstr "दिनांक"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr "{0} [अपूर्ण]"
@@ -7038,14 +6996,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7130,15 +7080,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr "URL: "
@@ -7156,6 +7097,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "{0}ची प्रत"
+
+msgid "Copy {1} of {0}"
+msgstr "{0}ची प्रत {1}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr "अपारदर्शकता"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr "दाखवा/लपवा"
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr "थर दाखवा/लपवा"
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7471,10 +7481,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9130,9 +9140,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9945,12 +9952,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11959,6 +11960,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12469,6 +12476,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13710,62 +13725,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14017,9 +13976,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14204,6 +14160,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14538,13 +14554,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14553,7 +14569,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14565,15 +14587,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14670,6 +14689,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14694,13 +14716,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14847,10 +14869,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14903,29 +14925,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14973,6 +14994,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15033,6 +15057,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15069,10 +15096,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15174,6 +15198,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15183,6 +15210,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15838,6 +15868,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17195,6 +17230,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17771,9 +17812,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18252,6 +18290,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19400,6 +19447,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20668,6 +20718,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22255,7 +22309,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22270,7 +22324,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23525,6 +23579,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23549,9 +23618,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23711,7 +23777,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23795,6 +23867,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23893,6 +23970,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23902,6 +23982,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27001,6 +27089,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29322,6 +29470,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30106,9 +30263,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
@@ -31843,6 +31997,3 @@ msgstr ""
msgid "Drive a race car on this layer"
msgstr "ह्या थरावर शर्यतीची गाडी चालवा"
-
-#~ msgid "xml"
-#~ msgstr "xml"
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index c7ffb04..2ceb5e6 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:55+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:54+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "Versi Java {0}"
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr "Maklumat"
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr "Tentang JOSM"
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,6 +4769,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Membina GUI utama"
+
msgid "Updating plugins"
msgstr ""
@@ -4781,12 +4784,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Membina GUI utama"
-
msgid "Loading plugins"
msgstr ""
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 31695e3..d545d26 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2015-11-28 16:18+0000\n"
"Last-Translator: Magnus Meyer Hustveit <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:57+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:56+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -151,9 +151,6 @@ msgstr "Java versjon {0}"
msgid "Homepage"
msgstr "Hjemmeside"
-msgid "Bug Reports"
-msgstr "Feilrapporter"
-
msgid "Info"
msgstr "Info"
@@ -175,6 +172,12 @@ msgstr "Programtillegg"
msgid "About JOSM..."
msgstr "Om JOSM"
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Raporter feil"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Klarte ikke å finne ressursen \"{0}\"."
@@ -595,9 +598,6 @@ msgstr "Juster posisjonen til dette bildelaget"
msgid "Adjust imagery offset"
msgstr "Juster forskyvning av bildelag"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1198,9 +1198,6 @@ msgstr "Gi nytt navn på fil også"
msgid "Could not rename file ''{0}''"
msgstr "Kunne ikke endre filnavn \"{0}\""
-msgid "Report bug"
-msgstr "Raporter feil"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1819,6 +1816,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Spill av sakte"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1968,9 +1989,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2292,8 +2310,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3084,9 +3102,6 @@ msgstr "Løs konflikt i nodelisten til linje {0}"
msgid "Main dataset does not include node {0}"
msgstr "Hoveddatasettet inneholder ikke node {0}"
-msgid "Apply?"
-msgstr "Gjennomføre?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3106,27 +3121,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Relasjon"
-
-msgid "Old role"
-msgstr "Tidligere rolle"
-
-msgid "New role"
-msgstr "Ny rolle"
-
-msgid "Old key"
-msgstr "Tidligere nøkkel"
-
-msgid "Old value"
-msgstr "Tidligere verdi"
-
-msgid "New key"
-msgstr "Ny nøkkel"
-
-msgid "New value"
-msgstr "Ny verdi"
-
msgid "Apply selected changes"
msgstr "Bruk valgte endringer"
@@ -4188,6 +4182,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4838,6 +4835,12 @@ msgstr ""
msgid "Initializing"
msgstr "Klargjør"
+msgid "Setting defaults"
+msgstr "Setter standardverdier"
+
+msgid "Creating main GUI"
+msgstr "Bygger opp hovedskjermbilde"
+
msgid "Updating plugins"
msgstr ""
@@ -4847,12 +4850,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr "Laster første programtillegg"
-msgid "Setting defaults"
-msgstr "Setter standardverdier"
-
-msgid "Creating main GUI"
-msgstr "Bygger opp hovedskjermbilde"
-
msgid "Loading plugins"
msgstr "Laster inn programtillegg"
@@ -5851,6 +5848,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "Gjennomføre?"
+
+msgid "Relation"
+msgstr "Relasjon"
+
+msgid "Old role"
+msgstr "Tidligere rolle"
+
+msgid "New role"
+msgstr "Ny rolle"
+
+msgid "Old key"
+msgstr "Tidligere nøkkel"
+
+msgid "Old value"
+msgstr "Tidligere verdi"
+
+msgid "New key"
+msgstr "Ny nøkkel"
+
+msgid "New value"
+msgstr "Ny verdi"
+
msgid "For selected objects only"
msgstr ""
@@ -6338,51 +6359,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "Liste over alle innleste lag"
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Slå av/på visning av Lag"
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "Kopi av {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopi {1} av {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6405,12 +6381,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Flytt laget en rad opp."
-
-msgid "Move the selected layer one row down."
-msgstr "Flytt laget en rad ned."
-
msgid "Information about layer"
msgstr ""
@@ -6833,15 +6803,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6947,9 +6908,6 @@ msgstr ""
msgid "Date"
msgstr "Dato"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7101,14 +7059,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7193,15 +7143,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7219,6 +7160,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "Kopi av {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopi {1} av {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr "Flytt laget en rad ned."
+
+msgid "Move the selected layer one row up."
+msgstr "Flytt laget en rad opp."
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Slå av/på visning av Lag"
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7534,10 +7544,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9221,9 +9231,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -10048,12 +10055,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -12083,6 +12084,12 @@ msgstr "Innstillinger for tilkobling"
msgid "Connection Settings for the OSM server."
msgstr "Innstillinger for forbindelse til OSM-tjeneren"
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr "Handling"
@@ -12605,6 +12612,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13857,62 +13872,6 @@ msgstr ""
msgid "Error playing sound"
msgstr "Feil med avspilling av lyd"
-msgid "Do nothing"
-msgstr "Ikke gjør noe"
-
-msgid "Report Bug"
-msgstr "Rapporter feil"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "En uventet unntakstilstand"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14166,9 +14125,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Fant ikke oversettelsen for {0}. Bruker {1}."
@@ -14353,6 +14309,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Ikke gjør noe"
+
+msgid "Report Bug"
+msgstr "Rapporter feil"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "En uventet unntakstilstand"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14691,13 +14707,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14706,7 +14722,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14718,15 +14740,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14823,6 +14842,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14847,13 +14869,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15000,10 +15022,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15056,29 +15078,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15126,6 +15147,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15186,6 +15210,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15222,10 +15249,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15327,6 +15351,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15336,6 +15363,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15997,6 +16027,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17363,6 +17398,12 @@ msgstr "Veier"
msgid "Motorway"
msgstr "Motorvei"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17939,9 +17980,6 @@ msgstr "Motorveikryss"
msgid "Number"
msgstr "Nummer"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Service"
@@ -18420,6 +18458,15 @@ msgstr "Tidevannsflate"
msgid "mangrove"
msgstr "Mangrove"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Gjørme"
@@ -19568,6 +19615,9 @@ msgstr ""
msgid "Fishing"
msgstr "Fiskeplass"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20836,6 +20886,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22423,8 +22477,8 @@ msgstr "hundeposer"
msgid "food"
msgstr "mat"
-msgid "news_papers"
-msgstr "aviser"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parkeringsbillett"
@@ -22438,8 +22492,8 @@ msgstr "buss-, trikk- og togkart"
msgid "public_transport_tickets"
msgstr "billetter"
-msgid "SIM-cards"
-msgstr "SIM-kort"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "frimerker"
@@ -23693,6 +23747,21 @@ msgstr "natur"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23717,9 +23786,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23879,7 +23945,13 @@ msgstr "Camping"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23966,6 +24038,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24067,6 +24144,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24076,6 +24156,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27201,6 +27289,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29533,6 +29681,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30321,9 +30478,6 @@ msgstr "Terasseinndeling av hus (og rekkehus)"
msgid "Creates individual buildings from a long building."
msgstr "Del opp lang bygning i separate hus."
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 1ef41ed..4e67936 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:56+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:55+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3026,9 +3044,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3048,27 +3063,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr "Neue Rolle"
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4126,6 +4120,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4771,19 +4768,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5756,6 +5753,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr "Neue Rolle"
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6243,51 +6264,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6310,12 +6286,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6738,15 +6708,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6852,9 +6813,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7006,14 +6964,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7098,15 +7048,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7124,6 +7065,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7439,10 +7449,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9098,9 +9108,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9903,12 +9910,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11916,6 +11917,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12426,6 +12433,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13667,62 +13682,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13974,9 +13933,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14161,6 +14117,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14495,13 +14511,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14510,7 +14526,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14522,15 +14544,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14627,6 +14646,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14651,13 +14673,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14804,10 +14826,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14860,29 +14882,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14930,6 +14951,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14990,6 +15014,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15026,10 +15053,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15131,6 +15155,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15140,6 +15167,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15795,6 +15825,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17152,6 +17187,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17728,9 +17769,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18209,6 +18247,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19357,6 +19404,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20625,6 +20675,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22212,7 +22266,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22227,7 +22281,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23482,6 +23536,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23506,9 +23575,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23668,7 +23734,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23752,6 +23824,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23850,6 +23927,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23859,6 +23939,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26958,6 +27046,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29279,6 +29427,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30063,9 +30220,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index 5fe2dd4..3efad8a 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-02-29 16:02+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-16 11:44+0000\n"
"Last-Translator: DiGro <Unknown>\n"
"Language-Team: Dutch\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:40+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:39+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -154,9 +154,6 @@ msgstr "Java versie {0}"
msgid "Homepage"
msgstr "Startpagina"
-msgid "Bug Reports"
-msgstr "Probleemmeldingen"
-
msgid "Info"
msgstr "Info"
@@ -178,6 +175,12 @@ msgstr "Invoegtoepassingen"
msgid "About JOSM..."
msgstr "Over JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Probleem rapporteren"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Vinden van bron ''{0}'' mislukt."
@@ -613,9 +616,6 @@ msgstr "De positie van deze afbeeldingslaag aanpassen"
msgid "Adjust imagery offset"
msgstr "Verschuiving van deze afbeeldingslaag aanpassen"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1292,9 +1292,6 @@ msgstr "Ook het bestand hernoemen"
msgid "Could not rename file ''{0}''"
msgstr "Kon bestand ''{0}'' niet hernoemen"
-msgid "Report bug"
-msgstr "Probleem rapporteren"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Fout melden via JSOM bugtracker"
@@ -1967,6 +1964,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Langzaam vooruit"
+msgid "Downloading changeset content"
+msgstr "Downloaden van inhoud wijzigingenset"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Wijzigingenset {2} downloaden..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Inhoud voor wijzigingenset {2} downloaden..."
+
+msgid "Download changesets"
+msgstr "Wijzigingensets downloaden"
+
+msgid "Querying and downloading changesets"
+msgstr "Zoekopdrachten en downloaden wijzigingensets"
+
+msgid "Determine user id for current user..."
+msgstr "Gebruikers-ID voor huidige gebruiker bepalen..."
+
+msgid "Query and download changesets ..."
+msgstr "Zoekopdracht en downloaden wijzigingensets ..."
+
+msgid "Errors during download"
+msgstr "Fouten tijdens downloaden"
+
msgid "Download GPS"
msgstr "GPS downloaden"
@@ -2134,9 +2155,6 @@ msgstr "Verwijderde of verplaatste objecten"
msgid "The following errors occurred during mass download: {0}"
msgstr "De volgende fouten traden op gedurende bulk downloaden: {0}"
-msgid "Errors during download"
-msgstr "Fouten tijdens downloaden"
-
msgid "Error during download"
msgstr "Fout tijdens het downloaden"
@@ -2489,11 +2507,11 @@ msgid "Add selection to relation"
msgstr "Voeg selectie toe aan relatie"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Selectie aan relatie toevoegen</strong>: Controleer elke "
-"relatie om beschadigingen te voorkomen!"
+"{0}Selectie toevoegen aan relatie{1}: Verifieer elke relatie om schade te "
+"vermijden!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3333,9 +3351,6 @@ msgstr "Los conflicten op in de lijst met knopen van weg {0}"
msgid "Main dataset does not include node {0}"
msgstr "Er is geen knoop {0} in de hoofdgegevensset"
-msgid "Apply?"
-msgstr "Toepassen?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3363,27 +3378,6 @@ msgstr ""
"Bij het omdraaien van deze weg worden de volgende wijzigingen voorgesteld om "
"consistentie in de gegevens te behouden."
-msgid "Relation"
-msgstr "Relatie"
-
-msgid "Old role"
-msgstr "Oude rol"
-
-msgid "New role"
-msgstr "Nieuwe rol"
-
-msgid "Old key"
-msgstr "Oude sleutel"
-
-msgid "Old value"
-msgstr "Oude waarde"
-
-msgid "New key"
-msgstr "Nieuwe sleutel"
-
-msgid "New value"
-msgstr "Nieuwe waarde"
-
msgid "Apply selected changes"
msgstr "Geselecteerde wijzigingen toepassen"
@@ -4042,7 +4036,7 @@ msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
msgstr "Polar Stereographic: Parameter ''{0}'' moet 90 of -90 zijn."
msgid "Sinusoidal"
-msgstr ""
+msgstr "Sinusoïde"
msgid "Swiss Oblique Mercator"
msgstr "Zwitsers Oblique Mercator"
@@ -4079,7 +4073,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "E-Mail adres bevat ongeldig domein: {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Validatie e-mail"
msgid "URL is invalid"
msgstr "URL is ongeldig"
@@ -4100,7 +4094,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "URL heeft een ongeldig deel: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "Validatie URL"
msgid "Addresses"
msgstr "Adressen"
@@ -4540,10 +4534,13 @@ msgid "Public Transport Route"
msgstr "Route openbaar vervoer"
msgid "Route relation contains a ''{0}'' role"
-msgstr ""
+msgstr "Routerelatie bevat een rol ''{0}''"
msgid "Route relation contains a gap"
-msgstr ""
+msgstr "Routerelatie bevat een gat"
+
+msgid "Stop position not part of route"
+msgstr "Halte, geen deel van route"
msgid "Role verification problem"
msgstr "Probleem bij verificatie van rol"
@@ -5220,6 +5217,12 @@ msgstr "Gedetailleerd niveau voor debuggen ingeschakeld (trace)"
msgid "Initializing"
msgstr "Initialiseren"
+msgid "Setting defaults"
+msgstr "Standaarden instellen"
+
+msgid "Creating main GUI"
+msgstr "Hoofdscherm aanmaken"
+
msgid "Updating plugins"
msgstr "Bijwerken plugins"
@@ -5229,12 +5232,6 @@ msgstr "Installeren bijgewerkte plugins"
msgid "Loading early plugins"
msgstr "Vroege plugins laden"
-msgid "Setting defaults"
-msgstr "Standaarden instellen"
-
-msgid "Creating main GUI"
-msgstr "Hoofdscherm aanmaken"
-
msgid "Loading plugins"
msgstr "Plugins laden"
@@ -6324,6 +6321,30 @@ msgstr "Toon alleen de tags met conflicten"
msgid "Show tags with multiple values only"
msgstr "Toon alleen de tags met meerdere waarden"
+msgid "Apply?"
+msgstr "Toepassen?"
+
+msgid "Relation"
+msgstr "Relatie"
+
+msgid "Old role"
+msgstr "Oude rol"
+
+msgid "New role"
+msgstr "Nieuwe rol"
+
+msgid "Old key"
+msgstr "Oude sleutel"
+
+msgid "Old value"
+msgstr "Oude waarde"
+
+msgid "New key"
+msgstr "Nieuwe sleutel"
+
+msgid "New value"
+msgstr "Nieuwe waarde"
+
msgid "For selected objects only"
msgstr "Alleen voor de geselecteerde objecten"
@@ -6864,51 +6885,6 @@ msgstr "Schakelen van zichtbaarheid van laag: {0}"
msgid "Open a list of all loaded layers."
msgstr "Open een lijst met alle geladen lagen."
-msgid "Delete the selected layers."
-msgstr "Verwijder de geselecteerde lagen."
-
-msgid "Show/hide"
-msgstr "Weergeven/Verbergen"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Zichtbaarheid van een laag in- of uitschakelen."
-
-msgid "Show/hide layer"
-msgstr "Laag weergeven/verbergen"
-
-msgid "Opacity"
-msgstr "Dekking"
-
-msgid "Adjust opacity of the layer."
-msgstr "Dekkingsgraad van de laag aanpassen"
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Gammawaarde voor de laag aanpassen"
-
-msgid "Activate"
-msgstr "Activeren"
-
-msgid "Activate the selected layer"
-msgstr "De geselecteerde laag activeren"
-
-msgid "Activate layer"
-msgstr "Laag activeren"
-
-msgid "Merge this layer into another layer"
-msgstr "Deze laag samenvoegen met een andere laag"
-
-msgid "Duplicate this layer"
-msgstr "Deze laag dupliceren"
-
-msgid "Copy of {0}"
-msgstr "Kopie van {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopie {1} van {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "laag is nu zichtbaar (klik om te verbergen)"
@@ -6933,12 +6909,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "deze laag heeft geen eigen resolutie"
-msgid "Move the selected layer one row up."
-msgstr "De geselecteerde laag één rij omhoog verplaatsen."
-
-msgid "Move the selected layer one row down."
-msgstr "De geselecteerde laag één rij omlaag verplaatsen."
-
msgid "Information about layer"
msgstr "Informatie over laag"
@@ -7385,15 +7355,6 @@ msgstr "Afgesloten op"
msgid "Discussions"
msgstr "Besprekingen"
-msgid "Downloading changeset content"
-msgstr "Downloaden van inhoud wijzigingenset"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Wijzigingenset {2} downloaden..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Inhoud voor wijzigingenset {2} downloaden..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7513,9 +7474,6 @@ msgstr "Bespreking over de wijzigingenset vanaf de server van OSM bijwerken"
msgid "Date"
msgstr "Datum"
-msgid "Download changesets"
-msgstr "Wijzigingensets downloaden"
-
msgid "{0} [incomplete]"
msgstr "{0} [incompleet]"
@@ -7697,16 +7655,6 @@ msgid "Please enter an integer value > 0"
msgstr "Voer een geheel getal > 0 in"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>De huidige waarde is geen geldige gebruikersnaam.<br>Voer een niet-"
-"lege gebruikersnaam in.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Voer een niet-lege gebruikersnaam in"
-
-msgid ""
"Please enter a date in the usual format for your locale.<br>Example: "
"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
@@ -7815,15 +7763,6 @@ msgid "Close the dialog and abort querying of changesets"
msgstr ""
"Sluit het dialoogvenster en breek de zoekopdracht van de wijzigingensets af"
-msgid "Querying and downloading changesets"
-msgstr "Zoekopdrachten en downloaden wijzigingensets"
-
-msgid "Determine user id for current user..."
-msgstr "Gebruikers-ID voor huidige gebruiker bepalen..."
-
-msgid "Query and download changesets ..."
-msgstr "Zoekopdracht en downloaden wijzigingensets ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7845,6 +7784,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Deze URL voor de zoekopdracht voor wijzigingenset is ongeldig"
+msgid "Activate"
+msgstr "Activeren"
+
+msgid "Activate the selected layer"
+msgstr "De geselecteerde laag activeren"
+
+msgid "Activate layer"
+msgstr "Laag activeren"
+
+msgid "Delete the selected layers."
+msgstr "Verwijder de geselecteerde lagen."
+
+msgid "Duplicate this layer"
+msgstr "Deze laag dupliceren"
+
+msgid "Copy of {0}"
+msgstr "Kopie van {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopie {1} van {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Zichtbaarheid van de geselecteerde laag wijzigen."
+
+msgid "Show layer"
+msgstr "Laag weergeven"
+
+msgid "Adjust opacity of the layer."
+msgstr "Dekkingsgraad van de laag aanpassen"
+
+msgid "Opacity"
+msgstr "Dekking"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Gammawaarde voor de laag aanpassen"
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Waarde van (on)scherpte van de laag aanpassen."
+
+msgid "Sharpness"
+msgstr "Scherpte"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Volheid van de kleur van de laag aanpassen"
+
+msgid "Colorfulness"
+msgstr "Volheid van de kleur"
+
+msgid "Merge this layer into another layer"
+msgstr "Deze laag samenvoegen met een andere laag"
+
+msgid "Move the selected layer one row down."
+msgstr "De geselecteerde laag één rij omlaag verplaatsen."
+
+msgid "Move the selected layer one row up."
+msgstr "De geselecteerde laag één rij omhoog verplaatsen."
+
+msgid "Show/hide"
+msgstr "Weergeven/Verbergen"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Zichtbaarheid van een laag in- of uitschakelen."
+
+msgid "Show/hide layer"
+msgstr "Laag weergeven/verbergen"
+
msgid "Discardable key: selection Foreground"
msgstr "Te missen sleutel: selectie Voorgrond"
@@ -8086,13 +8094,13 @@ msgid "The key ''{0}'' is already used"
msgstr "De sleutel ''{0}'' is al in gebruik"
msgid "Ignore key ''{0}''"
-msgstr ""
+msgstr "Sleutel ''{0}'' negeren"
msgid "Ignore tag ''{0}''"
-msgstr ""
+msgstr "Tag ''{0}'' negeren"
msgid "Edit ignore list"
-msgstr ""
+msgstr "Lijst te negeren bewerken"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr "Je veranderde de waarde van ''{0}'' van ''{1}'' in ''{2}''"
@@ -8168,14 +8176,14 @@ msgstr "Ouder-relaties"
msgid "Child Relations"
msgstr "Kind-relaties"
-msgid "Apply Role:"
-msgstr "Rol toepassen;"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
"Voer een rol in om deze op de geselecteerde leden van de relatie toe te "
"passen"
+msgid "Apply Role:"
+msgstr "Rol toepassen;"
+
msgid "New Relation"
msgstr "Nieuwe relatie"
@@ -10091,9 +10099,6 @@ msgstr "Afbeelding vervagen"
msgid "Unsupported imagery type: {0}"
msgstr "Niet ondersteund type afbeelding: {0}"
-msgid "ERROR"
-msgstr "FOUT"
-
msgid "Next marker"
msgstr "Volgende markering"
@@ -10816,6 +10821,9 @@ msgid ""
"JOSM does no longer support mappaint styles written in the old XML format.\n"
"Please update ''{0}'' to MapCSS"
msgstr ""
+"JOSM ondersteunt niet langer kaarttekenstijlen die zijn geschreven in de "
+"oude indeling XML.\n"
+"Werk ''{0}'' bij naar MapCSS"
msgid "loading style ''{0}''..."
msgstr "stijl laden ''{0}''..."
@@ -10996,13 +11004,6 @@ msgstr "Voer de stappen voor het automatisch autoriseren nogmaals uit"
msgid "Test Access Token"
msgstr "Test Toegangstoken"
-msgid "Please enter your OSM user name"
-msgstr "Voer uw gebruikersnaam voor OSM in"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"De gebruikersnaam mag niet leeg zijn. Voer uw gebruikersnaam voor OSM in"
-
msgid "Please enter your OSM password"
msgstr "Voer uw wachtwoord voor OSM in"
@@ -13282,6 +13283,13 @@ msgstr "Verbindingsinstellingen"
msgid "Connection Settings for the OSM server."
msgstr "Verbindingsinstellingen voor de server van OSM."
+msgid "Please enter your OSM user name"
+msgstr "Voer uw gebruikersnaam voor OSM in"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"De gebruikersnaam mag niet leeg zijn. Voer uw gebruikersnaam voor OSM in"
+
msgid "Action"
msgstr "Opdracht"
@@ -13850,6 +13858,16 @@ msgstr ""
"Ongeldige waarde van attribuut ''{0}'' van element ''{1}'' in "
"servermogelijkheden. Kreeg ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Fout bij toevoegen van certificaat {0} - vingerafdruk van certificaat komt "
+"niet overeen. Verwacht {1}, was {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Certificaat voor TLS-verbindingen toevoegen: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Parsen van datum ''{0}'', antwoord van server, mislukt."
@@ -15246,80 +15264,6 @@ msgstr "niet gespecificeerde reden"
msgid "Error playing sound"
msgstr "Fout tijdens afspelen van geluid"
-msgid "Do nothing"
-msgstr "Niets doen"
-
-msgid "Report Bug"
-msgstr "Fout melden"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Er trad een onverwachte exceptie op.<br>Dit is altijd een fout in de "
-"codering. Indien u de laatste versie gebruikt van<br>JOSM, overweeg dan om "
-"aardig te zijn en een foutenrapport in te dienen."
-
-msgid "Update JOSM"
-msgstr "JOSM bijwerken"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Er trad een onverwachte fout op. Dit als altijd een fout in de "
-"codering.<br><br>Echter, u voert een oude versie van JOSM ({0}) uit,<br>in "
-"plaats van de huidige geteste versie te gebruiken "
-"(<b>{1}</b>).<br><br><b>Werk JOSM bij</b> vóórdat u overweegt een "
-"probleemrapport in te dienen."
-
-msgid "Unexpected Exception"
-msgstr "Er is een onverwachte fout opgetreden"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Onderdruk verdere dialoogvensters voor fouten voor deze sessie."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"U bent een fout tegengekomen in JOSM. Vóórdat u een foutenrapport indient, "
-"zorg er voor dat u hier bent bijgewerkt naar de laatste versie van JOSM:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"U zou ook uw plug-ins moeten bijwerken. Als geen van beide helpt dien dan "
-"een foutenrapport in onze database in voor problemen met behulp van deze "
-"koppeling:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Daar zou de hieronder vermelde informatie over de fout al voor u moeten zijn "
-"ingevuld. Vermeld informatie over hoe de fout kan worden gereproduceerd en "
-"probeer zo veel mogelijk details te geven als mogelijk."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Als alternatief: als dat niet werkt kunt u de onderstaande informatie "
-"handmatig invoeren bij deze URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(De tekst is reeds gekopieerd naar je klembord.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "U bent een probleem tegengekomen in JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15696,9 +15640,6 @@ msgstr "Downloaden doorgeleid naar ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Teveel doorgeleidingen naar de download-URL gedetecteerd. Afbreken."
-msgid "Fetching content..."
-msgstr "Inhoud ophalen..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Kan geen vertaling voor de locale {0} vinden. Val terug op {1}."
@@ -15919,6 +15860,86 @@ msgstr "Negeren van niet goed gevormde geometrie: {0}"
msgid "Failed to load XML schema."
msgstr "Laden van XML-schema mislukt."
+msgid "Do nothing"
+msgstr "Niets doen"
+
+msgid "Report Bug"
+msgstr "Fout melden"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Er trad een onverwachte exceptie op.<br>Dit is altijd een fout in de "
+"codering. Indien u de laatste versie gebruikt van<br>JOSM, overweeg dan om "
+"aardig te zijn en een foutenrapport in te dienen."
+
+msgid "Update JOSM"
+msgstr "JOSM bijwerken"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Er trad een onverwachte fout op. Dit als altijd een fout in de "
+"codering.<br><br>Echter, u voert een oude versie van JOSM ({0}) uit,<br>in "
+"plaats van de huidige geteste versie te gebruiken "
+"(<b>{1}</b>).<br><br><b>Werk JOSM bij</b> vóórdat u overweegt een "
+"probleemrapport in te dienen."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Onderdruk verdere dialoogvensters voor fouten voor deze sessie."
+
+msgid "Unexpected Exception"
+msgstr "Er is een onverwachte fout opgetreden"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "U bent een probleem tegengekomen in JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"U bent een fout tegengekomen in JOSM. Vóórdat u een foutenrapport indient, "
+"zorg er voor dat u hier bent bijgewerkt naar de laatste versie van JOSM:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"U zou ook uw plug-ins moeten bijwerken. Als geen van beide helpt dien dan "
+"een foutenrapport in onze database in voor problemen met behulp van deze "
+"koppeling:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Daar zou de hieronder vermelde informatie over de fout al voor u moeten zijn "
+"ingevuld. Vermeld informatie over hoe de fout kan worden gereproduceerd en "
+"probeer zo veel mogelijk details te geven als mogelijk."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Als alternatief: als dat niet werkt kunt u de onderstaande informatie "
+"handmatig invoeren bij deze URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(De tekst is reeds gekopieerd naar je klembord.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Openen van het bugrapport is mislukt. Rapporteer dit handmatig met behulp "
+"van deze website:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16266,14 +16287,14 @@ msgstr "Mapbox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS-sporen"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Standaard laag)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik zwart-wit)"
@@ -16281,8 +16302,14 @@ msgstr "OpenStreetMap (Mapnik zwart-wit)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, geen labels)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (Franse stijl)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Duitse stijl)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS-sporen"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16293,15 +16320,12 @@ msgstr "Public Transport (ÖPNV)"
msgid "Hike & Bike"
msgstr "Wandelen & Fietsen"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Duitse stijl)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Cambodia, Laos, Thailand, Vietnam tweetalig"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -16398,6 +16422,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (basiskaart)"
@@ -16422,14 +16449,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: Echtfarbenbild 2015 (10cm)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Terreinmodel)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Oppervlaktemodel)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: Höhen und Gelände"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) luchtfoto''s (bedekt ook de regio Brussel)"
@@ -16575,11 +16602,11 @@ msgstr "Géolittoral V2 - Orthophotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr ""
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr ""
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - luchtfoto''s 2012 - 20 cm"
@@ -16633,6 +16660,15 @@ msgstr "Beieren (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Beieren (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Berlijn luchtfoto''s 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Berlijn luchtfoto''s 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Berlijn luchtfoto''s 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (luchtfoto''s)"
@@ -16649,18 +16685,6 @@ msgstr ""
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Oude kaart van Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Fysieke kaart (natuurregio''s)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Fysieke kaart (natuurregio''s)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Overlay voor Bing (bijv. gebruik transparantie tussen 20% "
-"en 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16706,6 +16730,9 @@ msgstr "Törökbálint ortophoto 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 "Danube flood ortophoto 2013"
msgstr "Danube overstroming ortophoto 2013"
@@ -16766,6 +16793,9 @@ msgstr "OSMIE T.ie Land niet in Counties"
msgid "Lodi - Italy"
msgstr "Lodi - Italië"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Lombardije - Italië (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardije - Italië (CTR DBT)"
@@ -16802,11 +16832,8 @@ msgstr "1.cikla ortofotokarte - Letland"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Litouwen)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxemburg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxemburg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxemburg Inspire spoorwegen"
@@ -16907,6 +16934,9 @@ msgstr "Powiat poznański: Budynki (gebouwen)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (luchtfoto)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Powiat ropczycko-sędziszowski: Budynki (gebouwen)"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (gebouwen)"
@@ -16916,6 +16946,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (luchtfoto)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (gebouwen)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr "Poznań: Ortofotomapa 2014 (luchtfoto)"
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (gebouwen)"
@@ -17630,6 +17663,16 @@ msgstr "Importeren van vectorafbeeldingen (SVG)"
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
+"Deze plug-in vereenvoudigt het in kaart brengen en bewerken van binnen "
+"gelegen gangen."
+
+msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Verleent hulp bij het proces van het in kaart brengen van gegevens van OSM "
+"voor binnen gebouwen. Inclusief validatie en kaarttekenstijl voor gegevens "
+"voor in gebouwen."
msgid ""
"Extra information about current layer objects pop ups - currently GPX "
@@ -19093,6 +19136,12 @@ msgstr "Straten"
msgid "Motorway"
msgstr "Autosnelweg"
+msgid "Destination"
+msgstr "Bestemming"
+
+msgid "Destination reference"
+msgstr "Verwijzing naar bestemming"
+
msgid "Placement"
msgstr "Plaatsing"
@@ -19686,9 +19735,6 @@ msgstr "Afslag op autosnelweg"
msgid "Number"
msgstr "Nummer"
-msgid "Exit to"
-msgstr "Afrit naar"
-
msgid "Services"
msgstr "Diensten"
@@ -19792,17 +19838,17 @@ msgid "Choker"
msgstr "Versmalling"
msgid "Cushion"
-msgstr ""
+msgstr "Drempel"
msgid "Hump"
-msgstr ""
+msgstr "Drempel"
msgctxt "traffic_calming"
msgid "Island"
msgstr "Eiland"
msgid "Rumble strip"
-msgstr ""
+msgstr "Lawaaistrip"
msgid "Table"
msgstr "Tafel"
@@ -20172,6 +20218,15 @@ msgstr "slik"
msgid "mangrove"
msgstr "mangroven"
+msgid "wet_meadow"
+msgstr "nat_land"
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr "zout"
+
msgid "Mud"
msgstr "Modder"
@@ -20773,7 +20828,7 @@ msgid "Public Transport"
msgstr "Openbaar vervoer"
msgid "Public Transport Route (Rail)"
-msgstr ""
+msgstr "Route openbaar vervoer (Rail)"
msgid "Route type"
msgstr "Type route"
@@ -20809,7 +20864,7 @@ msgid "route segment"
msgstr "segment route"
msgid "Public Transport Route (Bus)"
-msgstr ""
+msgstr "Route openbaar vervoer (Bus)"
msgid "trolleybus"
msgstr "trolleybus"
@@ -21326,6 +21381,9 @@ msgstr "Vuurplaats"
msgid "Fishing"
msgstr "Visstek"
+msgid "Bird Hide"
+msgstr "Vogeluitkijkplek"
+
msgid "Night Club"
msgstr "Nachtclub"
@@ -22594,6 +22652,10 @@ msgid "transformer_tower"
msgstr "transformatie_toren"
msgctxt "building"
+msgid "public"
+msgstr "openbaar"
+
+msgctxt "building"
msgid "Levels"
msgstr "Niveaus"
@@ -24183,8 +24245,8 @@ msgstr "hondenpoepzakjes"
msgid "food"
msgstr "voedsel"
-msgid "news_papers"
-msgstr "kranten"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parkeerkaartjes"
@@ -24198,8 +24260,8 @@ msgstr "overzichtskaart openbaar vervoer"
msgid "public_transport_tickets"
msgstr "openbaar vervoersbewijzen"
-msgid "SIM-cards"
-msgstr "SIM-kaarten"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "postzegels"
@@ -24872,19 +24934,19 @@ msgid "Orchard"
msgstr "Boomgaard"
msgid "Trees"
-msgstr ""
+msgstr "Bomen"
msgid "olive_trees"
-msgstr ""
+msgstr "olijf_bomen"
msgid "apple_trees"
-msgstr ""
+msgstr "appel_bomen"
msgid "oil_palms"
-msgstr ""
+msgstr "olie_palmen"
msgid "orange_trees"
-msgstr ""
+msgstr "sinaasappel_bomen"
msgid "almond_trees"
msgstr "amandel_bomen"
@@ -25467,6 +25529,21 @@ msgid "natural"
msgstr "natuurlijk"
msgid "Walking Route"
+msgstr "Wandelroute"
+
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
msgstr ""
msgid "Piste Route"
@@ -25493,9 +25570,6 @@ msgstr "alpine"
msgid "Detour Route"
msgstr "Omleidingsroute"
-msgid "Destination"
-msgstr "Bestemming"
-
msgid "Ref of the way this is a detour to"
msgstr "Verwijzing van de weg dit is een omleiding naar"
@@ -25655,8 +25729,14 @@ msgstr "Camping"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Aflopende huisnummers in interpolatie van adressen"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} zonder {1}"
@@ -25743,9 +25823,18 @@ msgid ""
"Wrong usage of {0} tag. Remove {1}, because it is clear that the name is "
"missing even without an additional tag."
msgstr ""
+"Verkeerd gebruik van tag {0}. Verwijder {1}, want het is duidelijk dat de "
+"naam ontbreekt, zelfs zonder een aanvullende tag."
-msgid "{0} is deprecated. Please use instead a multipolygon."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
msgstr ""
+"{0} is niet specifiek. Gebruik in plaats daarvan de sleutel fixme met in de "
+"waarde van fixme de informatie over wat exact zou moeten worden gerepareerd."
+
+msgid "{0} is deprecated. Please use instead a multipolygon."
+msgstr "{0} is vervallen. Gebruik in plaats daarvan een multipolygoon."
msgid ""
"{0} is deprecated. Please specify interval by using opening_hours syntax"
@@ -25798,7 +25887,7 @@ msgid "{0} is inaccurate"
msgstr "{0} is niet accuraat"
msgid "{0} is deprecated for {1}"
-msgstr ""
+msgstr "{0} is vervallen voor {1}"
msgid "{0} is deprecated. Use the {1}: key prefix instead."
msgstr ""
@@ -25853,6 +25942,9 @@ msgstr "{0} moet worden verbonden aan een weg"
msgid "node connects waterway and bridge"
msgstr "knoop verbindt waterweg en brug"
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr "verdachte richting rotonde"
@@ -25862,6 +25954,16 @@ msgstr "{0} op een groot gebied"
msgid "{0} on a small area"
msgstr "{0} op een klein gebied"
+msgid "Too large building"
+msgstr "Gebouw te groot"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+"Knoop verbindt een elektriciteitslijn of kabel met een object dat niet is "
+"gerelateerd aan de infrastructuur voor elektriciteit."
+
msgid "abbreviated street name"
msgstr "afgekorte straatnaam"
@@ -29291,19 +29393,82 @@ msgid "Please open or create data layer before importing"
msgstr "Open of maak een gegevenslaag vóór het importeren"
msgid "Concourse wizard ..."
-msgstr ""
+msgstr "Assistent wachtruimte ..."
msgid "Opens up a wizard to create a concourse"
-msgstr ""
+msgstr "Opent een assistent om een wachtruimte te maken"
msgid "Vertical layer:"
-msgstr ""
+msgstr "Verticale laag:"
msgid "Structure type:"
-msgstr ""
+msgstr "Type structuur:"
msgid "Offset into background:"
+msgstr "Verschuiving op achtergrond:"
+
+msgid "Indoor Mapping Helper"
+msgstr "Hulpprogramma Indoor mappen"
+
+msgid "POWER"
+msgstr "POWER"
+
+msgid "Activates the plug-in"
+msgstr "Activeert de plug-in"
+
+msgid "Working Level"
+msgstr "Werkniveau"
+
+msgid "Selects the working level."
+msgstr "Selecteert het werkniveau."
+
+msgid "Level Name"
+msgstr "Naam niveau"
+
+msgid "Optional name-tag for a level."
+msgstr "Optionele tag name voor een niveau."
+
+msgid "The object preset you want to tag."
+msgstr "Het voorkeuzeobject dat u wilt taggen."
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr "Stelt de tag name in als het object room werd geselecteerd."
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr "Stelt de tag ref in als het object room werd geselecteerd."
+
+msgid "Apply Tags"
+msgstr "Tags toepassen"
+
+msgid "Fitting"
+msgstr "Passen"
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
msgstr ""
+"<html>Onthoud om uw bouwplannen nu in te passen.<br>Gebruik, om dat te doen, "
+"de plug-in PicLayer, die u kunt installeren<br>met behulp van Plug-ins "
+"beheren in JOSM.</html>"
+
+msgid "Level Selection"
+msgstr "Selectie van niveau"
+
+msgid "Lowest Level"
+msgstr "Laagste niveau"
+
+msgid "The lowest level of your building."
+msgstr "Het laagste niveau van uw gebouw."
+
+msgid "Highest Level"
+msgstr "Hoogste niveau"
+
+msgid "The highest level of your building."
+msgstr "Het hoogste niveau van uw gebouw."
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr "Gereedschap voor hulp bij in kaart brengen binnen gebouwen"
msgid "InfoMode"
msgstr "InfoMode"
@@ -31754,6 +31919,15 @@ msgstr "Openbaar vervoer: Wegpunten inschakelen"
msgid "Public Transport: Edit waypoint name"
msgstr "Openbaar vervoer: Naam wegpunt bewerken"
+msgid "Distance between stops"
+msgstr "Afstand tussen haltes"
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr "Een geldige route public_transport:version=2 is vereist"
+
+msgid "Invalid selection"
+msgstr "Ongeldige selectie"
+
msgid "Public transport routes"
msgstr "Routes openbaar vervoer"
@@ -32586,9 +32760,6 @@ msgstr "Rijtjeshuis maken"
msgid "Creates individual buildings from a long building."
msgstr "Maak losse gebouwen uit een langgerekt gebouw."
-msgid "Invalid selection"
-msgstr "Ongeldige selectie"
-
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 "
@@ -34093,20 +34264,22 @@ msgid "Replace geometry for way {0}"
msgstr "Vervang geometrie voor weg {0}"
msgid "Replace Membership"
-msgstr ""
+msgstr "Lid vervangen"
msgid ""
"In relations where the selected object is member of, replace it with a new "
"one"
msgstr ""
+"In relaties waar het geselecteerde object van is, vervang het door een nieuw"
msgid "Replaced ''{0}'' by ''{1}'' in {2} relation"
msgid_plural "Replaced ''{0}'' by ''{1}'' in {2} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vervangen ''{0}'' door ''{1}'' in {2} relatie"
+msgstr[1] "Vervangen ''{0}'' door ''{1}'' in {2} relaties"
msgid "The first selected object ''{0}'' is not part of any relation"
msgstr ""
+"Het eerste geselecteerde object ''{0}'' is geen deel van enige relatie"
msgid "Range of child primitives count"
msgstr "Bereik van telling kind-primitieven"
@@ -34572,17 +34745,3 @@ msgstr "Begin te rijden"
msgid "Drive a race car on this layer"
msgstr "Rijd met een raceauto over deze laag"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Ongeldig patroon van streepjes, waarden moeten positief zijn"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Ongeldig patroon van streepjes, ten minste één waarde moet > 0 zijn"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Parsen van Kaarttekenstijlen vanaf ''{0}'' mislukt. Fout was: [{1}:{2}] {3}"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index 1d36db4..2416f3e 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:56+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:55+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "Java versjon {0}"
msgid "Homepage"
msgstr "Heimeside"
-msgid "Bug Reports"
-msgstr "Feilrapportar"
-
msgid "Info"
msgstr "Info"
@@ -172,6 +169,12 @@ msgstr "Programtillegg"
msgid "About JOSM..."
msgstr "Om JOSM"
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index 24cda69..c755bed 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:57+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:56+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -149,9 +149,6 @@ msgstr "Version de Java {0}"
msgid "Homepage"
msgstr "Pagina d'acuèlh"
-msgid "Bug Reports"
-msgstr "Rapòrts d'error"
-
msgid "Info"
msgstr "Info"
@@ -173,6 +170,12 @@ msgstr "Moduls extèrnes"
msgid "About JOSM..."
msgstr "A prepaus de JOSM..."
+msgid "OK"
+msgstr "D'acòrdi"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -581,9 +584,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "D'acòrdi"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1173,9 +1173,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1785,6 +1782,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avançar pus lentament"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1934,9 +1955,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2252,8 +2270,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3034,9 +3052,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr "Aplicar ?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3056,27 +3071,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Relacion"
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4134,6 +4128,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4779,6 +4776,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Creacion de l’interfàcia grafica de l'utilizaire (GUI)"
+
msgid "Updating plugins"
msgstr ""
@@ -4788,12 +4791,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Creacion de l’interfàcia grafica de l'utilizaire (GUI)"
-
msgid "Loading plugins"
msgstr ""
@@ -5764,6 +5761,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "Aplicar ?"
+
+msgid "Relation"
+msgstr "Relacion"
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6251,51 +6272,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Activar"
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "Copiar {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Còpia {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6318,12 +6294,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6746,15 +6716,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6860,9 +6821,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr "{0} [incomplet]"
@@ -7014,14 +6972,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7106,15 +7056,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr "URL : "
@@ -7132,6 +7073,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr "Activar"
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "Copiar {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Còpia {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7447,10 +7457,10 @@ msgstr ""
msgid "Child Relations"
msgstr "Relacions enfants"
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9106,9 +9116,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9913,12 +9920,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11926,6 +11927,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12436,6 +12443,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13677,62 +13692,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13984,9 +13943,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14171,6 +14127,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14505,13 +14521,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14520,7 +14536,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14532,15 +14554,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14637,6 +14656,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14661,13 +14683,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14814,10 +14836,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14870,29 +14892,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14940,6 +14961,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15000,6 +15024,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15036,10 +15063,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15141,6 +15165,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15150,6 +15177,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15805,6 +15835,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17162,6 +17197,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17738,9 +17779,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18219,6 +18257,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19367,6 +19414,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20635,6 +20685,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22222,7 +22276,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22237,7 +22291,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23492,6 +23546,21 @@ msgstr "natura"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23516,9 +23585,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23678,7 +23744,13 @@ msgstr "Camping"
msgid "Test"
msgstr "Tèst"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23762,6 +23834,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23860,6 +23937,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23869,6 +23949,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26968,6 +27056,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29289,6 +29437,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30073,9 +30230,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index 968e25c..880429c 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:58+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:57+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index 8678a09..f257c36 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-04 15:35+0000\n"
-"Last-Translator: Daniel Koć <daniel at xn--ko-wla.pl>\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-14 21:14+0000\n"
+"Last-Translator: Zbigniew Czernik <Unknown>\n"
"Language-Team: Polish <josm-lang-pl at googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-03-13 04:59+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:58+0000\n"
+"X-Generator: Launchpad (build 17995)\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"
@@ -59,12 +59,10 @@ msgid "Invalid value {0} for parameter ''has_arg''"
msgstr "Niepoprawna wartość {0} dla parametru ''has_arg''"
msgid "Background Terms of Use"
-msgstr "Warunki korzystania z tła"
+msgstr "Warunki korzystania z podkładu"
msgid "Opening link not supported on current platform (''{0}'')"
-msgstr ""
-"Połączenie do otworzenia nie jest obsługiwane na bieżącej platformie "
-"(\"{0}\")"
+msgstr "Otwarcie łącza nie jest obsługiwane na tej platformie (\"{0}\")"
msgid "ERROR: {0}"
msgstr "BŁĄD: {0}"
@@ -97,7 +95,7 @@ msgid "Initializing validator"
msgstr "Inicjowanie walidatora"
msgid "Initializing presets"
-msgstr "Inicjowanie ustawień"
+msgstr "Inicjowanie szablonów"
msgid "Initializing map styles"
msgstr "Inicjowanie stylów map"
@@ -109,7 +107,7 @@ msgid "Updating user interface"
msgstr "Uaktualnianie interfejsu użytkownika"
msgid "Failed to save default preferences."
-msgstr "Nie udało się zapisać domyślnych preferencji."
+msgstr "Nie udało się zapisać domyślnych ustawień."
msgid "Ignoring malformed URL: \"{0}\""
msgstr "Pominięto nieprawidłowy adres URL: \"{0}\""
@@ -155,16 +153,13 @@ msgid "Version {0}"
msgstr "Wersja {0}"
msgid "Last change at {0}"
-msgstr "Ostatnia zmiana o {0}"
+msgstr "Ostatnia zmiana {0}"
msgid "Java Version {0}"
msgstr "Wersja Javy {0}"
msgid "Homepage"
-msgstr "Strona główna"
-
-msgid "Bug Reports"
-msgstr "Zgłoś błąd"
+msgstr "Strona domowa"
msgid "Info"
msgstr "Informacje"
@@ -187,8 +182,14 @@ msgstr "Wtyczki"
msgid "About JOSM..."
msgstr "O JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Zgłoś błąd"
+
msgid "Failed to locate resource ''{0}''."
-msgstr "Nie udało się zlokalizować źródła ''{0}''."
+msgstr "Nie udało się zlokalizować zasobu ''{0}''."
msgid "Failed to load resource ''{0}'', error is {1}."
msgstr "Nie udało się załadować zasobu ''{0}'', błąd: {1}."
@@ -228,7 +229,7 @@ msgid "Please select at least one already uploaded node, way, or relation."
msgstr "Proszę wybrać co najmniej jeden węzeł, linię lub relację"
msgid "Please select the target layer."
-msgstr "Wybierz warstwę docelową"
+msgstr "Proszę wybrać warstwę docelową"
msgid "Select target layer"
msgstr "Wybierz warstwę docelową"
@@ -616,9 +617,6 @@ msgstr "Dopasuj położenie warstwy obrazu"
msgid "Adjust imagery offset"
msgstr "Dopasowuj przesunięcie warstwy podkładu"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1271,9 +1269,6 @@ msgstr "zmień także nazwę pliku"
msgid "Could not rename file ''{0}''"
msgstr "Nie mogłem przemianować pliku ''{0}''"
-msgid "Report bug"
-msgstr "Zgłoś błąd"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Wyślij zgłoszenie do JOSM bugtracker"
@@ -1939,6 +1934,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Zmniejsza prędkość odtwarzania."
+msgid "Downloading changeset content"
+msgstr "Pobieranie zawartości zestawu zmian"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Pobieranie zestawu zmian {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Pobieranie zawarości dla zestawu zmian {2}..."
+
+msgid "Download changesets"
+msgstr "Pobierz zestawy zmian"
+
+msgid "Querying and downloading changesets"
+msgstr "Odpytywanie i pobieranie zestawów zmian"
+
+msgid "Determine user id for current user..."
+msgstr "Ustal id bieżącego użytkownika..."
+
+msgid "Query and download changesets ..."
+msgstr "Odpytaj i pobierz zestawy zmian..."
+
+msgid "Errors during download"
+msgstr "Błędy w czasie pobierania"
+
msgid "Download GPS"
msgstr "Pobiera GPS"
@@ -2112,9 +2131,6 @@ msgstr "Usunięte lub przeniesione obiekty"
msgid "The following errors occurred during mass download: {0}"
msgstr "Podczas masowego pobierania wystąpiły następujące błędy: {0}"
-msgid "Errors during download"
-msgstr "Błędy w czasie pobierania"
-
msgid "Error during download"
msgstr "Błąd podczas pobierania"
@@ -2468,11 +2484,9 @@ msgid "Add selection to relation"
msgstr "Dodaj zaznaczenie do relacji"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Dodaj zaznaczenie do relacji</strong>:Kontroluje każdą "
-"relację, aby uniknąć szkody!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3333,9 +3347,6 @@ msgstr "Rozwiaż konflikty w liscie węzłów linii {0}"
msgid "Main dataset does not include node {0}"
msgstr "Główny zbiór danych nie zawiera węzła {0}"
-msgid "Apply?"
-msgstr "Zastosować?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3367,27 +3378,6 @@ msgstr ""
"Przy odwracaniu tej linii następujące zmiany są sugerowane w celu zachowania "
"spójności danych."
-msgid "Relation"
-msgstr "Relacja"
-
-msgid "Old role"
-msgstr "Poprzednia rola"
-
-msgid "New role"
-msgstr "Nowa rola"
-
-msgid "Old key"
-msgstr "Stary klucz"
-
-msgid "Old value"
-msgstr "Stara wartość"
-
-msgid "New key"
-msgstr "Nowy klucz"
-
-msgid "New value"
-msgstr "Nowa wartość"
-
msgid "Apply selected changes"
msgstr "Zastosuj wybrane zmiany"
@@ -3985,7 +3975,7 @@ msgid "Parameter ''{0}'' required."
msgstr "Parametr ''{0}'' jest wymagany."
msgid "standard parallels are opposite"
-msgstr ""
+msgstr "standardowe paralele są przeciwne"
msgid "Cassini-Soldner"
msgstr ""
@@ -4006,7 +3996,7 @@ msgid "Mercator"
msgstr "odwzorowanie Merkatora"
msgid "Oblique Mercator"
-msgstr ""
+msgstr "Ukośny Mercator"
msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
msgstr ""
@@ -4523,6 +4513,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problem z weryfikacją roli"
@@ -5189,6 +5182,12 @@ msgstr "Włączony poziom dokładnego debugowania (trace)"
msgid "Initializing"
msgstr "Inicjowanie"
+msgid "Setting defaults"
+msgstr "Zapisywanie domyślnych ustawień"
+
+msgid "Creating main GUI"
+msgstr "Przygotowywanie interfejsu użytkownika"
+
msgid "Updating plugins"
msgstr "Aktualizowanie wtyczek"
@@ -5198,12 +5197,6 @@ msgstr "Instalacja zaktualizowanych wtyczek"
msgid "Loading early plugins"
msgstr "Wczytywanie wczesnych wtyczek"
-msgid "Setting defaults"
-msgstr "Zapisywanie domyślnych ustawień"
-
-msgid "Creating main GUI"
-msgstr "Przygotowywanie interfejsu użytkownika"
-
msgid "Loading plugins"
msgstr "Wczytywanie wtyczek"
@@ -6253,6 +6246,30 @@ msgstr "Pokaż tylko tagi z konfliktami"
msgid "Show tags with multiple values only"
msgstr "Pokaż tylko tagi z różnymi wartościami"
+msgid "Apply?"
+msgstr "Zastosować?"
+
+msgid "Relation"
+msgstr "Relacja"
+
+msgid "Old role"
+msgstr "Poprzednia rola"
+
+msgid "New role"
+msgstr "Nowa rola"
+
+msgid "Old key"
+msgstr "Stary klucz"
+
+msgid "Old value"
+msgstr "Stara wartość"
+
+msgid "New key"
+msgstr "Nowy klucz"
+
+msgid "New value"
+msgstr "Nowa wartość"
+
msgid "For selected objects only"
msgstr "Tylko dla zaznaczonych obiektów"
@@ -6768,51 +6785,6 @@ msgstr "Przełącz widoczność warstwy: {0}"
msgid "Open a list of all loaded layers."
msgstr "Otwiera listę wszystkich wczytanych warstw."
-msgid "Delete the selected layers."
-msgstr "Usuń zaznaczoną warstwę."
-
-msgid "Show/hide"
-msgstr "Wyświetl/ukryj"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Zmienia widocznoś zaznaczonej warstwy."
-
-msgid "Show/hide layer"
-msgstr "Wyświetl/ukryj warstwę"
-
-msgid "Opacity"
-msgstr "Krycie"
-
-msgid "Adjust opacity of the layer."
-msgstr "Zmienia stopień krycia (przezroczystość) warstwy."
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Dostosuj wartość gamma warstwy."
-
-msgid "Activate"
-msgstr "Aktywuj"
-
-msgid "Activate the selected layer"
-msgstr "Aktywuj zaznzczoną warstwę"
-
-msgid "Activate layer"
-msgstr "Aktywuj warstwę"
-
-msgid "Merge this layer into another layer"
-msgstr "Połącz tę warstwę z inną warstwą"
-
-msgid "Duplicate this layer"
-msgstr "Skopiuj warstwę"
-
-msgid "Copy of {0}"
-msgstr "Kopia warstwy {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopia nr {1} warstwy {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "warstwa jest teraz widoczna (kliknij aby ją ukryć)"
@@ -6835,12 +6807,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
-
-msgid "Move the selected layer one row down."
-msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
-
msgid "Information about layer"
msgstr "Informacje o warstwie"
@@ -7272,15 +7238,6 @@ msgstr "Zamknięty"
msgid "Discussions"
msgstr "Dyskusje"
-msgid "Downloading changeset content"
-msgstr "Pobieranie zawartości zestawu zmian"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Pobieranie zestawu zmian {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Pobieranie zawarości dla zestawu zmian {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7398,9 +7355,6 @@ msgstr "Atualizuje dyskusję nad zestawem zmian z serwera OSM"
msgid "Date"
msgstr "Data"
-msgid "Download changesets"
-msgstr "Pobierz zestawy zmian"
-
msgid "{0} [incomplete]"
msgstr "{0} [niekompletny]"
@@ -7571,16 +7525,6 @@ msgid "Please enter an integer value > 0"
msgstr "Proszę wprowadzić liczbę całkowitą >0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Wprowadzona wartość nie jest prawidłową nazwą użytkownika.<br>Proszę "
-"wprowadzić nie-pustą nazwę użytkownika.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Wprowadź poprawną nazwę użytkownika"
-
-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 ""
@@ -7679,15 +7623,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr "Zamyka okno i przerywa odpytywanie o zestawy zmian."
-msgid "Querying and downloading changesets"
-msgstr "Odpytywanie i pobieranie zestawów zmian"
-
-msgid "Determine user id for current user..."
-msgstr "Ustal id bieżącego użytkownika..."
-
-msgid "Query and download changesets ..."
-msgstr "Odpytaj i pobierz zestawy zmian..."
-
msgid "URL: "
msgstr "URL: "
@@ -7705,6 +7640,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr "Aktywuj"
+
+msgid "Activate the selected layer"
+msgstr "Aktywuj zaznzczoną warstwę"
+
+msgid "Activate layer"
+msgstr "Aktywuj warstwę"
+
+msgid "Delete the selected layers."
+msgstr "Usuń zaznaczoną warstwę."
+
+msgid "Duplicate this layer"
+msgstr "Skopiuj warstwę"
+
+msgid "Copy of {0}"
+msgstr "Kopia warstwy {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopia nr {1} warstwy {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Zmienia stopień krycia (przezroczystość) warstwy."
+
+msgid "Opacity"
+msgstr "Krycie"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Dostosuj wartość gamma warstwy."
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Połącz tę warstwę z inną warstwą"
+
+msgid "Move the selected layer one row down."
+msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
+
+msgid "Move the selected layer one row up."
+msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
+
+msgid "Show/hide"
+msgstr "Wyświetl/ukryj"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Zmienia widocznoś zaznaczonej warstwy."
+
+msgid "Show/hide layer"
+msgstr "Wyświetl/ukryj warstwę"
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -8035,12 +8039,12 @@ msgstr "Relacje nadrzędne"
msgid "Child Relations"
msgstr "Relacje podrzędne"
-msgid "Apply Role:"
-msgstr "Zastosuj rolę:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Wprowadź rolę i zastosuj ją dla zaznaczonych członków relacji"
+msgid "Apply Role:"
+msgstr "Zastosuj rolę:"
+
msgid "New Relation"
msgstr "Nowa relacja"
@@ -9728,7 +9732,7 @@ msgid "Metadata "
msgstr "Metadane "
msgid "Load tile"
-msgstr ""
+msgstr "Wczytywanie kafelka"
msgid "Auto zoom"
msgstr ""
@@ -9882,9 +9886,6 @@ msgstr "Przezroczystość podkładu"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "BŁĄD"
-
msgid "Next marker"
msgstr "Następny znacznik"
@@ -10776,13 +10777,6 @@ msgstr "Uruchom ponownie kroki automatycznego uwierzytelnienia."
msgid "Test Access Token"
msgstr "Testuj klucz dostępu"
-msgid "Please enter your OSM user name"
-msgstr "Proszę wprowadć swoją nazwę użytkownika OSM."
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Nazwa użytkownika nie może być pusta. Proszę wprowadzić nazwę użytkownika OSM"
-
msgid "Please enter your OSM password"
msgstr "Proszę wprowadź swoje hasło OSM."
@@ -12930,6 +12924,13 @@ msgstr "Ustawienia połączenia"
msgid "Connection Settings for the OSM server."
msgstr "Ustawienia połączenia z serwerem OSM."
+msgid "Please enter your OSM user name"
+msgstr "Proszę wprowadć swoją nazwę użytkownika OSM."
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Nazwa użytkownika nie może być pusta. Proszę wprowadzić nazwę użytkownika OSM"
+
msgid "Action"
msgstr "Akcja"
@@ -13454,6 +13455,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -14766,71 +14775,6 @@ msgstr "nieokreślony powód"
msgid "Error playing sound"
msgstr "Błąd odtwarzania dźwięku"
-msgid "Do nothing"
-msgstr "Nic nie rób"
-
-msgid "Report Bug"
-msgstr "Zgłoś błąd"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Wystąpił nieoczekiwany wyjątek.<br>Jest to błąd związany z kodem programu. "
-"Jeśli używasz<br>najnowszej wersji JOSM, wyślij proszę zgłoszenie błędu."
-
-msgid "Update JOSM"
-msgstr "Aktualizuj JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "Nieoczekiwany błąd"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Nie pokazuj więcej raportów z błędami dla tej sesji."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Napotkałeś błąd w JOSM. Zanim zgłosisz błąd upewnij się że posiadasz "
-"najnowszą wersję JOSM dostępną tutaj:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Powinieneś także zaktualizować swoje wtyczki. Jeśli żadna z tych sugestii "
-"nie pomaga prosimy o zgłoszenie błędu w naszym systemie za pomocą tego linku:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Dane dotyczące błędu powinny zostać dla ciebie wyświetlone poniżej. Dołącz "
-"proszę informację o tym jak wywołać ten błąd opisując to tak najdokładniej "
-"jak się da."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr "Alternatywnie możesz wypełnić formularz z opisem pod tym adresem:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Tekst już został skopiowany do schowka.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Napotkałeś błąd w JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15101,9 +15045,6 @@ msgstr "Pobieranie przekierowanie do ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Zbyt wiele przekierowań wykryto przy pobieraniu URL. Przerywam."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Nie udało się odnaleźć tłumaczenia dla języka: {0}. Użyty zostanie {1}."
@@ -15300,6 +15241,75 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Nic nie rób"
+
+msgid "Report Bug"
+msgstr "Zgłoś błąd"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Wystąpił nieoczekiwany wyjątek.<br>Jest to błąd związany z kodem programu. "
+"Jeśli używasz<br>najnowszej wersji JOSM, wyślij proszę zgłoszenie błędu."
+
+msgid "Update JOSM"
+msgstr "Aktualizuj JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Nie pokazuj więcej raportów z błędami dla tej sesji."
+
+msgid "Unexpected Exception"
+msgstr "Nieoczekiwany błąd"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Napotkałeś błąd w JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Napotkałeś błąd w JOSM. Zanim zgłosisz błąd upewnij się że posiadasz "
+"najnowszą wersję JOSM dostępną tutaj:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Powinieneś także zaktualizować swoje wtyczki. Jeśli żadna z tych sugestii "
+"nie pomaga prosimy o zgłoszenie błędu w naszym systemie za pomocą tego linku:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Dane dotyczące błędu powinny zostać dla ciebie wyświetlone poniżej. Dołącz "
+"proszę informację o tym jak wywołać ten błąd opisując to tak najdokładniej "
+"jak się da."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr "Alternatywnie możesz wypełnić formularz z opisem pod tym adresem:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Tekst już został skopiowany do schowka.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15636,13 +15646,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
-msgstr ""
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -15651,8 +15661,14 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -15663,15 +15679,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -15768,6 +15781,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15792,13 +15808,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15945,10 +15961,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16001,29 +16017,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16071,6 +16086,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16131,6 +16149,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16167,10 +16188,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -16272,6 +16290,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -16281,6 +16302,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16941,6 +16965,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18187,10 +18216,10 @@ msgid "Toll"
msgstr "Bramka (opłaty)"
msgid "Intermittent"
-msgstr ""
+msgstr "Nieregularnie"
msgid "Seasonal"
-msgstr ""
+msgstr "Sezonowo"
msgid "In the tidal range"
msgstr "Teren zalewowy"
@@ -18318,6 +18347,12 @@ msgstr "Sieć drogowa"
msgid "Motorway"
msgstr "Autostrada"
+msgid "Destination"
+msgstr "Miejsce docelowe"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr "Położenie"
@@ -18894,9 +18929,6 @@ msgstr "Węzeł autostradowy"
msgid "Number"
msgstr "Numer"
-msgid "Exit to"
-msgstr "Zjazd na"
-
msgid "Services"
msgstr "Miejsce obsługi podróżnych"
@@ -19377,6 +19409,15 @@ msgstr "tereny zalewowe"
msgid "mangrove"
msgstr "namorzyny"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Błota"
@@ -20525,6 +20566,9 @@ msgstr "Ognisko"
msgid "Fishing"
msgstr "Miejsce do wędkowania"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Klub nocny"
@@ -20684,7 +20728,7 @@ msgstr "adwentyzm"
msgctxt "christian"
msgid "spiritist"
-msgstr ""
+msgstr "spirytyzm"
msgid "Mosque"
msgstr "Meczet"
@@ -21793,6 +21837,10 @@ msgid "transformer_tower"
msgstr "wieża transformatorowa"
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Poziomy"
@@ -21805,7 +21853,7 @@ msgstr "mieszkalny"
msgctxt "building"
msgid "apartments"
-msgstr "apartament"
+msgstr "blok (potocznie)"
msgctxt "building"
msgid "house"
@@ -23382,8 +23430,8 @@ msgstr "torby na odchody"
msgid "food"
msgstr "jedzenie"
-msgid "news_papers"
-msgstr "gazety"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "bilety parkingowe"
@@ -23397,8 +23445,8 @@ msgstr "mapy komunikacji miejskiej"
msgid "public_transport_tickets"
msgstr "bilety komunikacji miejskiej"
-msgid "SIM-cards"
-msgstr "karty SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "znaczki"
@@ -23702,13 +23750,13 @@ msgid "Political"
msgstr "Polityczna"
msgid "Division"
-msgstr "Wydział"
+msgstr "Podział"
msgid "canton"
msgstr "kanton"
msgid "linguistic_community"
-msgstr ""
+msgstr "wspólnota językowa"
msgid "ward"
msgstr "okręg"
@@ -23723,7 +23771,7 @@ msgid "Protected Area"
msgstr "Obszar chroniony"
msgid "Protect Class"
-msgstr ""
+msgstr "Klasa ochrony"
msgid "Title or type of protection"
msgstr "Przyczyna lub rodzaj ochrony"
@@ -24060,22 +24108,22 @@ msgid "Orchard"
msgstr "Sad"
msgid "Trees"
-msgstr ""
+msgstr "Drzewa"
msgid "olive_trees"
-msgstr ""
+msgstr "drzewa oliwne"
msgid "apple_trees"
-msgstr ""
+msgstr "jabłonie"
msgid "oil_palms"
msgstr ""
msgid "orange_trees"
-msgstr ""
+msgstr "drzewka pomarańczowe"
msgid "almond_trees"
-msgstr ""
+msgstr "migdałowce"
msgid "banana_plants"
msgstr ""
@@ -24087,19 +24135,19 @@ msgid "hazel_plants"
msgstr ""
msgid "cherry_trees"
-msgstr ""
+msgstr "wiśnie"
msgid "persimmon_trees"
-msgstr ""
+msgstr "persymony"
msgid "walnut_trees"
-msgstr ""
+msgstr "orzechowce"
msgid "plum_trees"
-msgstr ""
+msgstr "śliwy"
msgid "peach_trees"
-msgstr ""
+msgstr "brzoskwinie"
msgid "tea_plants"
msgstr ""
@@ -24648,7 +24696,7 @@ msgid "lwn"
msgstr ""
msgid "infrastructure"
-msgstr ""
+msgstr "infrastruktura"
msgid "natural"
msgstr "naturalne"
@@ -24656,20 +24704,35 @@ msgstr "naturalne"
msgid "Walking Route"
msgstr "Szlak spacerowy"
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Trasa narciarska"
msgid "link segment"
-msgstr ""
+msgstr "segment łaczący"
msgid "shortcut segment"
-msgstr ""
+msgstr "skrót trasy"
msgid "variant segment"
-msgstr ""
+msgstr "wariant trasy"
msgid "entry points"
-msgstr ""
+msgstr "początek trasy"
msgid "Ski Route"
msgstr "Szlak narciarski"
@@ -24680,14 +24743,11 @@ msgstr ""
msgid "Detour Route"
msgstr "Objazd"
-msgid "Destination"
-msgstr "Miejsce docelowe"
-
msgid "Ref of the way this is a detour to"
msgstr "Numer drogi której dotyczy objazd"
msgid "fork node for alternative routes"
-msgstr ""
+msgstr "miejsce rozdzielenia trasy alternatywnej"
msgid "Power Route"
msgstr "Szlak energetyczny"
@@ -24842,7 +24902,13 @@ msgstr "Kemping"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -24926,6 +24992,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -25024,6 +25095,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -25033,6 +25107,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26425,16 +26507,14 @@ msgstr ""
msgid "There is {0} building with multiple address nodes inside"
msgid_plural "There are {0} buildings with multiple address nodes inside"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Jest {0} budynek (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] ""
-msgstr[1] ""
+msgstr[0] "Jest {0} budynek (budynków) z konfliktem adresowym"
msgid "No address nodes inside buildings found"
-msgstr ""
+msgstr "Nie znaleziono węzłów z adresem wewnątrz budynków"
msgid "on polygon"
msgstr ""
@@ -26674,7 +26754,7 @@ msgid "Sea, rivers, swimming pools."
msgstr ""
msgid "Buildings, covers, underground constructions."
-msgstr ""
+msgstr "Budynki, zadaszenia, konstrukcje podziemne."
msgid "Symbols like cristian cross."
msgstr "Symbole takie jak krzyż chrześcijański."
@@ -28151,6 +28231,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -28607,7 +28747,7 @@ msgid "Start walk mode"
msgstr ""
msgid "Zoom to selected image"
-msgstr ""
+msgstr "Powiększ do wybranego obrazu"
msgid "Zoom to the currently selected Mapillary image"
msgstr ""
@@ -30489,6 +30629,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Złe zaznaczenie"
+
msgid "Public transport routes"
msgstr ""
@@ -31276,9 +31425,6 @@ msgstr "Podziel budynek"
msgid "Creates individual buildings from a long building."
msgstr "Tworzy indywidualne budynki z jednego budynku."
-msgid "Invalid selection"
-msgstr "Złe zaznaczenie"
-
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 "
@@ -32400,6 +32546,7 @@ msgstr "Wklej relacje"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
+"Wklej przynależność do relacji z obiektów w schowku do zaznaczonych obiektów"
msgid "Split Object"
msgstr "Rozdziel obiekt"
@@ -32428,10 +32575,10 @@ msgid "The selected nodes can not be consecutive nodes in the object."
msgstr ""
msgid "Split adjacent ways"
-msgstr ""
+msgstr "Rozdziel sąsiadujące linie"
msgid "Split adjacent ways on T-intersections"
-msgstr ""
+msgstr "Rozdziel sąsiadujące linie na połączeniach w kształcie T"
msgid ""
"There are several ways containing one of the splitting nodes. Select ways "
@@ -32663,7 +32810,7 @@ msgid "Replace geometry for way {0}"
msgstr "Zastąp geometrię dla linii {0}"
msgid "Replace Membership"
-msgstr ""
+msgstr "Zmień przynależność"
msgid ""
"In relations where the selected object is member of, replace it with a new "
@@ -33117,6 +33264,3 @@ msgstr "Jedź!"
msgid "Drive a race car on this layer"
msgstr "Prowadź wyścigówkę po tej warstwie"
-
-#~ msgid "xml"
-#~ msgstr "xml"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 2015c12..13de485 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: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-02-04 00:01+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-01 17:05+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: 2016-03-13 04:59+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:58+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -98,7 +98,7 @@ msgid "Updating user interface"
msgstr "A atualizar a interface"
msgid "Failed to save default preferences."
-msgstr ""
+msgstr "Não foi possível gravar as preferências padrão."
msgid "Ignoring malformed URL: \"{0}\""
msgstr "A ignorar o endereço web inválido: \"{0}\""
@@ -151,9 +151,6 @@ msgstr "Versão Java {0}"
msgid "Homepage"
msgstr "Site oficial"
-msgid "Bug Reports"
-msgstr "Relatórios de Erros"
-
msgid "Info"
msgstr "Informação"
@@ -175,6 +172,12 @@ msgstr "Módulos"
msgid "About JOSM..."
msgstr "Sobre o JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Reportar erro"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Não foi possível localizar o recurso ''{0}''."
@@ -612,9 +615,6 @@ msgstr "Ajustar a posição desta imagem de fundo"
msgid "Adjust imagery offset"
msgstr "Alinhar imagem de fundo"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1291,9 +1291,6 @@ msgstr "Alterar também o nome do ficheiro"
msgid "Could not rename file ''{0}''"
msgstr "Não foi possível alterar o nome do ficheiro \"{0}\""
-msgid "Report bug"
-msgstr "Reportar erro"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Reportar um erro no site do JOSM (abre no navegador de internet)"
@@ -1970,6 +1967,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avançar mais lentamente"
+msgid "Downloading changeset content"
+msgstr "A descarregar o conteúdo do conjunto de alterações"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) A descarregar o conjunto de alterações {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) A descarregar o conteúdo do conjunto de alterações {2}..."
+
+msgid "Download changesets"
+msgstr "Descarregar conjuntos de alterações"
+
+msgid "Querying and downloading changesets"
+msgstr "A pedir e descarregar conjuntos de alterações"
+
+msgid "Determine user id for current user..."
+msgstr "A determinar o identificador de utilizador..."
+
+msgid "Query and download changesets ..."
+msgstr "Pedir e descarregar conjuntos de alterações ..."
+
+msgid "Errors during download"
+msgstr "Erros ao descarregar"
+
msgid "Download GPS"
msgstr "Descarregar dados GPS"
@@ -2135,9 +2156,6 @@ msgstr "Objetos eliminados ou movidos"
msgid "The following errors occurred during mass download: {0}"
msgstr "Ocorreram os seguintes erros durante o descarregamento maciço: {0}"
-msgid "Errors during download"
-msgstr "Erros ao descarregar"
-
msgid "Error during download"
msgstr "Erro ao descarregar"
@@ -2489,11 +2507,11 @@ msgid "Add selection to relation"
msgstr "Adicionar seleção à relação"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Adicionar seleção à relação</strong>: Controle cada uma das "
-"relações para evitar danificar as relações!"
+"{0}Adicionar a seleção à relação{1}: Verifique cada uma das relações para "
+"evitar danos!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3334,9 +3352,6 @@ msgstr "Resolver conflitos na lista de nós da linha {0}"
msgid "Main dataset does not include node {0}"
msgstr "O conjunto de dados principal não inclui o nó {0}"
-msgid "Apply?"
-msgstr "Aplicar?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3364,27 +3379,6 @@ msgstr ""
"Ao inverter o sentido da linha, são sugeridas as seguintes alterações por "
"forma a manter a consistência."
-msgid "Relation"
-msgstr "Relação"
-
-msgid "Old role"
-msgstr "Função anterior"
-
-msgid "New role"
-msgstr "Nova função"
-
-msgid "Old key"
-msgstr "Etiqueta atual"
-
-msgid "Old value"
-msgstr "Valor atual"
-
-msgid "New key"
-msgstr "Nova etiqueta"
-
-msgid "New value"
-msgstr "Novo valor"
-
msgid "Apply selected changes"
msgstr "Aplicar as alterações selecionadas"
@@ -3549,7 +3543,7 @@ msgstr ""
"preferências originais: {0}"
msgid "Failed to load defaults cache file: {0}"
-msgstr ""
+msgstr "Não foi possível carregar o ficheiro de cache padrão: {0}"
msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
@@ -3902,10 +3896,10 @@ msgid "areatext"
msgstr "área_de_texto"
msgid "Expected element ''{0}'', but got ''{1}''"
-msgstr ""
+msgstr "Era esperado o elemento ''{0}'', mas foi obtido ''{1}''"
msgid "value expected"
-msgstr ""
+msgstr "valor esperado"
msgid " (at line {0}, column {1})"
msgstr " (na linha {0}, coluna {1})"
@@ -3918,7 +3912,7 @@ msgstr ""
"Esperado um número inteiro no intervalo 1 a 60 no parâmetro ''+zone=...''."
msgid "No unit found for: {0}"
-msgstr ""
+msgstr "Nenhuma unidade encontrada para: {0}"
msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
msgstr ""
@@ -4047,7 +4041,7 @@ msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
msgstr "Polar Estereográfica: : o parâmetro ''{0}'' tem de ser 90 ou -90."
msgid "Sinusoidal"
-msgstr ""
+msgstr "Sinusoidal"
msgid "Swiss Oblique Mercator"
msgstr "Mercator Oblíquo Suíço"
@@ -4084,7 +4078,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "O endereço de email contém um domínio inválido: {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Verificação de email"
msgid "URL is invalid"
msgstr "O URL não é válido"
@@ -4105,7 +4099,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "O URL contém um fragmento inválido: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "Verificação de URL"
msgid "Addresses"
msgstr "Endereços"
@@ -4548,11 +4542,14 @@ msgid "Public Transport Route"
msgstr "Rota de Transportes Públicos"
msgid "Route relation contains a ''{0}'' role"
-msgstr ""
+msgstr "A relação de rota contém a função ''{0}''"
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problema na verificação da função"
@@ -4670,7 +4667,7 @@ msgid "Property values start or end with white space"
msgstr "Valores começam ou terminam com espaço em branco"
msgid "Property values contain multiple white spaces"
-msgstr ""
+msgstr "Os valores de propriedades têm vários espaços em branco"
msgid "Property values contain HTML entity"
msgstr "Valores das etiquetas contêm entidades HTML"
@@ -5251,6 +5248,12 @@ msgstr "Nível de depuração detalhado ativado (trace)"
msgid "Initializing"
msgstr "A inicializar"
+msgid "Setting defaults"
+msgstr "Definições de origem"
+
+msgid "Creating main GUI"
+msgstr "A criar a Interface de Utilização Gráfica principal"
+
msgid "Updating plugins"
msgstr "A atualizar os módulos"
@@ -5260,12 +5263,6 @@ msgstr "A instalar os módulos atualizados"
msgid "Loading early plugins"
msgstr "A carregar os módulos iniciais"
-msgid "Setting defaults"
-msgstr "Definições de origem"
-
-msgid "Creating main GUI"
-msgstr "A criar a Interface de Utilização Gráfica principal"
-
msgid "Loading plugins"
msgstr "A carregar os módulos"
@@ -6335,6 +6332,30 @@ msgstr "Mostrar apenas etiquetas com conflitos"
msgid "Show tags with multiple values only"
msgstr "Mostrar apenas etiquetas com vários valores"
+msgid "Apply?"
+msgstr "Aplicar?"
+
+msgid "Relation"
+msgstr "Relação"
+
+msgid "Old role"
+msgstr "Função anterior"
+
+msgid "New role"
+msgstr "Nova função"
+
+msgid "Old key"
+msgstr "Etiqueta atual"
+
+msgid "Old value"
+msgstr "Valor atual"
+
+msgid "New key"
+msgstr "Nova etiqueta"
+
+msgid "New value"
+msgstr "Novo valor"
+
msgid "For selected objects only"
msgstr "Apenas dos objetos selecionados"
@@ -6871,51 +6892,6 @@ msgstr "Alternar a visibilidade da camada: {0}"
msgid "Open a list of all loaded layers."
msgstr "Mostra o painel lateral com as camadas."
-msgid "Delete the selected layers."
-msgstr "Eliminar as camadas selecionadas."
-
-msgid "Show/hide"
-msgstr "Mostrar/esconder"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Mostrar/esconder a camada selecionada."
-
-msgid "Show/hide layer"
-msgstr "Mostrar/esconder camada"
-
-msgid "Opacity"
-msgstr "Opacidade"
-
-msgid "Adjust opacity of the layer."
-msgstr "Ajustar a opacidade da camada."
-
-msgid "Gamma"
-msgstr "Gama"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Ajustar luminosidade da camada"
-
-msgid "Activate"
-msgstr "Ativar"
-
-msgid "Activate the selected layer"
-msgstr "Ativar a camada selecionada"
-
-msgid "Activate layer"
-msgstr "Ativar camada"
-
-msgid "Merge this layer into another layer"
-msgstr "Fundir esta camada noutra camada"
-
-msgid "Duplicate this layer"
-msgstr "Duplicar esta camada"
-
-msgid "Copy of {0}"
-msgstr "Cópia de {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Cópia {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "a camada está visível (clicar para esconder)"
@@ -6936,13 +6912,7 @@ msgid ""
msgstr ""
msgid "this layer has no native resolution"
-msgstr ""
-
-msgid "Move the selected layer one row up."
-msgstr "Mover a camada selecionada para cima"
-
-msgid "Move the selected layer one row down."
-msgstr "Mover a camada selecionada para baixo"
+msgstr "esta camada não tem resolução nativa"
msgid "Information about layer"
msgstr "Informação sobre a camada"
@@ -7393,15 +7363,6 @@ msgstr "Fechado em"
msgid "Discussions"
msgstr "Discussões"
-msgid "Downloading changeset content"
-msgstr "A descarregar o conteúdo do conjunto de alterações"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) A descarregar o conjunto de alterações {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) A descarregar o conteúdo do conjunto de alterações {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7516,9 +7477,6 @@ msgstr ""
msgid "Date"
msgstr "Data"
-msgid "Download changesets"
-msgstr "Descarregar conjuntos de alterações"
-
msgid "{0} [incomplete]"
msgstr "{0} [incompletos]"
@@ -7700,16 +7658,6 @@ msgid "Please enter an integer value > 0"
msgstr "Por favor introduza um número inteiro > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>O valor atual não é o nome de um utilizador válido.<br>Por favor "
-"introduza um nome de utilizador.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Por favor introduza um nome de utilizador"
-
-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 ""
@@ -7820,15 +7768,6 @@ msgstr "Endereço web de pedido de conjuntos de alterações incorreto"
msgid "Close the dialog and abort querying of changesets"
msgstr "Fechar a janela e abortar o pedido de conjuntos de alterações"
-msgid "Querying and downloading changesets"
-msgstr "A pedir e descarregar conjuntos de alterações"
-
-msgid "Determine user id for current user..."
-msgstr "A determinar o identificador de utilizador..."
-
-msgid "Query and download changesets ..."
-msgstr "Pedir e descarregar conjuntos de alterações ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7851,6 +7790,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Este endereço web do pedido de conjunto de alterações não é válido"
+msgid "Activate"
+msgstr "Ativar"
+
+msgid "Activate the selected layer"
+msgstr "Ativar a camada selecionada"
+
+msgid "Activate layer"
+msgstr "Ativar camada"
+
+msgid "Delete the selected layers."
+msgstr "Eliminar as camadas selecionadas."
+
+msgid "Duplicate this layer"
+msgstr "Duplicar esta camada"
+
+msgid "Copy of {0}"
+msgstr "Cópia de {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Cópia {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Alterar a visibilidade da camada selecionada"
+
+msgid "Show layer"
+msgstr "Mostrar camada"
+
+msgid "Adjust opacity of the layer."
+msgstr "Ajustar a opacidade da camada."
+
+msgid "Opacity"
+msgstr "Opacidade"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Ajustar luminosidade da camada"
+
+msgid "Gamma"
+msgstr "Gama"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Fundir esta camada noutra camada"
+
+msgid "Move the selected layer one row down."
+msgstr "Mover a camada selecionada para baixo"
+
+msgid "Move the selected layer one row up."
+msgstr "Mover a camada selecionada para cima"
+
+msgid "Show/hide"
+msgstr "Mostrar/esconder"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Mostrar/esconder a camada selecionada."
+
+msgid "Show/hide layer"
+msgstr "Mostrar/esconder camada"
+
msgid "Discardable key: selection Foreground"
msgstr "Chave descartável: seleção no primeiro plano"
@@ -8046,7 +8054,7 @@ msgid "Remember last used tags after a restart"
msgstr "Lembrar as últimas etiquetas usadas após reiniciar o JOSM"
msgid "Recent tags with existing key"
-msgstr ""
+msgstr "Etiquetas recentes com chave existente"
msgid "Enable"
msgstr "Ativar"
@@ -8055,16 +8063,18 @@ msgid "Hide"
msgstr "Escondido"
msgid "Refresh recent tags list after applying tag"
-msgstr ""
+msgstr "Atualizar a lista de etiquetas recentes após aplicar a etiqueta"
msgid "No refresh"
-msgstr ""
+msgstr "Não atualizar"
msgid "Refresh tag status only (enabled / disabled)"
-msgstr ""
+msgstr "Atualizar apenas o estado da etiqueta (ativado / desativado)"
msgid "Refresh tag status and list of recently added tags"
msgstr ""
+"Atualizar o estado da etiqueta e a lista de etiquetas adicionadas "
+"recentemente"
msgid "to apply first suggestion"
msgstr "para aplicar a primeira sugestão"
@@ -8097,13 +8107,13 @@ msgid "The key ''{0}'' is already used"
msgstr "A chave ''{0}'' já está a ser utilizada"
msgid "Ignore key ''{0}''"
-msgstr ""
+msgstr "Ignorar chave ''{0}''"
msgid "Ignore tag ''{0}''"
-msgstr ""
+msgstr "Ignorar etiqueta ''{0}''"
msgid "Edit ignore list"
-msgstr ""
+msgstr "Editar lista de ignorar"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr "Alterou o valor de ''{0}'' de ''{1}'' para ''{2}''."
@@ -8177,12 +8187,12 @@ msgstr "Relações Pai"
msgid "Child Relations"
msgstr "Relações Filho"
-msgid "Apply Role:"
-msgstr "Aplicar Função:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Introduza uma função e aplique-a nos membros selecionados da relação"
+msgid "Apply Role:"
+msgstr "Aplicar Função:"
+
msgid "New Relation"
msgstr "Criar Relação"
@@ -10081,9 +10091,6 @@ msgstr "Desvanecimento da imagem de fundo"
msgid "Unsupported imagery type: {0}"
msgstr "Tipo de imagem não suportada: {0}"
-msgid "ERROR"
-msgstr "ERRO"
-
msgid "Next marker"
msgstr "Marcador seguinte"
@@ -10107,13 +10114,13 @@ msgid "All projections are supported"
msgstr "São suportadas todas as projeções"
msgid "The layer {0} does not support the new projection {1}."
-msgstr ""
+msgstr "A camada {0} não suporta a nova projeção {1}."
msgid "Supported projections are: {0}"
-msgstr ""
+msgstr "As projeções suportadas são: {0}"
msgid "Change the projection again or remove the layer."
-msgstr ""
+msgstr "Altere de novo a projeção ou remova a camada"
msgid "Save Layer"
msgstr "Gravar Camada"
@@ -10977,14 +10984,6 @@ msgstr "Executar novamente os passos de autorização automática"
msgid "Test Access Token"
msgstr "Testar Token de Acesso"
-msgid "Please enter your OSM user name"
-msgstr "Por favor introduza o seu nome de utilizador do OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"O nome de utilizador não pode estar em branco. Por favor introduza o seu "
-"nome de utilizador do OSM"
-
msgid "Please enter your OSM password"
msgstr "Por favor introduza a sua palavra-passe do OSM"
@@ -13278,6 +13277,14 @@ msgstr "Definições de Ligação"
msgid "Connection Settings for the OSM server."
msgstr "Configurações de Ligação com o servidor do OpenStreetMap"
+msgid "Please enter your OSM user name"
+msgstr "Por favor introduza o seu nome de utilizador do OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"O nome de utilizador não pode estar em branco. Por favor introduza o seu "
+"nome de utilizador do OSM"
+
msgid "Action"
msgstr "Ação"
@@ -13852,6 +13859,14 @@ msgstr ""
"Valor ilegal no atributo ''{0}'' do elemento ''{1}'' nas capacidades do "
"servidor. Obtido ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Adicionar certificado para ligações TLS: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Não foi possível processar a data ''{0}'' fornecida pelo servidor."
@@ -15253,79 +15268,6 @@ msgstr "motivo não especificado"
msgid "Error playing sound"
msgstr "Erro na reprodução de som"
-msgid "Do nothing"
-msgstr "Não fazer nada"
-
-msgid "Report Bug"
-msgstr "Comunicar um Erro"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Ocorreu uma excepção inesperada.<br>Trata-se de um erro de programação. Se "
-"estiver a usar a última versão<br>do JOSM, por favor ajude a melhorar o "
-"programa preenchendo um relatório de erro."
-
-msgid "Update JOSM"
-msgstr "Atualizar o JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Ocorreu um erro inesperado resultante de um erro de programação.<br><br>Se "
-"no entanto estiver a usar uma versão antiga do JOSM ({0}),<br>em vez da "
-"última versão (<b>{1}</b>).<br><br><b>Por favor atualize o JOSM</b> antes de "
-"reportar um erro aos programadores."
-
-msgid "Unexpected Exception"
-msgstr "Excepção Inesperada"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Não mostrar mais avisos de erros nesta sessão."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Encontrou um erro no JOSM. Antes de preencher um relatório de erro verifique "
-"se tem a última versão do JOSM em:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Também deve atualizar os módulos do JOSM. Se mesmo assim o erro persistir, "
-"preencha um relatório de erro no bugtracker usando o seguinte link:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"As informações sobre o erro que aparecem a seguir já contêm o essencial. No "
-"entanto será útil para os programadores se fornecer informações adicionais, "
-"como por exemplo, que passos tomar para que o erro apareça, caso saiba "
-"reproduzir o erro novamente."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Como alternativa, se não funcionar, pode preencher manualmente com a "
-"informação seguinte no endereço:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(O texto já foi copiado para a área de transferência.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Encontrou um bug no JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15700,9 +15642,6 @@ msgstr ""
"Foram detetados demasiados redirecionamentos do endereço para "
"descarregamento. A abortar."
-msgid "Fetching content..."
-msgstr "A obter dados..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Não foi possível encontrar a tradução para o idioma {0}. A repor {1}."
@@ -15936,6 +15875,85 @@ msgstr "A ignorar a geometria mal formada: {0}"
msgid "Failed to load XML schema."
msgstr "Não foi possível carregar o esquema XML."
+msgid "Do nothing"
+msgstr "Não fazer nada"
+
+msgid "Report Bug"
+msgstr "Comunicar um Erro"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Ocorreu uma excepção inesperada.<br>Trata-se de um erro de programação. Se "
+"estiver a usar a última versão<br>do JOSM, por favor ajude a melhorar o "
+"programa preenchendo um relatório de erro."
+
+msgid "Update JOSM"
+msgstr "Atualizar o JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Ocorreu um erro inesperado resultante de um erro de programação.<br><br>Se "
+"no entanto estiver a usar uma versão antiga do JOSM ({0}),<br>em vez da "
+"última versão (<b>{1}</b>).<br><br><b>Por favor atualize o JOSM</b> antes de "
+"reportar um erro aos programadores."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Não mostrar mais avisos de erros nesta sessão."
+
+msgid "Unexpected Exception"
+msgstr "Excepção Inesperada"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Encontrou um bug no JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Encontrou um erro no JOSM. Antes de preencher um relatório de erro verifique "
+"se tem a última versão do JOSM em:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Também deve atualizar os módulos do JOSM. Se mesmo assim o erro persistir, "
+"preencha um relatório de erro no bugtracker usando o seguinte link:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"As informações sobre o erro que aparecem a seguir já contêm o essencial. No "
+"entanto será útil para os programadores se fornecer informações adicionais, "
+"como por exemplo, que passos tomar para que o erro apareça, caso saiba "
+"reproduzir o erro novamente."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Como alternativa, se não funcionar, pode preencher manualmente com a "
+"informação seguinte no endereço:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(O texto já foi copiado para a área de transferência.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Não foi possível abrir a página para relatar um erro. Por favor relate um "
+"erro acedendo ao site:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16283,14 +16301,14 @@ msgstr "Satélite Mapbox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "Trilhos GPS no OpenStreetMap"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (camada padrão)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Preto e Branco)"
@@ -16298,8 +16316,14 @@ msgstr "OpenStreetMap (Mapnik Preto e Branco)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sem etiquetas)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (Estilo Francês)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Estilo Alemão)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "Trilhos GPS no OpenStreetMap"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16310,15 +16334,12 @@ msgstr "Transportes Públicos (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Estilo Alemão)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Camboja, Laos, Tailândia Vietname bilingue"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPublicTtransport Map (sobreposição)"
@@ -16415,6 +16436,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Ortofoto"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mapa base)"
@@ -16439,14 +16463,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: Echtfarbenbild 2015 (10cm)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (modelo do terreno)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (modelo de superfície)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: Höhen und Gelände"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) imagens aéreas (cobre também a região de Bruxelas)"
@@ -16592,10 +16616,10 @@ msgstr "Géolittoral V2 - Ortofotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16650,6 +16674,15 @@ msgstr "Bavaria (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Baviera (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr "Estugarda (imagens aéreas)"
@@ -16666,17 +16699,6 @@ msgstr ""
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Mapa antigo Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Mapa físico (regiões naturais)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Mapa físico (regiões naturais)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Sobre-camada para o Bing (usar opacidade entre 20% e 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16722,6 +16744,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16783,6 +16808,9 @@ msgstr "OSMIE T.ie Land not in Counties"
msgid "Lodi - Italy"
msgstr "Lodi - Itália"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardia - Itália (CTR DBT)"
@@ -16819,11 +16847,8 @@ msgstr "1.cikla ortofotokarte - Latvia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lituânia)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxemburgo Inspire - Ortofoto 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxemburgo Inspire - Ortofoto 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxemburgo Inspire - Caminho de Ferro"
@@ -16924,6 +16949,9 @@ msgstr "Condado de Poznań: Budynki (edifícios)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (imagens aéreas)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Polónia, Condado de Rzeszów: Edifícios"
@@ -16933,6 +16961,9 @@ msgstr "Polónia, Condado de Rzeszów: Ortofotomapa (imagens aéreas)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Polónia, Condado de Stalowa Wola: Edifícios"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Polónia, Przemyśl: Edifícios"
@@ -17636,6 +17667,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -19129,6 +19165,12 @@ msgstr "Estradas"
msgid "Motorway"
msgstr "Auto-estrada"
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr "Posicionamento"
@@ -19718,9 +19760,6 @@ msgstr "Saída de Auto-Estrada / VR / IP / IC"
msgid "Number"
msgstr "Número"
-msgid "Exit to"
-msgstr "Saída para"
-
msgid "Services"
msgstr "Área de Serviço (em Auto-Estrada ou similar)"
@@ -19815,29 +19854,29 @@ msgid "Traffic Calming"
msgstr "Redutor de Velocidade (lombas...)"
msgid "Bump"
-msgstr ""
+msgstr "Lomba (~30cm, convexa)"
msgid "Chicane"
-msgstr ""
+msgstr "Gincana"
msgid "Choker"
msgstr ""
msgid "Cushion"
-msgstr ""
+msgstr "Lomba tipo almofada"
msgid "Hump"
-msgstr ""
+msgstr "Lomba de velocidade (2-4m, convexa)"
msgctxt "traffic_calming"
msgid "Island"
-msgstr ""
+msgstr "Ilha no mei da via"
msgid "Rumble strip"
-msgstr ""
+msgstr "Faixas sonoras"
msgid "Table"
-msgstr ""
+msgstr "Lomba comprida (+3m, plana no meio, normalmente passadeira)"
msgid "Passing Place"
msgstr "Lugar de Passagem (em vias estreitas de 1 só faixa)"
@@ -20204,6 +20243,15 @@ msgstr "planície de maré"
msgid "mangrove"
msgstr "mangal / manguezal"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Lamaçal"
@@ -20802,7 +20850,7 @@ msgid "Public Transport"
msgstr "Transporte Público"
msgid "Public Transport Route (Rail)"
-msgstr ""
+msgstr "Rota de Transporte Público (Ferrovia)"
msgid "Route type"
msgstr "Tipo de rota"
@@ -20838,7 +20886,7 @@ msgid "route segment"
msgstr "segmento de rota"
msgid "Public Transport Route (Bus)"
-msgstr ""
+msgstr "Rota de Transporte Público (Autocarro)"
msgid "trolleybus"
msgstr "trólei"
@@ -21355,6 +21403,9 @@ msgstr "Local para Fogueiras"
msgid "Fishing"
msgstr "Pesca"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Discoteca"
@@ -22583,7 +22634,7 @@ msgstr "gasómetro (reservatório)"
msgctxt "building"
msgid "silo"
-msgstr ""
+msgstr "silo"
msgctxt "building"
msgid "cowshed"
@@ -22626,6 +22677,10 @@ msgid "transformer_tower"
msgstr "torre de transformador de energia elétrica"
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Andares"
@@ -22739,7 +22794,7 @@ msgid "Gasometer"
msgstr "Gasómetro (depósito)"
msgid "Silo"
-msgstr ""
+msgstr "Silo"
msgid "Storage Tank"
msgstr "Depósito de Armazenagem"
@@ -24214,8 +24269,8 @@ msgstr "sacos para excrementos"
msgid "food"
msgstr "alimentos"
-msgid "news_papers"
-msgstr "jornais"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "bilhetes de estacionamento"
@@ -24229,8 +24284,8 @@ msgstr "mapas de transporte público"
msgid "public_transport_tickets"
msgstr "bilhetes de transporte público"
-msgid "SIM-cards"
-msgstr "cartões de telemóveis"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "selos de correio"
@@ -25504,6 +25559,21 @@ msgstr "natural"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Rota de pista na neve (esqui, downhill, trenó, snowboard...)"
@@ -25528,9 +25598,6 @@ msgstr "alpino"
msgid "Detour Route"
msgstr "Rota de Desvio"
-msgid "Destination"
-msgstr "Destino"
-
msgid "Ref of the way this is a detour to"
msgstr "Referência da estrada de desvio"
@@ -25692,8 +25759,14 @@ msgstr "Campismo"
msgid "Test"
msgstr "Teste"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Números de porta decrescentes na interpolação de endereços"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} sem {1}"
@@ -25779,6 +25852,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} está em desuso, em vez disso usar um polígono."
@@ -25836,7 +25914,7 @@ msgid "{0} is deprecated. Use the {1}: key prefix instead."
msgstr "{0} está em desuso. Usar a chave de prefixo {1}:"
msgid "questionable key (ending with a number): {0}"
-msgstr ""
+msgstr "chave questionável (termina com um número): {0}"
msgid "{0} on a node. Should be used on a way."
msgstr "{0} num nó. Deve ser usado numa linha."
@@ -25854,7 +25932,7 @@ msgid "{0} on a way. Should be used in a relation"
msgstr "{0} numa linha. Deve ser usado numa relação"
msgid "{0} together with {1} on a node. Remove {0}."
-msgstr ""
+msgstr "{0} junto com {1} num nó. Remover {0}."
msgid "{0} on a node"
msgstr "{0} num nó"
@@ -25883,13 +25961,24 @@ msgstr "{0} tem de estar numa linha"
msgid "node connects waterway and bridge"
msgstr "nó liga curso de água e ponte"
+msgid "{0} node connected to a highway"
+msgstr "nó {0} ligado a uma via"
+
msgid "suspicious roundabout direction"
msgstr "sentido da rotunda provavelmente errado"
msgid "{0} on a large area"
-msgstr ""
+msgstr "{0} numa área grande"
msgid "{0} on a small area"
+msgstr "{0} numa área pequena"
+
+msgid "Too large building"
+msgstr "Edifício demaisado grande"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
msgstr ""
msgid "abbreviated street name"
@@ -28197,7 +28286,7 @@ msgid "Layer:"
msgstr "Camada:"
msgid "{0}: 0 / {1}: 0 / {2}: 0"
-msgstr ""
+msgstr "{0}: 0 / {1}: 0 / {2}: 0"
msgid "Subject"
msgstr "Sujeito a fusão"
@@ -28233,7 +28322,7 @@ msgid "Freeze reference selection"
msgstr ""
msgid "{0}: {1} / {2}: {3} / {4}: {5}"
-msgstr ""
+msgstr "{0}: {1} / {2}: {3} / {4}: {5}"
msgid "Invalid reference or subject"
msgstr "Referência ou sujeito a fusão inválidos"
@@ -29308,6 +29397,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -31760,6 +31909,15 @@ msgstr "Transporte Público: Ativar pontos de trilhos"
msgid "Public Transport: Edit waypoint name"
msgstr "Transporte Público: Editar nome do ponto de trilho"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Seleção incorreta"
+
msgid "Public transport routes"
msgstr "Rotas de transporte público"
@@ -32607,9 +32765,6 @@ msgstr "Dividir em edifícios contíguos"
msgid "Creates individual buildings from a long building."
msgstr "Cria edifícios individuais a partir de um edifício longo."
-msgid "Invalid selection"
-msgstr "Seleção incorreta"
-
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 "
@@ -34599,19 +34754,3 @@ msgid "Drive a race car on this layer"
msgstr ""
"Conduza um carro (necessário ter camada Bing ativa) e grave simultaneamente "
"um trilho GPS do percurso (não envie para o OpenStreetMap!)"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Padrão de tracejado inválido. Os valores têm de ser positivos."
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "Padrão de tracejado não válido. Pelo menos um dos valores tem de ser > 0"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Ocorreu um erro ao processar os estilos de visualização do mapa de ''{0}''. "
-#~ "Erro encontrado: [{1}:{2}] {3}"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index d6bb09b..b0427fa 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-09 17:09+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-13 01:06+0000\n"
"Last-Translator: Lucas Pereira <lucaspefreitas at gmail.com>\n"
"Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:10+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:09+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -153,10 +153,6 @@ msgstr "Java versão {0}"
msgid "Homepage"
msgstr "Página inicial"
-# Apesar do inglês querer dizer "relatórios de erros", o correto é "relatar erro", já que é utilizado em um link para abrir um novo ticket
-msgid "Bug Reports"
-msgstr "Relatar erro"
-
msgid "Info"
msgstr "Info"
@@ -178,6 +174,12 @@ msgstr "Extensões"
msgid "About JOSM..."
msgstr "Sobre o JOSM..."
+msgid "OK"
+msgstr "Aceitar"
+
+msgid "Report bug"
+msgstr "Relatar erro"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Falha ao encontrar o recurso \"{0}\"."
@@ -605,9 +607,6 @@ msgstr "Ajustar a posição desta camada imaginária"
msgid "Adjust imagery offset"
msgstr "Ajustar o deslocamento das imagens"
-msgid "OK"
-msgstr "Aceitar"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1277,9 +1276,6 @@ msgstr "Também renomear o arquivo"
msgid "Could not rename file ''{0}''"
msgstr "Não foi possível renomear arquivo ''{0}''"
-msgid "Report bug"
-msgstr "Relatar erro"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Relatar um erro ao bugtracker do JOSM"
@@ -1940,6 +1936,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avanço Lento"
+msgid "Downloading changeset content"
+msgstr "Baixando conteúdo do changeset"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Baixando changeset {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Baixando conteúdo do changeset {2}..."
+
+msgid "Download changesets"
+msgstr "Baixar conjuntos de alterações"
+
+msgid "Querying and downloading changesets"
+msgstr "Pesquisando e baixando conjuntos de alterações"
+
+msgid "Determine user id for current user..."
+msgstr "Determinar o id do usuário atual..."
+
+msgid "Query and download changesets ..."
+msgstr "Pesquisando e baixando conjuntos de alterações ..."
+
+msgid "Errors during download"
+msgstr "Erros durante a obtenção de dados"
+
msgid "Download GPS"
msgstr "Baixar GPS"
@@ -2102,9 +2122,6 @@ msgid "The following errors occurred during mass download: {0}"
msgstr ""
"Os erros a seguir ocorreram durante a obtenção de dados em massa: {0}"
-msgid "Errors during download"
-msgstr "Erros durante a obtenção de dados"
-
msgid "Error during download"
msgstr "Erro durante o download"
@@ -2456,11 +2473,9 @@ msgid "Add selection to relation"
msgstr "Adicionar seleção à relação"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Adiciona a seleção à relação</strong>: Controla cada relação "
-"única para evitar danos!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3294,9 +3309,6 @@ msgstr "Resolver conflitos na lista de nós do caminho {0}"
msgid "Main dataset does not include node {0}"
msgstr "Dataset Principal não inclui nó {0}"
-msgid "Apply?"
-msgstr "Aplicar?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3324,27 +3336,6 @@ msgstr ""
"Quando esse caminho é revertido, as seguintes modificações são sugeridas em "
"ordem para manter a consistência das informações."
-msgid "Relation"
-msgstr "Relação"
-
-msgid "Old role"
-msgstr "Regra antiga"
-
-msgid "New role"
-msgstr "Nova regra"
-
-msgid "Old key"
-msgstr "Chave antiga"
-
-msgid "Old value"
-msgstr "Valor antigo"
-
-msgid "New key"
-msgstr "Nova chave"
-
-msgid "New value"
-msgstr "Novo valor"
-
msgid "Apply selected changes"
msgstr "Aplicar alterações selecionadas"
@@ -4495,6 +4486,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Problema de verificação de função"
@@ -5170,6 +5164,12 @@ msgstr "Habilitado nível de depuração detalhado (trace)"
msgid "Initializing"
msgstr "Inicializando"
+msgid "Setting defaults"
+msgstr "Aplicando padrão"
+
+msgid "Creating main GUI"
+msgstr "Criando tela principal"
+
msgid "Updating plugins"
msgstr "Atualizado plugins"
@@ -5179,12 +5179,6 @@ msgstr "Instalando plugins atualizados"
msgid "Loading early plugins"
msgstr "Carregando plugins anteriores"
-msgid "Setting defaults"
-msgstr "Aplicando padrão"
-
-msgid "Creating main GUI"
-msgstr "Criando tela principal"
-
msgid "Loading plugins"
msgstr "Carregando plugins"
@@ -6260,6 +6254,30 @@ msgstr "Mostra somente tags com conflito"
msgid "Show tags with multiple values only"
msgstr "Mostra somente tags com valores múltiplos"
+msgid "Apply?"
+msgstr "Aplicar?"
+
+msgid "Relation"
+msgstr "Relação"
+
+msgid "Old role"
+msgstr "Regra antiga"
+
+msgid "New role"
+msgstr "Nova regra"
+
+msgid "Old key"
+msgstr "Chave antiga"
+
+msgid "Old value"
+msgstr "Valor antigo"
+
+msgid "New key"
+msgstr "Nova chave"
+
+msgid "New value"
+msgstr "Novo valor"
+
msgid "For selected objects only"
msgstr "Apenas para objetos selecionados"
@@ -6793,51 +6811,6 @@ msgstr "Alternar visibilidade da camada: {0}"
msgid "Open a list of all loaded layers."
msgstr "Abrir uma lista com camadas carregadas."
-msgid "Delete the selected layers."
-msgstr "Apagar camadas selecionadas."
-
-msgid "Show/hide"
-msgstr "Mostar/Ocultar"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Mudar estado de visibilidade do layer selecionado."
-
-msgid "Show/hide layer"
-msgstr "Mostrar/Ocultar layer"
-
-msgid "Opacity"
-msgstr "Opacidade"
-
-msgid "Adjust opacity of the layer."
-msgstr "Ajusta a opacidade da camada."
-
-msgid "Gamma"
-msgstr "Gama"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Ajuste a gama de cores na camada."
-
-msgid "Activate"
-msgstr "Ativar"
-
-msgid "Activate the selected layer"
-msgstr "Ativar camada selecionada"
-
-msgid "Activate layer"
-msgstr "Layer ativo"
-
-msgid "Merge this layer into another layer"
-msgstr "Combinar esta camada em outra camada"
-
-msgid "Duplicate this layer"
-msgstr "Duplicar esta camada"
-
-msgid "Copy of {0}"
-msgstr "Cópia de {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Cópia {1} de {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "a camada atualmente está visível (clique para ocultar a camada)"
@@ -6860,12 +6833,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Mover a camada selecionada uma linha acima."
-
-msgid "Move the selected layer one row down."
-msgstr "Mover camada selecionada uma linha abaixo."
-
msgid "Information about layer"
msgstr "Informação sobre camada"
@@ -7306,15 +7273,6 @@ msgstr "Fechado em"
msgid "Discussions"
msgstr "Discussões"
-msgid "Downloading changeset content"
-msgstr "Baixando conteúdo do changeset"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Baixando changeset {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Baixando conteúdo do changeset {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7430,9 +7388,6 @@ msgstr "Atualizar discussão do changeset do servidor OSM"
msgid "Date"
msgstr "Data"
-msgid "Download changesets"
-msgstr "Baixar conjuntos de alterações"
-
msgid "{0} [incomplete]"
msgstr "{0} [incompleta]"
@@ -7609,16 +7564,6 @@ msgid "Please enter an integer value > 0"
msgstr "Por favor digite um valor iteiro > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>O valor atual não é um nome de usuário válido.<br>Por favor informe um "
-"nome de usuário não vazio.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Por favor, entre com um nome de usuário não-vazio"
-
-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 ""
@@ -7728,15 +7673,6 @@ msgstr "URL de pesquisa de conjunto de alterações ilegal"
msgid "Close the dialog and abort querying of changesets"
msgstr "Fechar a janela e abortar a pesquisa de conjuntos de alterações"
-msgid "Querying and downloading changesets"
-msgstr "Pesquisando e baixando conjuntos de alterações"
-
-msgid "Determine user id for current user..."
-msgstr "Determinar o id do usuário atual..."
-
-msgid "Query and download changesets ..."
-msgstr "Pesquisando e baixando conjuntos de alterações ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7758,6 +7694,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Esta URL de pesquisa de conjunto de alterações é inválida"
+msgid "Activate"
+msgstr "Ativar"
+
+msgid "Activate the selected layer"
+msgstr "Ativar camada selecionada"
+
+msgid "Activate layer"
+msgstr "Layer ativo"
+
+msgid "Delete the selected layers."
+msgstr "Apagar camadas selecionadas."
+
+msgid "Duplicate this layer"
+msgstr "Duplicar esta camada"
+
+msgid "Copy of {0}"
+msgstr "Cópia de {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Cópia {1} de {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Ajusta a opacidade da camada."
+
+msgid "Opacity"
+msgstr "Opacidade"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Ajuste a gama de cores na camada."
+
+msgid "Gamma"
+msgstr "Gama"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Combinar esta camada em outra camada"
+
+msgid "Move the selected layer one row down."
+msgstr "Mover camada selecionada uma linha abaixo."
+
+msgid "Move the selected layer one row up."
+msgstr "Mover a camada selecionada uma linha acima."
+
+msgid "Show/hide"
+msgstr "Mostar/Ocultar"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Mudar estado de visibilidade do layer selecionado."
+
+msgid "Show/hide layer"
+msgstr "Mostrar/Ocultar layer"
+
msgid "Discardable key: selection Foreground"
msgstr "Chave descartável: seleção primeiro plano"
@@ -8080,12 +8085,12 @@ msgstr "Relações de parentesco"
msgid "Child Relations"
msgstr "Relações-filho"
-msgid "Apply Role:"
-msgstr "Aplicar papel:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Informe um papel e o aplique-o aos membros selecionados da relação"
+msgid "Apply Role:"
+msgstr "Aplicar papel:"
+
msgid "New Relation"
msgstr "Nova relação"
@@ -9968,9 +9973,6 @@ msgstr "Desbotamento de camadas"
msgid "Unsupported imagery type: {0}"
msgstr "Tipo de camada não suportada: {0}"
-msgid "ERROR"
-msgstr "ERRO"
-
msgid "Next marker"
msgstr "Próxima marca"
@@ -10863,14 +10865,6 @@ msgstr "Rodar os passos automáticos de autorização novamente"
msgid "Test Access Token"
msgstr "Teste o token de acesso"
-msgid "Please enter your OSM user name"
-msgstr "Por favor digite o seu nome de usuário no OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"O nome de usuário não pode ser vazio. Por favor digite o seu nome de usuário "
-"do OSM"
-
msgid "Please enter your OSM password"
msgstr "Por favor digite sua senha do OSM"
@@ -13113,6 +13107,14 @@ msgstr "Configurações de conexão"
msgid "Connection Settings for the OSM server."
msgstr "Configurações de Conexão para o servidor do OSM."
+msgid "Please enter your OSM user name"
+msgstr "Por favor digite o seu nome de usuário no OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"O nome de usuário não pode ser vazio. Por favor digite o seu nome de usuário "
+"do OSM"
+
msgid "Action"
msgstr "Ação"
@@ -13673,6 +13675,14 @@ msgstr ""
"Valor ilegal de atributo ''{0}'' do elemento ''{1}'' em recursos de "
"servidor. Recuperado ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Falhou ao analisar data ''{0}'' respondido pelo servidor."
@@ -15060,79 +15070,6 @@ msgstr "razão não informada"
msgid "Error playing sound"
msgstr "Erro reproduzindo som"
-msgid "Do nothing"
-msgstr "Não fazer nada"
-
-msgid "Report Bug"
-msgstr "Relatar um Erro"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Uma exceção inesperada aconteceu.<br>Este problema é sempre por erro no "
-"código do programa. Se você estiver executando a última<br>versão do JOSM, "
-"por favor, seja gentil e redija um relatório de erro."
-
-msgid "Update JOSM"
-msgstr "Atualize o JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Ocorreu uma exceção inesperada. As veses é um erro de codificação. "
-"<br><br>No entanto, você está executando uma versão antiga do JOSM "
-"({0}),<br>em vez de usar a versão testada atual (<b>{1}</b>).<br> <br><b>Por "
-"favor, atualize o JOSM</b>, antes de considerar a apresentação de um "
-"relatório de bug."
-
-msgid "Unexpected Exception"
-msgstr "Exceção Inesperada"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Suprimir novos diálogos de erro para esta sessão."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Você encontrou um erro no JOSM. Antes de enviar um relatório de bug "
-"certifique-se de ter atualizado para a última versão do JOSM aqui:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Você também deve atualizar seus plugins. Se nenhum dos dois ajudar, por "
-"favor, relate um bug no nosso bugtracker usando este link:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"A informação de erro fornecida abaixo já deve estar preenchida para você. "
-"Por favor, inclua informações sobre como reproduzir o erro e tente fornecer "
-"o máximo de detalhes possíveis."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Alternativamente, se isso não funcionar, você pode preencher manualmente as "
-"informações abaixo na seguinte URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(O texto já foi copiado para a Área de Transferência)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Você encontrou um bug no JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15501,9 +15438,6 @@ msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
"Muitos redirecionamentos para a URL de download detectado. Abortando."
-msgid "Fetching content..."
-msgstr "Buscando conteúdo..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Não foi possível encontrar tradução para localização {0}. Revertendo para "
@@ -15729,6 +15663,83 @@ msgstr "Ignorando geometria mal formada: {0}"
msgid "Failed to load XML schema."
msgstr "Falhou ao carregar esquema XML."
+msgid "Do nothing"
+msgstr "Não fazer nada"
+
+msgid "Report Bug"
+msgstr "Relatar um Erro"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Uma exceção inesperada aconteceu.<br>Este problema é sempre por erro no "
+"código do programa. Se você estiver executando a última<br>versão do JOSM, "
+"por favor, seja gentil e redija um relatório de erro."
+
+msgid "Update JOSM"
+msgstr "Atualize o JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Ocorreu uma exceção inesperada. As veses é um erro de codificação. "
+"<br><br>No entanto, você está executando uma versão antiga do JOSM "
+"({0}),<br>em vez de usar a versão testada atual (<b>{1}</b>).<br> <br><b>Por "
+"favor, atualize o JOSM</b>, antes de considerar a apresentação de um "
+"relatório de bug."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Suprimir novos diálogos de erro para esta sessão."
+
+msgid "Unexpected Exception"
+msgstr "Exceção Inesperada"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Você encontrou um bug no JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Você encontrou um erro no JOSM. Antes de enviar um relatório de bug "
+"certifique-se de ter atualizado para a última versão do JOSM aqui:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Você também deve atualizar seus plugins. Se nenhum dos dois ajudar, por "
+"favor, relate um bug no nosso bugtracker usando este link:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"A informação de erro fornecida abaixo já deve estar preenchida para você. "
+"Por favor, inclua informações sobre como reproduzir o erro e tente fornecer "
+"o máximo de detalhes possíveis."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Alternativamente, se isso não funcionar, você pode preencher manualmente as "
+"informações abaixo na seguinte URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(O texto já foi copiado para a Área de Transferência)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16075,14 +16086,14 @@ msgstr "Satélite Mapbox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Camada padrão)"
+msgid "OpenSeaMap"
+msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Branco & Preto)"
@@ -16090,8 +16101,14 @@ msgstr "OpenStreetMap (Mapnik Branco & Preto)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sem etiquetas)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (German Style)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS Traces"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16102,15 +16119,12 @@ msgstr "Transportes Públicos (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (German Style)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Camboja, Laos, Tailândia, Vietnã bilíngue"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -16207,6 +16221,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (base map)"
@@ -16231,14 +16248,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Terrain model)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV (laanderen) imagens aéreas (cobre a região de Bruxelas também)"
@@ -16384,10 +16401,10 @@ msgstr "Géolittoral V2 - Orthophotos 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16442,6 +16459,15 @@ msgstr "Baviera (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (aerial imagery)"
@@ -16458,17 +16484,6 @@ msgstr ""
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Antigo mapa de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Physical map (natural regions)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Physical map (natural regions)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16514,6 +16529,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16574,6 +16592,9 @@ msgstr "OSMIE T.ie Land not in Counties"
msgid "Lodi - Italy"
msgstr "Lodi - Itália"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardia - Italy (CTR DBT)"
@@ -16610,11 +16631,8 @@ msgstr "1.cikla ortofotokarte - Latvia"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lituânia)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Railway"
@@ -16715,6 +16733,9 @@ msgstr "Powiat poznański: Budynki (buildings)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (Aerial image)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (buildings)"
@@ -16724,6 +16745,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (Aerial image)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (buildings)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (buildings)"
@@ -17427,6 +17451,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18869,6 +18898,12 @@ msgstr "Ruas"
msgid "Motorway"
msgstr "Autoestrada"
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr "Placement"
@@ -19463,9 +19498,6 @@ msgstr "Saída de rodovia"
msgid "Number"
msgstr "Número"
-msgid "Exit to"
-msgstr "Sair para"
-
msgid "Services"
msgstr "Serviços"
@@ -19948,6 +19980,15 @@ msgstr "planície de maré"
msgid "mangrove"
msgstr "mangue"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Lama"
@@ -20660,13 +20701,13 @@ msgid "Waste Basket/Trash Can"
msgstr "Cesta de Lixo/Lata de lixo"
msgid "Highway platform (legacy)"
-msgstr "Highway platform (legacy)"
+msgstr "Plataforma Rodoviária (legado)"
msgid "Railway platform (legacy)"
msgstr "Plataforma Ferroviária"
msgid "funicular"
-msgstr "formado por cordas"
+msgstr "Funicular"
msgctxt "railway"
msgid "Station"
@@ -21103,6 +21144,9 @@ msgstr "Fogueira"
msgid "Fishing"
msgstr "Pescaria"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Casa noturna"
@@ -22371,6 +22415,10 @@ msgid "transformer_tower"
msgstr "torre transformadora"
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Andares"
@@ -23960,8 +24008,8 @@ msgstr "sacos para fezes"
msgid "food"
msgstr "comida"
-msgid "news_papers"
-msgstr "jornais"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "bilhete de estacionamento"
@@ -23975,8 +24023,8 @@ msgstr "mapas de transporte público"
msgid "public_transport_tickets"
msgstr "tíquetes de transporte público"
-msgid "SIM-cards"
-msgstr "Cartões SIM"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "selos"
@@ -25253,6 +25301,21 @@ msgstr "natureza"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Rota da pista"
@@ -25277,9 +25340,6 @@ msgstr "alpino"
msgid "Detour Route"
msgstr "Desvio da rota"
-msgid "Destination"
-msgstr "Destino"
-
msgid "Ref of the way this is a detour to"
msgstr "Ref da via como esta é um desvio para"
@@ -25439,8 +25499,14 @@ msgstr "camping"
msgid "Test"
msgstr "Testar"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Diminuição do número de casas em interpolação de endereços"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} sem {1}"
@@ -25529,6 +25595,11 @@ msgstr ""
"Uso errado de {0} tag. Remover {1}, porque é evidente que o nome está "
"ausente, mesmo sem uma tag adicional."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} é depreciado. Por favor, use um multipolígono."
@@ -25575,7 +25646,7 @@ msgid "key with uncommon character"
msgstr "chave com caráter incomum"
msgid "uncommon short key"
-msgstr "tecla de atalho incomum"
+msgstr "chave curta incomum"
msgid "{0} is inaccurate"
msgstr "{0} é impreciso"
@@ -25634,6 +25705,9 @@ msgstr "{0} precisa estar conectado à uma via"
msgid "node connects waterway and bridge"
msgstr "pontos conectam via aquática e ponte"
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr "direção da rotatória suspeita"
@@ -25643,6 +25717,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nome da rua abreviado"
@@ -29060,6 +29142,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -31499,6 +31641,15 @@ msgstr "Transporte Público: Ativar waypoints"
msgid "Public Transport: Edit waypoint name"
msgstr "Editar padrões de rota para transporte público"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Seleção inválida"
+
msgid "Public transport routes"
msgstr "Rotas de transporte público"
@@ -32329,9 +32480,6 @@ msgstr "Terraço de um prédio"
msgid "Creates individual buildings from a long building."
msgstr "Criar edifícios individuais a partir de um edifício comprido."
-msgid "Invalid selection"
-msgstr "Seleção inválida"
-
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 "
@@ -32816,10 +32964,10 @@ msgstr ""
"coerência."
msgid "Turn Lanes"
-msgstr "Virar pistas"
+msgstr "Faixas de Conversão"
msgid "Edit turn lanes"
-msgstr "Editar sentido das pistas"
+msgstr "Editar faixas de conversão"
msgid "Quick-Fix"
msgstr "Reparo-Rápido"
@@ -34291,17 +34439,3 @@ msgstr "Dirigir"
msgid "Drive a race car on this layer"
msgstr "Dirija um carro de corrida nesta camada"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Padrão de traço ilegal, os valores devem ser positivos"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "Padrão de traço ilegal, pelo menos um valor deve ser > 0"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Falha ao analisar estilos Mappaint de ''{0}''. Erro foi: [{1}: {2}] {3}"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index 1f8aaaa..f0dbbec 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:00+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:59+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index bd1d15b..0973a83 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:01+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:59+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -158,9 +158,6 @@ msgstr "Versiunea Java {0}"
msgid "Homepage"
msgstr "Pagina pricipală"
-msgid "Bug Reports"
-msgstr "Rapoarte erori"
-
msgid "Info"
msgstr "Informații"
@@ -182,6 +179,12 @@ msgstr "Extensii"
msgid "About JOSM..."
msgstr "Despre JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -610,9 +613,6 @@ msgstr "Reglează poziția imaginii de fundal"
msgid "Adjust imagery offset"
msgstr "Ajustează deplasarea imaginii"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1220,9 +1220,6 @@ msgstr "Şi redenumeşte şi fişierul"
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1832,6 +1829,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1981,9 +2002,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2299,8 +2317,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3083,9 +3101,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3105,27 +3120,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr "Valoare nouă"
-
msgid "Apply selected changes"
msgstr ""
@@ -4185,6 +4179,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4830,6 +4827,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Se creează interfața grafică"
+
msgid "Updating plugins"
msgstr ""
@@ -4839,12 +4842,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Se creează interfața grafică"
-
msgid "Loading plugins"
msgstr ""
@@ -5815,6 +5812,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr "Valoare nouă"
+
msgid "For selected objects only"
msgstr ""
@@ -6304,51 +6325,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "Deschide o listă cu toate straturile încărcate."
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Comută starea vizibilă a stratului selectat."
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "Copiaza {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copiaza {1} din {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6371,12 +6347,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Mută stratul selectat un rând în sus."
-
-msgid "Move the selected layer one row down."
-msgstr "Mută stratul selectat un rând în jos."
-
msgid "Information about layer"
msgstr ""
@@ -6799,15 +6769,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6913,9 +6874,6 @@ msgstr ""
msgid "Date"
msgstr "Dată"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7067,14 +7025,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7159,15 +7109,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7185,6 +7126,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "Copiaza {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copiaza {1} din {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr "Mută stratul selectat un rând în jos."
+
+msgid "Move the selected layer one row up."
+msgstr "Mută stratul selectat un rând în sus."
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Comută starea vizibilă a stratului selectat."
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7500,10 +7510,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9159,9 +9169,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9966,12 +9973,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11983,6 +11984,12 @@ msgstr "Configurări conexiune"
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12494,6 +12501,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13735,62 +13750,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr "Nu fă nimic"
-
-msgid "Report Bug"
-msgstr "Raportează eroarea"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "Excepţie netratată"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14042,9 +14001,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14229,6 +14185,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Nu fă nimic"
+
+msgid "Report Bug"
+msgstr "Raportează eroarea"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Excepţie netratată"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14563,13 +14579,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14578,7 +14594,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14590,15 +14612,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14695,6 +14714,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14719,13 +14741,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14872,10 +14894,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14928,29 +14950,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14998,6 +15019,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15058,6 +15082,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15094,10 +15121,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15199,6 +15223,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15208,6 +15235,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15863,6 +15893,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17220,6 +17255,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17796,9 +17837,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18277,6 +18315,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19425,6 +19472,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20693,6 +20743,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22280,7 +22334,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22295,7 +22349,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23550,6 +23604,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23574,9 +23643,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23736,7 +23802,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23820,6 +23892,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23918,6 +23995,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23927,6 +24007,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27026,6 +27114,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29347,6 +29495,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30131,9 +30288,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 4308cbd..a7c25c0 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: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-12 05:15+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-28 05:48+0000\n"
"Last-Translator: Aleksey Kabanov <Unknown>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:01+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:00+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ru_RU\n"
msgid "Use OAuth"
@@ -162,9 +162,6 @@ msgstr "Версия Java: {0}"
msgid "Homepage"
msgstr "Домашняя страница"
-msgid "Bug Reports"
-msgstr "Отчёты об ошибках"
-
msgid "Info"
msgstr "Информация"
@@ -186,6 +183,12 @@ msgstr "Модули"
msgid "About JOSM..."
msgstr "О программе JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Сообщить об ошибке"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Не удалось найти ресурс ''{0}''."
@@ -614,9 +617,6 @@ msgstr "Настроить положение данного слоя со сн
msgid "Adjust imagery offset"
msgstr "Настроить смещение снимка"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -732,7 +732,7 @@ msgid "Fix tag conflicts"
msgstr "Уладить конфликты тегов"
msgid "Split ways into fragments"
-msgstr "Разделить линии на фрагменты"
+msgstr "Разрезать линию на сегменты"
msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
msgstr ""
@@ -768,13 +768,13 @@ msgid "Join Areas Function"
msgstr "Функция объединения полигонов"
msgid "Join Node to Way"
-msgstr "Включить точку в линию"
+msgstr "Изменить линию, чтобы точка(ки) входили в неё"
msgid "Include a node into the nearest way segments"
-msgstr "Включить точку в сегменты ближайших линий"
+msgstr "Изменяет ближайшие сегменты так, чтобы точка входила в линию"
msgid "Move Node onto Way"
-msgstr "Переместить точку на линию"
+msgstr "Спроецировать точку на линию"
msgid "Move the node onto the nearest way segments and include it"
msgstr "Переместить точку на ближайший сегмент линии и включить в него"
@@ -897,7 +897,7 @@ msgid "Merge Nodes"
msgstr "Объединить точки"
msgid "Merge nodes into the oldest one."
-msgstr "Объединить точки в одну (более старую)"
+msgstr "Объединить точки в одну (последнюю из выделеных объектов)"
msgid ""
"Please select at least two nodes to merge or one node that is close to "
@@ -1293,9 +1293,6 @@ msgstr "файл тоже переименовать"
msgid "Could not rename file ''{0}''"
msgstr "Невозможно переименовать файл ''{0}''"
-msgid "Report bug"
-msgstr "Сообщить об ошибке"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Создать карточку в системе отслеживания ошибок JOSM"
@@ -1484,10 +1481,10 @@ msgstr[1] "Упростить линию (удалить {0} точки)"
msgstr[2] "Упростить линию (удалить {0} точек)"
msgid "Split Way"
-msgstr "Разделить линию"
+msgstr "Разрезать линию"
msgid "Split a way at the selected node."
-msgstr "Разделить линию в выделенной точке."
+msgstr "Разрезать линию в выделенной точке"
msgid "Cannot split since another split operation is already in progress"
msgstr ""
@@ -1574,7 +1571,7 @@ msgid "Encourage/discourage upload"
msgstr "Допускать/не рекомендовать передачу на сервер"
msgid "UnGlue Ways"
-msgstr "Разъединить линии"
+msgstr "Разъединить точки на несколько"
msgid "Duplicate nodes that are used by multiple ways."
msgstr "Дублировать точки, используемые несколькими линиями."
@@ -1852,8 +1849,7 @@ msgstr "Режим следования"
msgid "Enable/disable automatic moving of the map view to last placed node"
msgstr ""
-"Включить/отключить автоперемещение видимой области карты к последней "
-"размещённой точке"
+"Включить/отключить авто-перемещение экрана к последней добавленной точке"
msgid "Toggle Viewport Following"
msgstr "Переключить режим следования"
@@ -1958,6 +1954,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Играть медленнее."
+msgid "Downloading changeset content"
+msgstr "Скачивание с сервера содержимого пакета правок"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Скачивание с сервера пакета правок {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Скачивание с сервера содержимого для пакета правок {2}..."
+
+msgid "Download changesets"
+msgstr "Скачать с сервера пакеты правок"
+
+msgid "Querying and downloading changesets"
+msgstr "Запрос и скачивание пакетов правок с сервера"
+
+msgid "Determine user id for current user..."
+msgstr "Определение ID пользователя для текущего пользователя..."
+
+msgid "Query and download changesets ..."
+msgstr "Запросить и скачать с сервера пакеты правок ..."
+
+msgid "Errors during download"
+msgstr "Ошибки при скачивании с сервера"
+
msgid "Download GPS"
msgstr "Скачать GPS данные"
@@ -2127,9 +2147,6 @@ msgstr "Удалённые или перемещённые объекты"
msgid "The following errors occurred during mass download: {0}"
msgstr "Во время массового скачивания произошли следующие ошибки: {0}"
-msgid "Errors during download"
-msgstr "Ошибки при скачивании с сервера"
-
msgid "Error during download"
msgstr "Ошибка во время скачивания с сервера"
@@ -2490,11 +2507,11 @@ msgid "Add selection to relation"
msgstr "Добавить выделение к отношению"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Добавить выделение к отношению</strong>: проверьте каждое "
-"отдельное отношение, чтобы избежать повреждений!"
+"{0}Добавление выделенного в отношение{1}: во избежание поломок проверьте "
+"каждое отдельное отношение!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -2663,7 +2680,7 @@ msgid "MapCSS selector"
msgstr "MapCSS-селектор"
msgid "add toolbar button"
-msgstr "добавить кнопку на панель инструментов"
+msgstr "добавить кнопку на основную панель инструментов"
msgid "Invalid search expression"
msgstr "Неверное выражение для поиска"
@@ -2740,7 +2757,7 @@ msgstr ""
"\"</b> и <b>\\\\</b>)."
msgid "combinators"
-msgstr "комбинаторы"
+msgstr "логические операторы"
msgid "logical and (both expressions have to be satisfied)"
msgstr "логическое И (оба условия должны быть выполнены)"
@@ -2853,12 +2870,12 @@ msgid "view"
msgstr "вид"
msgid "objects in current view"
-msgstr "объекты в текущем поле видимости"
+msgstr "объекты в текущем экране"
msgid "objects (and all its way nodes / relation members) in current view"
msgstr ""
-"объекты (и все входящие в них точки/участники отношения) в текущем поле "
-"видимости"
+"объекты (и все входящие в них точки или участники отношения) на текущем "
+"экране"
msgid "objects in downloaded area"
msgstr "объекты в скачанной области"
@@ -3358,9 +3375,6 @@ msgstr "Уладить конфликты в списке точек линии
msgid "Main dataset does not include node {0}"
msgstr "Основной набор данных не содержит точку {0}"
-msgid "Apply?"
-msgstr "Применить?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3392,27 +3406,6 @@ msgstr ""
"При смене направления линии предлагаются следующие изменения для обеспечения "
"согласованности данных."
-msgid "Relation"
-msgstr "Отношение"
-
-msgid "Old role"
-msgstr "Старая роль"
-
-msgid "New role"
-msgstr "Новая роль"
-
-msgid "Old key"
-msgstr "Старый ключ"
-
-msgid "Old value"
-msgstr "Старое значение"
-
-msgid "New key"
-msgstr "Новый ключ"
-
-msgid "New value"
-msgstr "Новое значение"
-
msgid "Apply selected changes"
msgstr "Применить выбранные изменения"
@@ -4091,7 +4084,7 @@ msgid "E-mail address contains an invalid domain: {0}"
msgstr "Адрес эл. почты содержит недопустимый домен: {0}"
msgid "Email validator"
-msgstr ""
+msgstr "Модуль проверки адресов эл. почты"
msgid "URL is invalid"
msgstr "Неверный URL"
@@ -4112,7 +4105,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "URL содержит недопустимый фрагмент: {0}"
msgid "URL validator"
-msgstr ""
+msgstr "Модуль проверки URL адресов"
msgid "Addresses"
msgstr "Адреса"
@@ -4554,6 +4547,9 @@ msgstr "Отношение-маршрут содержит роль ''{0}''"
msgid "Route relation contains a gap"
msgstr "В отношении-маршруте имеется разрыв"
+msgid "Stop position not part of route"
+msgstr "Место остановки не является частью маршрута"
+
msgid "Role verification problem"
msgstr "Проблема проверки роли"
@@ -5227,6 +5223,12 @@ msgstr "Включен расширенный уровень отладки (т
msgid "Initializing"
msgstr "Инициализация"
+msgid "Setting defaults"
+msgstr "Настройки по умолчанию"
+
+msgid "Creating main GUI"
+msgstr "Создание интерфейса"
+
msgid "Updating plugins"
msgstr "Обновление модулей"
@@ -5236,12 +5238,6 @@ msgstr "Установка обновлённых модулей"
msgid "Loading early plugins"
msgstr "Загрузка ранних модулей"
-msgid "Setting defaults"
-msgstr "Настройки по умолчанию"
-
-msgid "Creating main GUI"
-msgstr "Создание интерфейса"
-
msgid "Loading plugins"
msgstr "Загрузка модулей"
@@ -5356,7 +5352,7 @@ msgstr "Данные"
msgctxt "menu"
msgid "Selection"
-msgstr "Выделение"
+msgstr "Выделенные объекты"
msgctxt "menu"
msgid "Presets"
@@ -6334,6 +6330,30 @@ msgstr "Показать только теги с конфликтами"
msgid "Show tags with multiple values only"
msgstr "Показать только теги с несколькими значениями"
+msgid "Apply?"
+msgstr "Применить?"
+
+msgid "Relation"
+msgstr "Отношение"
+
+msgid "Old role"
+msgstr "Старая роль"
+
+msgid "New role"
+msgstr "Новая роль"
+
+msgid "Old key"
+msgstr "Старый ключ"
+
+msgid "Old value"
+msgstr "Старое значение"
+
+msgid "New key"
+msgstr "Новый ключ"
+
+msgid "New value"
+msgstr "Новое значение"
+
msgid "For selected objects only"
msgstr "Только для выбранных объектов"
@@ -6868,51 +6888,6 @@ msgstr "Переключить видимость слоя: {0}"
msgid "Open a list of all loaded layers."
msgstr "Показать список всех загруженных слоёв."
-msgid "Delete the selected layers."
-msgstr "Удалить выбранные слои."
-
-msgid "Show/hide"
-msgstr "Показать/скрыть"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Показать/скрыть выделенный слой"
-
-msgid "Show/hide layer"
-msgstr "Показать/скрыть слой"
-
-msgid "Opacity"
-msgstr "Непрозрачность"
-
-msgid "Adjust opacity of the layer."
-msgstr "Настроить непрозрачность слоя"
-
-msgid "Gamma"
-msgstr "Гамма"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Настроить гамма-коррекцию слоя."
-
-msgid "Activate"
-msgstr "Активировать"
-
-msgid "Activate the selected layer"
-msgstr "Активировать выделенный слой"
-
-msgid "Activate layer"
-msgstr "Активировать слой"
-
-msgid "Merge this layer into another layer"
-msgstr "Объединить этот слой с другим слоем"
-
-msgid "Duplicate this layer"
-msgstr "Дублировать этот слой"
-
-msgid "Copy of {0}"
-msgstr "Копия {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Копия {1} из {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "слой просматривается (щелкните, чтобы его скрыть)"
@@ -6937,12 +6912,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "у этого слоя отсутствует исходное разрешение"
-msgid "Move the selected layer one row up."
-msgstr "Переместить выделенный слой вверх."
-
-msgid "Move the selected layer one row down."
-msgstr "Переместить выделенный слой вниз."
-
msgid "Information about layer"
msgstr "Информация о слое"
@@ -7143,7 +7112,7 @@ msgid "Relations: {0}"
msgstr "Отношения: {0}"
msgid "Selection"
-msgstr "Выделение"
+msgstr "Выделенные объекты"
msgid "Open a selection list window."
msgstr "Показать окно со списком выделенных объектов."
@@ -7379,15 +7348,6 @@ msgstr "Закрыт"
msgid "Discussions"
msgstr "Обсуждения"
-msgid "Downloading changeset content"
-msgstr "Скачивание с сервера содержимого пакета правок"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Скачивание с сервера пакета правок {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Скачивание с сервера содержимого для пакета правок {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7506,9 +7466,6 @@ msgstr "Обновить обсуждение пакета правок с се
msgid "Date"
msgstr "Дата"
-msgid "Download changesets"
-msgstr "Скачать с сервера пакеты правок"
-
msgid "{0} [incomplete]"
msgstr "{0} [неполный]"
@@ -7678,16 +7635,6 @@ msgid "Please enter an integer value > 0"
msgstr "Введите целое число > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Текущее значение это неверное имя пользователя.<br>Пожалуйста, введите "
-"непустое имя пользователя.</html>"
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7790,15 +7737,6 @@ msgstr "Неверный URL для запроса пакета правок"
msgid "Close the dialog and abort querying of changesets"
msgstr "Закрыть диалог и прекратить формирование запросов пакетов правок"
-msgid "Querying and downloading changesets"
-msgstr "Запрос и скачивание пакетов правок с сервера"
-
-msgid "Determine user id for current user..."
-msgstr "Определение ID пользователя для текущего пользователя..."
-
-msgid "Query and download changesets ..."
-msgstr "Запросить и скачать с сервера пакеты правок ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7820,6 +7758,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Неправильный URL запроса пакета правок"
+msgid "Activate"
+msgstr "Активировать"
+
+msgid "Activate the selected layer"
+msgstr "Активировать выделенный слой"
+
+msgid "Activate layer"
+msgstr "Активировать слой"
+
+msgid "Delete the selected layers."
+msgstr "Удалить выбранные слои."
+
+msgid "Duplicate this layer"
+msgstr "Дублировать этот слой"
+
+msgid "Copy of {0}"
+msgstr "Копия {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Копия {1} из {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Изменить видимость выбранного слоя"
+
+msgid "Show layer"
+msgstr "Показать слой"
+
+msgid "Adjust opacity of the layer."
+msgstr "Настроить непрозрачность слоя"
+
+msgid "Opacity"
+msgstr "Непрозрачность"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Настроить гамма-коррекцию слоя."
+
+msgid "Gamma"
+msgstr "Гамма"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Настроить резкость/размытость слоя."
+
+msgid "Sharpness"
+msgstr "Резкость"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Настроить цветовую насыщенность слоя."
+
+msgid "Colorfulness"
+msgstr "Насыщенность"
+
+msgid "Merge this layer into another layer"
+msgstr "Объединить этот слой с другим слоем"
+
+msgid "Move the selected layer one row down."
+msgstr "Переместить выделенный слой вниз."
+
+msgid "Move the selected layer one row up."
+msgstr "Переместить выделенный слой вверх."
+
+msgid "Show/hide"
+msgstr "Показать/скрыть"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Показать/скрыть выделенный слой"
+
+msgid "Show/hide layer"
+msgstr "Показать/скрыть слой"
+
msgid "Discardable key: selection Foreground"
msgstr "Удаляемый ключ: передний план выделения"
@@ -8156,12 +8163,12 @@ msgstr "Родительские отношения"
msgid "Child Relations"
msgstr "Дочерние элементы отношения"
-msgid "Apply Role:"
-msgstr "Применить роль:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Ввести роль и применить её на выделенных участников отношения"
+msgid "Apply Role:"
+msgstr "Применить роль:"
+
msgid "New Relation"
msgstr "Новое отношение"
@@ -10097,9 +10104,6 @@ msgstr "Подложка: угасание к"
msgid "Unsupported imagery type: {0}"
msgstr "Неподдерживаемый тип подложки: {0}"
-msgid "ERROR"
-msgstr "Ошибка"
-
msgid "Next marker"
msgstr "Следующий маркер"
@@ -11005,14 +11009,6 @@ msgstr "Запустить процедуру автоматической ав
msgid "Test Access Token"
msgstr "Тест маркера доступа"
-msgid "Please enter your OSM user name"
-msgstr "Пожалуйста, введите ваше имя пользователя в OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Имя пользователя не может быть пустым. Пожалуйста, введите Ваше имя "
-"пользователя в OSM"
-
msgid "Please enter your OSM password"
msgstr "Пожалуйста, введите ваш OSM-пароль"
@@ -13236,6 +13232,14 @@ msgstr "Параметры соединения"
msgid "Connection Settings for the OSM server."
msgstr "Параметры соединения с сервером OSM."
+msgid "Please enter your OSM user name"
+msgstr "Пожалуйста, введите ваше имя пользователя в OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Имя пользователя не может быть пустым. Пожалуйста, введите Ваше имя "
+"пользователя в OSM"
+
msgid "Action"
msgstr "Действие"
@@ -13798,6 +13802,16 @@ msgstr ""
"Недопустимое значение атрибута ''{0}'' элемента ''{1}'' в возможностях "
"сервера, равное ''{2}''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Ошибка при добавлении сертификата {0} — не совпадает отпечаток сертификата. "
+"Ожидался {1}, получен {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Добавление сертификата для TLS-соединений: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''."
@@ -15193,78 +15207,6 @@ msgstr "неопределенная причина"
msgid "Error playing sound"
msgstr "Ошибка при воспроизведении звука"
-msgid "Do nothing"
-msgstr "Ничего не делать"
-
-msgid "Report Bug"
-msgstr "Сообщить об ошибке"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Произошла неожиданная ошибка.<br>Это всегда ошибка программирования. Если вы "
-"пользуетесь последней<br>версией JOSM - не сочтите за труд, заполните, "
-"пожалуйста, заявку на исправление ошибки (trac)."
-
-msgid "Update JOSM"
-msgstr "Обновить JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Возникло непредвиденная исключительная ситуация. Это всегда ошибка "
-"программирования. <br><br>Но у вас старая версия JOSM ({0}),<br>а не текущая "
-"стабильная версия (<b>{1}</b>).<br><br><b>Пожалуйста, обновите JOSM</b> "
-"перед тем, как примете решение об отправке отчёта об ошибке."
-
-msgid "Unexpected Exception"
-msgstr "Неожиданная ошибка"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Больше не показывать ошибки в этой сессии"
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Вы обнаружили ошибку в JOSM. Прежде чем вы сообщите нам о ней, проверьте что "
-"вы работаете на последней версии JOSM здесь:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Вы также должны обновить и модули. Если и это не поможет, сообщите нам об "
-"обнаруженной ошибке, воспользовавшись следующей ссылкой:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Представленная ниже информация об ошибке уже подготовлена для Вас. "
-"Пожалуйста, добавьте информацию о том, как можно воспроизвести эту ошибку и "
-"постарайтесь описать её как можно подробней."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Как альтернатива, если это не работает, вы можете вручную вписать информацию "
-"ниже, по этому URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Текст уже скопирован в буфер обмена)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Вы столкнулись с ошибкой в JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15666,9 +15608,6 @@ msgstr "Загрузка перенаправлена на ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Обнаружено слишком много перенаправлений на URL загрузки. Отмена."
-msgid "Fetching content..."
-msgstr "Получение содержимого..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Невозможно найти перевод {0}. Возвращено к {1}."
@@ -15888,6 +15827,84 @@ msgstr "Игнорируем неверную геометрию: {0}"
msgid "Failed to load XML schema."
msgstr "Невозможно загрузить XML схему."
+msgid "Do nothing"
+msgstr "Ничего не делать"
+
+msgid "Report Bug"
+msgstr "Сообщить об ошибке"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Произошла неожиданная ошибка.<br>Это всегда ошибка программирования. Если вы "
+"пользуетесь последней<br>версией JOSM - не сочтите за труд, заполните, "
+"пожалуйста, заявку на исправление ошибки (trac)."
+
+msgid "Update JOSM"
+msgstr "Обновить JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Возникло непредвиденная исключительная ситуация. Это всегда ошибка "
+"программирования. <br><br>Но у вас старая версия JOSM ({0}),<br>а не текущая "
+"стабильная версия (<b>{1}</b>).<br><br><b>Пожалуйста, обновите JOSM</b> "
+"перед тем, как примете решение об отправке отчёта об ошибке."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Больше не показывать ошибки в этой сессии"
+
+msgid "Unexpected Exception"
+msgstr "Неожиданная ошибка"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Вы столкнулись с ошибкой в JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Вы обнаружили ошибку в JOSM. Прежде чем вы сообщите нам о ней, проверьте что "
+"вы работаете на последней версии JOSM здесь:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Вы также должны обновить и модули. Если и это не поможет, сообщите нам об "
+"обнаруженной ошибке, воспользовавшись следующей ссылкой:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Представленная ниже информация об ошибке уже подготовлена для Вас. "
+"Пожалуйста, добавьте информацию о том, как можно воспроизвести эту ошибку и "
+"постарайтесь описать её как можно подробней."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Как альтернатива, если это не работает, вы можете вручную вписать информацию "
+"ниже, по этому URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Текст уже скопирован в буфер обмена)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Не удалось открыть отчёт об ошибке. Пожалуйста, сообщите о ней вручную на "
+"этом веб-сайте:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16236,14 +16253,14 @@ msgstr "Спутниковые снимки Mapbox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "GPS-треки OpenStreetMap"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (стандартный слой)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr "OpenStreetMap Carto (cтандартный слой)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik чёрно-белый)"
@@ -16251,8 +16268,14 @@ msgstr "OpenStreetMap (Mapnik чёрно-белый)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, без подписей)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (французский стиль)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (немецкий стиль)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "GPS-треки OpenStreetMap"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16263,15 +16286,12 @@ msgstr "Общественный транспорт (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (немецкий стиль)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Камбоджа, Лаос, Таиланд, Вьетнам 2-язычная"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (оверлей)"
@@ -16368,6 +16388,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at ортофото"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Грац: базовая карта"
@@ -16392,14 +16415,14 @@ msgstr "VoGIS: полноцветное изображение 2012 (12см)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: полноцветное зимнее изображение 2015 (20 см)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: полноцветное изображение 2015 (10 см)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: план зонирования"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (модель рельефа)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (модель поверхности)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: высоты и рельеф местности"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) - аэрофотосъёмка (покрывает также регион Брюсселя)"
@@ -16545,11 +16568,11 @@ msgstr "Géolittoral V2 - ортоснимки 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - трассы"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr "Лион - ортофото 2012 10 см"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Лион - ортофото 2012-03 10 см - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr "Лион - ортофото 2015 16 см - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Лион - ортофото 2015-05 8 см - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Атлантическая Луара - ортофото 2012 - 20 см"
@@ -16601,6 +16624,15 @@ msgstr "Бавария (80 см)"
msgid "Bavaria (2 m)"
msgstr "Бавария (2 м)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Берлин - аэрофотосъёмка 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Берлин - аэрофотосъёмка 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Берлин - аэрофотосъёмка 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Штутгарт (аэрофотосъёмка)"
@@ -16616,18 +16648,6 @@ msgstr "Старая карта Цвенкау - TK25 Messtischblatt (4739; 1906
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Старая карта Пегау - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - физическая карта (природные зоны)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE: Гарц - физическая карта (природные зоны)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE: Гарц - оверлей для Bing (например, с непрозрачностью от 20% до "
-"50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16673,6 +16693,9 @@ msgstr "Тёрёкбалинт - ортофото 2013"
msgid "5 cm resolution bald image"
msgstr "Изображение без растительности с разрешением 5 см"
+msgid "Törökbálint ortophoto 2015"
+msgstr "Тёрёкбалинт - ортофото 2015"
+
msgid "Danube flood ortophoto 2013"
msgstr "Разлив Дуная - ортофото 2013"
@@ -16733,6 +16756,9 @@ msgstr "OSMIE: земли вне графств"
msgid "Lodi - Italy"
msgstr "Лоди - Италия"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Ломбардия - Италия (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Ломбардия - Италия (CTR DBT)"
@@ -16769,11 +16795,8 @@ msgstr "1.cikla ортофотокарта - Латвия"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Литва)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire: ортофото 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire: ортофото 2013"
+msgid "geoportail.lu"
+msgstr "geoportail.lu"
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire: железные дороги"
@@ -16874,6 +16897,9 @@ msgstr "Познанский повят: здания"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Познанский повят: ортофотокарта"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Ропчицко-Сендзишувский повят: здания"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Жешувский повят: здания"
@@ -16883,6 +16909,9 @@ msgstr "Жешувский повят: ортофотокарта"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Сталёвовольский повят: здания"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr "Познань: ортофотокарта 2014 (аэрофотоснимок)"
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Пшемысль: здания"
@@ -17586,6 +17615,13 @@ msgstr ""
"Этот модуль упрощает рисование и редактирование коридоров внутри зданий."
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Помогает в рисовании внутренних помещений здания. Включает валидатор и стиль "
+"mappaint для данных о внутренних помещениях."
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -19028,6 +19064,12 @@ msgstr "Улицы"
msgid "Motorway"
msgstr "Автомагистраль"
+msgid "Destination"
+msgstr "Место назначения"
+
+msgid "Destination reference"
+msgstr "Указатель пункта назначения"
+
msgid "Placement"
msgstr "Расположение"
@@ -19621,9 +19663,6 @@ msgstr "Магистральная развязка"
msgid "Number"
msgstr "Номер"
-msgid "Exit to"
-msgstr "Выезд на"
-
msgid "Services"
msgstr "Придорожный сервис"
@@ -19868,7 +19907,7 @@ msgid "pole"
msgstr "столб"
msgid "split_rail"
-msgstr "штакетник"
+msgstr "бревенчатый"
msgid "wire"
msgstr "проволока"
@@ -20105,6 +20144,15 @@ msgstr "затопляемый приливами участок (ватты)"
msgid "mangrove"
msgstr "мангровые заросли"
+msgid "wet_meadow"
+msgstr "заболоченный луг"
+
+msgid "string_bog"
+msgstr "аапа-болото"
+
+msgid "saltern"
+msgstr "бассейн для выпаривания соли"
+
msgid "Mud"
msgstr "Грязь"
@@ -21259,6 +21307,9 @@ msgstr "Место разведения костра"
msgid "Fishing"
msgstr "Место для рыбалки"
+msgid "Bird Hide"
+msgstr "Укрытие для наблюдения за птицами"
+
msgid "Night Club"
msgstr "Ночной клуб"
@@ -22527,6 +22578,10 @@ msgid "transformer_tower"
msgstr "трансформаторная башня"
msgctxt "building"
+msgid "public"
+msgstr "общественное"
+
+msgctxt "building"
msgid "Levels"
msgstr "Этажи"
@@ -24116,7 +24171,7 @@ msgstr "пакеты для экскрементов"
msgid "food"
msgstr "продукты питания"
-msgid "news_papers"
+msgid "newspapers"
msgstr "газеты"
msgid "parking_tickets"
@@ -24131,7 +24186,7 @@ msgstr "схемы общественного транспорта"
msgid "public_transport_tickets"
msgstr "билеты на общественный транспорт"
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr "SIM-карты"
msgid "stamps"
@@ -25407,6 +25462,21 @@ msgstr "природный"
msgid "Walking Route"
msgstr "Пеший маршрут"
+msgid "Riding Route"
+msgstr "Конный маршрут"
+
+msgid "ihn"
+msgstr "международная (ihn)"
+
+msgid "nhn"
+msgstr "национальная (nhn)"
+
+msgid "rhn"
+msgstr "региональная (rhn)"
+
+msgid "lhn"
+msgstr "локальная (lhn)"
+
msgid "Piste Route"
msgstr "Маршрут лыжни"
@@ -25431,9 +25501,6 @@ msgstr "горные лыжи"
msgid "Detour Route"
msgstr "Объездной маршрут"
-msgid "Destination"
-msgstr "Место назначения"
-
msgid "Ref of the way this is a detour to"
msgstr "Объездом какой дороги является"
@@ -25593,8 +25660,14 @@ msgstr "Кемпинг"
msgid "Test"
msgstr "Тест"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Номера домов по убыванию в интерполяции адресов"
+msgid "Even housenumber in odd address interpolation."
+msgstr "Чётный номер дома в интерполяции нечётных адресов."
+
+msgid "Odd housenumber in even address interpolation."
+msgstr "Нечётный номер дома в интерполяции чётных адресов."
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr "Линия с {0}. По возможности отметьте каждый номер дома отдельно."
msgid "{0} without {1}"
msgstr "{0} без {1}"
@@ -25684,6 +25757,13 @@ msgstr ""
"Неправильное использование тега {0}. Удалите {1}, так как ясно, что название "
"отсутствует, даже без дополнительного тега."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+"{0} — неконкретный тег. Используйте ключ fixme, значением которого является "
+"информация о том, что именно нужно исправить."
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} не рекомендуется. Используйте вместо этого мультиполигон."
@@ -25791,6 +25871,9 @@ msgstr "{0} должен быть соединён с линией"
msgid "node connects waterway and bridge"
msgstr "точка соединяет водный путь и мост"
+msgid "{0} node connected to a highway"
+msgstr "Точка {0} соединена с линией типа highway"
+
msgid "suspicious roundabout direction"
msgstr "подозрительное направление кругового движения"
@@ -25800,6 +25883,16 @@ msgstr "{0} на большой области"
msgid "{0} on a small area"
msgstr "{0} на маленькой области"
+msgid "Too large building"
+msgstr "Слишком большое здание"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+"Точка соединяет линию электропередачи или кабель с объектом, не относящимся "
+"к энергетической инфраструктуре."
+
msgid "abbreviated street name"
msgstr "сокращённое обозначение улицы"
@@ -28139,7 +28232,7 @@ msgstr ""
"Постоянно скачивать данные карты при панорамировании и изменении масштаба."
msgid "Toggle the continuous download on/off"
-msgstr "Включить/отключить постоянное скачивание"
+msgstr "Включить/отключить непрерывное скачивание"
msgid "Download Settings"
msgstr "Параметры загрузки"
@@ -28231,7 +28324,7 @@ msgid "Address"
msgstr "Адрес"
msgid "Split area"
-msgstr "Разделить область"
+msgstr "Разрезать область"
msgid "Splits an area by an untagged way."
msgstr "Разделяет полигон линией без тегов"
@@ -29190,10 +29283,10 @@ msgid "Please open or create data layer before importing"
msgstr "Откройте или создайте слой данных перед импортом"
msgid "Concourse wizard ..."
-msgstr ""
+msgstr "Помощник создания вестибюлей..."
msgid "Opens up a wizard to create a concourse"
-msgstr ""
+msgstr "Открыть помощник создания вестибюлей"
msgid "Vertical layer:"
msgstr "Вертикальный слой:"
@@ -29204,6 +29297,69 @@ msgstr "Тип структуры:"
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr "Помощник рисования внутренних помещений"
+
+msgid "POWER"
+msgstr "ВКЛ./ВЫКЛ."
+
+msgid "Activates the plug-in"
+msgstr "Активирует модуль"
+
+msgid "Working Level"
+msgstr "Рабочий уровень"
+
+msgid "Selects the working level."
+msgstr "Выбор текущего рабочего уровня."
+
+msgid "Level Name"
+msgstr "Название уровня"
+
+msgid "Optional name-tag for a level."
+msgstr "Необязательное название для уровня."
+
+msgid "The object preset you want to tag."
+msgstr "Заготовка тега для данного объекта."
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr "Значение тега name, если выбран объект room"
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr "Значение тега ref, если выбран объект room"
+
+msgid "Apply Tags"
+msgstr "Применить теги"
+
+msgid "Fitting"
+msgstr "Подгонка"
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+"<html>Не забудьте в начале настроить смещение планов здания.<br>Используйте "
+"для этого модуль PicLayer, который можно установить <br>с помощью "
+"инструментария управления модулями в настройках JOSM.</html>"
+
+msgid "Level Selection"
+msgstr "Выбор уровня"
+
+msgid "Lowest Level"
+msgstr "Самый нижний уровень"
+
+msgid "The lowest level of your building."
+msgstr "Самый нижний уровень здания."
+
+msgid "Highest Level"
+msgstr "Самый верхний уровень"
+
+msgid "The highest level of your building."
+msgstr "Самый верхний уровень здания."
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr "Инструменты для рисования внутренних помещений"
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -30026,7 +30182,7 @@ msgstr ""
"необходимо проверить и исправить, если потребуется.</html>"
msgid "Split way"
-msgstr "Разделить линию"
+msgstr "Разрезать линию"
msgid "Michigan Left"
msgstr "Левый Мичиганский поворот"
@@ -31648,6 +31804,15 @@ msgstr "Общественный транспорт: Включить путев
msgid "Public Transport: Edit waypoint name"
msgstr "Общественный транспорт: Редактировать имя точки"
+msgid "Distance between stops"
+msgstr "Расстояние между остановками"
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr "Требуется действительный маршрут public_transport:version=2"
+
+msgid "Invalid selection"
+msgstr "Неправильное выделение"
+
msgid "Public transport routes"
msgstr "Маршруты общественного транспорта"
@@ -32466,9 +32631,6 @@ msgstr "Ряд домов вдоль улицы"
msgid "Creates individual buildings from a long building."
msgstr "Создать отдельные здания из длинного здания"
-msgid "Invalid selection"
-msgstr "Неправильное выделение"
-
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 "
@@ -32886,7 +33048,7 @@ msgid "Key-ID: "
msgstr "ID ключа: "
msgid "Fingerprint: "
-msgstr "Отпечаток пальца: "
+msgstr "Отпечаток: "
msgid "Algorithm: "
msgstr "Алгоритм: "
@@ -33564,7 +33726,7 @@ msgid "Split now"
msgstr "Разделить сейчас"
msgid "Split the ways"
-msgstr "Разделить линию"
+msgstr "Разрезать линии"
msgid ""
"This turn restriction uses the node <span class=\"object-name\">{0}</span> "
@@ -33680,10 +33842,10 @@ msgstr ""
"буфере обмена"
msgid "Split Object"
-msgstr "Разделить объекты"
+msgstr "Разрезать объекты"
msgid "Split an object at the selected nodes."
-msgstr "Разделить объекты в выделенных точках."
+msgstr "Разрезать объекты в выделенных точках."
msgid "The current selection cannot be used for splitting."
msgstr "Текущее выделение невозможно разделить."
@@ -33708,10 +33870,10 @@ msgid "The selected nodes can not be consecutive nodes in the object."
msgstr "Выбранные точки не могут быть последовательными точками в объекте"
msgid "Split adjacent ways"
-msgstr "Разделить смежные линии"
+msgstr "Разрезать смежные линии"
msgid "Split adjacent ways on T-intersections"
-msgstr "Разделить смежные линии на Т-пересечении"
+msgstr "Разрезать смежные линии на Т-пересечениях"
msgid ""
"There are several ways containing one of the splitting nodes. Select ways "
@@ -34437,20 +34599,3 @@ msgstr "Приступить к вождению"
msgid "Drive a race car on this layer"
msgstr "Вести гоночный автомобиль на этом слое"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "Неверный шаблон прерывистой линии, по крайней мере, одно значение должно "
-#~ "быть > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr ""
-#~ "Неверный шаблон прерывистой линии, значение должно быть положительным"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Не удалось выполнить разбор стилей Mappaint из ''{0}''. Ошибка: [{1}:{2}] {3}"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index c8109c4..026967a 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-12 18:48+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-28 16:03+0000\n"
"Last-Translator: aceman444 <Unknown>\n"
"Language-Team: Slovak <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:03+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:02+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -155,9 +155,6 @@ msgstr "Java verzia {0}"
msgid "Homepage"
msgstr "Domovská stránka"
-msgid "Bug Reports"
-msgstr "Správy o chybách"
-
msgid "Info"
msgstr "Informácie"
@@ -179,6 +176,12 @@ msgstr "Pluginy"
msgid "About JOSM..."
msgstr "O programe JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Nahlásiť chybu"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Nepodarilo sa nájsť zdroj \"{0}\"."
@@ -610,9 +613,6 @@ msgstr "Upraviť polohu tohto mapového podkladu"
msgid "Adjust imagery offset"
msgstr "Nastaviť posun mapového podkladu"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1271,9 +1271,6 @@ msgstr "Tiež premenovať súbor"
msgid "Could not rename file ''{0}''"
msgstr "Nemôžem premenovať súbor ''{0}''"
-msgid "Report bug"
-msgstr "Nahlásiť chybu"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Zadať hlásenie do evidence chýb pre JOSM"
@@ -1933,6 +1930,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Spomalené prehrávanie"
+msgid "Downloading changeset content"
+msgstr "Sťahovanie obsahu zmenového súboru"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Sťahovanie zmenového súboru {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Sťahovanie obsahu pre zmenový súbor {2}..."
+
+msgid "Download changesets"
+msgstr "Stiahnuť súbory zmien"
+
+msgid "Querying and downloading changesets"
+msgstr "Žiadanie a sťahovanie zmenových súborov"
+
+msgid "Determine user id for current user..."
+msgstr "Zisťovanie ID pre aktuálneho používateľa..."
+
+msgid "Query and download changesets ..."
+msgstr "Požiadavka a sťahovanie zmenových súborov ..."
+
+msgid "Errors during download"
+msgstr "Chyby počas sťahovania"
+
msgid "Download GPS"
msgstr "Stiahnuť GPS"
@@ -2106,9 +2127,6 @@ msgstr "Vymazať alebo presunúť objekty"
msgid "The following errors occurred during mass download: {0}"
msgstr "Nasledujúce chyby nastali počas hromadného sťahovania: {0}"
-msgid "Errors during download"
-msgstr "Chyby počas sťahovania"
-
msgid "Error during download"
msgstr "Chyba počas sťahovania"
@@ -2459,11 +2477,11 @@ msgid "Add selection to relation"
msgstr "Pridať výber do relácie"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Pridať výber do relácie</strong>: Skontrolujte každú reláciu, "
-"aby neprišlo k poškodeniu!"
+"{0}Pridať výber do relácie{1}: skontrolujte každú reláciu, aby ste predišli "
+"poškodeniam!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3314,9 +3332,6 @@ msgstr "Vyriešiť konflikty v zozname bodov cesty {0}"
msgid "Main dataset does not include node {0}"
msgstr "Hlavná dátová sada neobsahuje bod {0}"
-msgid "Apply?"
-msgstr "Použiť?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3348,27 +3363,6 @@ msgstr ""
"Pri otáčaní tejto cesty sú navrhované nasledovné zmeny na zachovanie "
"konzistencie dát."
-msgid "Relation"
-msgstr "Relácia"
-
-msgid "Old role"
-msgstr "Stará funkcia"
-
-msgid "New role"
-msgstr "Nová funkcia"
-
-msgid "Old key"
-msgstr "Starý kľúč"
-
-msgid "Old value"
-msgstr "Stará hodnota"
-
-msgid "New key"
-msgstr "Nový kľúč"
-
-msgid "New value"
-msgstr "Nová hodnota"
-
msgid "Apply selected changes"
msgstr "Použiť zvolené zmeny"
@@ -4518,6 +4512,9 @@ msgstr "Relácia trasy obsahuje rolu \"{0}\""
msgid "Route relation contains a gap"
msgstr "Relácia trasy obsahuje medzeru"
+msgid "Stop position not part of route"
+msgstr "Miesto zastavenia vozidla nie je súčasťou relácie"
+
msgid "Role verification problem"
msgstr "Problém s overením úlohy"
@@ -5189,6 +5186,12 @@ msgstr "Zapnutá úroveň detailného ladenia (krokovanie)"
msgid "Initializing"
msgstr "Prebieha inicializácia"
+msgid "Setting defaults"
+msgstr "Nastavujem východzie hodnoty"
+
+msgid "Creating main GUI"
+msgstr "Vytváram hlavné grafické rozhranie (GUI)"
+
msgid "Updating plugins"
msgstr "Aktualizujem pluginy"
@@ -5198,12 +5201,6 @@ msgstr "Inštalujem aktualizované pluginy"
msgid "Loading early plugins"
msgstr "Načítavam skoršie pluginy"
-msgid "Setting defaults"
-msgstr "Nastavujem východzie hodnoty"
-
-msgid "Creating main GUI"
-msgstr "Vytváram hlavné grafické rozhranie (GUI)"
-
msgid "Loading plugins"
msgstr "Načítavam pluginy"
@@ -6280,6 +6277,30 @@ msgstr "Zobraziť iba značky (tagy) s konfliktmi"
msgid "Show tags with multiple values only"
msgstr "Zobraziť iba značky s rôznymi hodnotami"
+msgid "Apply?"
+msgstr "Použiť?"
+
+msgid "Relation"
+msgstr "Relácia"
+
+msgid "Old role"
+msgstr "Stará funkcia"
+
+msgid "New role"
+msgstr "Nová funkcia"
+
+msgid "Old key"
+msgstr "Starý kľúč"
+
+msgid "Old value"
+msgstr "Stará hodnota"
+
+msgid "New key"
+msgstr "Nový kľúč"
+
+msgid "New value"
+msgstr "Nová hodnota"
+
msgid "For selected objects only"
msgstr "Len pre označené objekty"
@@ -6816,51 +6837,6 @@ msgstr "Prepnúť viditeľnosť vrstvy: {0}"
msgid "Open a list of all loaded layers."
msgstr "Otvoriť zoznam všetkých nahratých vrstiev."
-msgid "Delete the selected layers."
-msgstr "Zmazať vybrané vrstvy."
-
-msgid "Show/hide"
-msgstr "Zobraziť/schovať"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
-
-msgid "Show/hide layer"
-msgstr "Zobraziť/skryť vrstvu"
-
-msgid "Opacity"
-msgstr "Nepriehladnosť"
-
-msgid "Adjust opacity of the layer."
-msgstr "Nastavte nepriehľadnosť vrstvy."
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Upraviť hodnotu gamma pre vrstvu."
-
-msgid "Activate"
-msgstr "Aktivovať"
-
-msgid "Activate the selected layer"
-msgstr "Aktivovať vybratú vrstvu"
-
-msgid "Activate layer"
-msgstr "Aktivovať vrstvu"
-
-msgid "Merge this layer into another layer"
-msgstr "Spojiť túto vrstvu do ďalšej vrstvy"
-
-msgid "Duplicate this layer"
-msgstr "Duplikovať túto vrstvu"
-
-msgid "Copy of {0}"
-msgstr "Kópia {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kópia {1} z {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "vrstva je v súčasnosti viditeľná (kliknutím sa vrstva skryje)"
@@ -6885,12 +6861,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "táto vrstva nemá vlastné rozlíšenie"
-msgid "Move the selected layer one row up."
-msgstr "Presunúť zvolenú vrstvu o riadok hore."
-
-msgid "Move the selected layer one row down."
-msgstr "Presunúť zvolenú vrstvu o riadok dole."
-
msgid "Information about layer"
msgstr "Informácie o vrstve"
@@ -7329,15 +7299,6 @@ msgstr "Zatvorený v"
msgid "Discussions"
msgstr "Diskusie"
-msgid "Downloading changeset content"
-msgstr "Sťahovanie obsahu zmenového súboru"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Sťahovanie zmenového súboru {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Sťahovanie obsahu pre zmenový súbor {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7458,9 +7419,6 @@ msgstr "Aktualizovať diskusiu k sade zmien zo servera OSM"
msgid "Date"
msgstr "Dátum"
-msgid "Download changesets"
-msgstr "Stiahnuť súbory zmien"
-
msgid "{0} [incomplete]"
msgstr "{0} [incomplete]"
@@ -7634,16 +7592,6 @@ msgid "Please enter an integer value > 0"
msgstr "Prosím vložte ako hodnotu celé číslo > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Aktuálna hodnota nie je platné meno používateľa.<br>Prosím vložte (nie "
-"prázdne) meno používateľa.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Prosím vložte (nie prázdne) meno používateľa"
-
-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 ""
@@ -7746,15 +7694,6 @@ msgstr "Neplatná URL pre požiadavky na zmenové súbory"
msgid "Close the dialog and abort querying of changesets"
msgstr "Zatvoriť dialóg a zrušiť požiadavku na zmenové súbory"
-msgid "Querying and downloading changesets"
-msgstr "Žiadanie a sťahovanie zmenových súborov"
-
-msgid "Determine user id for current user..."
-msgstr "Zisťovanie ID pre aktuálneho používateľa..."
-
-msgid "Query and download changesets ..."
-msgstr "Požiadavka a sťahovanie zmenových súborov ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7775,6 +7714,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Táto URl pre požiadavky na zmenové súbory je chybná"
+msgid "Activate"
+msgstr "Aktivovať"
+
+msgid "Activate the selected layer"
+msgstr "Aktivovať vybratú vrstvu"
+
+msgid "Activate layer"
+msgstr "Aktivovať vrstvu"
+
+msgid "Delete the selected layers."
+msgstr "Zmazať vybrané vrstvy."
+
+msgid "Duplicate this layer"
+msgstr "Duplikovať túto vrstvu"
+
+msgid "Copy of {0}"
+msgstr "Kópia {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kópia {1} z {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Zmeniť viditeľnosť vybranej vrstvy."
+
+msgid "Show layer"
+msgstr "Zobraziť vrstvu"
+
+msgid "Adjust opacity of the layer."
+msgstr "Nastavte nepriehľadnosť vrstvy."
+
+msgid "Opacity"
+msgstr "Nepriehľadnosť"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Upraviť hodnotu gamma pre vrstvu."
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Upraviť ostrosť/rozmazanie vrstvy."
+
+msgid "Sharpness"
+msgstr "Ostrosť"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Upraviť farebnosť vrstvy."
+
+msgid "Colorfulness"
+msgstr "Farebnosť"
+
+msgid "Merge this layer into another layer"
+msgstr "Spojiť túto vrstvu do ďalšej vrstvy"
+
+msgid "Move the selected layer one row down."
+msgstr "Presunúť zvolenú vrstvu o riadok dole."
+
+msgid "Move the selected layer one row up."
+msgstr "Presunúť zvolenú vrstvu o riadok hore."
+
+msgid "Show/hide"
+msgstr "Zobraziť/schovať"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
+
+msgid "Show/hide layer"
+msgstr "Zobraziť/skryť vrstvu"
+
msgid "Discardable key: selection Foreground"
msgstr "Zbytočný kľúč: popredie výberu"
@@ -8107,12 +8115,12 @@ msgstr "Nadradené relácie"
msgid "Child Relations"
msgstr "Podriadené relácie"
-msgid "Apply Role:"
-msgstr "Použiť Funkciu:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Vložiť funkciu a použiť na vybraté členy relácie"
+msgid "Apply Role:"
+msgstr "Použiť Funkciu:"
+
msgid "New Relation"
msgstr "Nová Relácia"
@@ -10006,9 +10014,6 @@ msgstr "Zoslabenie mapového podkladu"
msgid "Unsupported imagery type: {0}"
msgstr "Nepodporovaný typ podkladových snímok: {0}"
-msgid "ERROR"
-msgstr "CHYBA"
-
msgid "Next marker"
msgstr "Nasledujúca značka"
@@ -10915,14 +10920,6 @@ msgstr "Opätovný chod automatických autorizačných krokov"
msgid "Test Access Token"
msgstr "Test autorizačného prístupu"
-msgid "Please enter your OSM user name"
-msgstr "Prosím vložte vaše OSM po užívateľské meno"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Meno používateľa nemôže byť prázdne. Prosím vložte vaše OSM používateľské "
-"meno"
-
msgid "Please enter your OSM password"
msgstr "Prosím vložte vaše OSM heslo"
@@ -12483,7 +12480,7 @@ msgid "Sort presets menu alphabetically"
msgstr "Zoradiť predvoľby abecedne"
msgid "Tagging Presets"
-msgstr "Predvoľby značenia (Tagging Presets)"
+msgstr "Predvoľby značenia"
msgid "Available presets:"
msgstr "Dostupné predvoľby:"
@@ -12525,7 +12522,7 @@ msgstr ""
"hodnota je \"{1}\""
msgid "Internal Preset"
-msgstr "Vnútorné Prednastavenie"
+msgstr "Základné interné predvoľby"
msgid "The default preset for JOSM"
msgstr "Východiskové nastavenie pre JOSM"
@@ -13151,6 +13148,14 @@ msgstr "Nastavenie pripojenia"
msgid "Connection Settings for the OSM server."
msgstr "Nastavenie pripojenia pre OSM server."
+msgid "Please enter your OSM user name"
+msgstr "Prosím vložte vaše OSM po užívateľské meno"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Meno používateľa nemôže byť prázdne. Prosím vložte vaše OSM používateľské "
+"meno"
+
msgid "Action"
msgstr "Akcia"
@@ -13711,6 +13716,16 @@ msgstr ""
"Nepovolená hodnota atribútu \"{0}\" prvku \"{1}\" v schopnostiach servera. "
"Obdržaná hodnota je \"{2}\""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Chyba pri pridávaní certifikátu {0} - nesúhlasí odtlačok certifikátu. "
+"Očakával sa {1}, bol {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Pridáva sa certifikát pre TLS spojenie: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Nerozumiem dátumu \"{0}\" v odpovedi servera."
@@ -15117,78 +15132,6 @@ msgstr "nešpecifikovaný dôvod"
msgid "Error playing sound"
msgstr "Chyba prehrávánia zvuku"
-msgid "Do nothing"
-msgstr "Neurobiť nič"
-
-msgid "Report Bug"
-msgstr "Nahlásiť chybu"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Došlo k neočakávanej výnimke.<br>Toto je vždy chyba programovania. Ak "
-"používate najnovšiu verziu JOSM <br>, zvážte prosím vyplnenie hlásenia o "
-"chybe."
-
-msgid "Update JOSM"
-msgstr "Aktualizovať JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Došlo k neočakávanej výnimke. Toto je vždy chyba programovania. "
-"<br><br>Používate však starú verziu JOSM ({0})<br>namiesto aktuálnej "
-"otestovanej verzie (<b>{1}</b>).<br><br><b>Prosím aktualizujte JOSM</b> "
-"predtým než nahlásite túto chybu."
-
-msgid "Unexpected Exception"
-msgstr "Neočakávaná chyba programu."
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Potlačiť ďalšie chybové hlášky počas tohto sedenia."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Došlo k chybe v programe JOSM. Pred tým ako podáte hlásenie o chybe, uistite "
-"sa, že máte program JOSM aktualizovaný na poslednú verziu tu:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Tiež by ste mali aktualizovať svoje pluginy. Ak ani jedno z toho nepomôže, "
-"pošlite prosím súbor hlásenia o chybe do našho bugtracker-a pomocou tohto "
-"odkazu:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Chybové informácie by mali byť predvyplnené. Prosím, vyplňte informácie o "
-"tom, ako chybu reprodukovať a snažte sa to popísať čo najpodrobnejšie."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Prípadne, ak to nebude fungovať, môžete ručne vyplniť údaje nižšie na tejto "
-"URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Text už bol skopírovaný do schránky.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Narazili ste na chybu v programe JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15593,9 +15536,6 @@ msgstr ""
"Príliš veľa detekovaných presmerovaní na adresu URL pre sťahovanie . "
"Prerušujem."
-msgid "Fetching content..."
-msgstr "Sťahuje sa obsah..."
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Nemôžem nájsť preklad pre jazyk {0}. Vyberám {1}."
@@ -15814,6 +15754,83 @@ msgstr "Ignorujem geometriu chybného tvaru: {0}"
msgid "Failed to load XML schema."
msgstr "Nepodarilo sa načítať XML schémy."
+msgid "Do nothing"
+msgstr "Neurobiť nič"
+
+msgid "Report Bug"
+msgstr "Nahlásiť chybu"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Došlo k neočakávanej výnimke.<br>Toto je vždy chyba programovania. Ak "
+"používate najnovšiu verziu JOSM <br>, zvážte prosím vyplnenie hlásenia o "
+"chybe."
+
+msgid "Update JOSM"
+msgstr "Aktualizovať JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Došlo k neočakávanej výnimke. Toto je vždy chyba programovania. "
+"<br><br>Používate však starú verziu JOSM ({0})<br>namiesto aktuálnej "
+"otestovanej verzie (<b>{1}</b>).<br><br><b>Prosím aktualizujte JOSM</b> "
+"predtým než nahlásite túto chybu."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Potlačiť ďalšie chybové hlášky počas tohto sedenia."
+
+msgid "Unexpected Exception"
+msgstr "Neočakávaná chyba programu."
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Narazili ste na chybu v programe JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Došlo k chybe v programe JOSM. Pred tým ako podáte hlásenie o chybe, uistite "
+"sa, že máte program JOSM aktualizovaný na poslednú verziu tu:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Tiež by ste mali aktualizovať svoje pluginy. Ak ani jedno z toho nepomôže, "
+"pošlite prosím súbor hlásenia o chybe do našho bugtracker-a pomocou tohto "
+"odkazu:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Chybové informácie by mali byť predvyplnené. Prosím, vyplňte informácie o "
+"tom, ako chybu reprodukovať a snažte sa to popísať čo najpodrobnejšie."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Prípadne, ak to nebude fungovať, môžete ručne vyplniť údaje nižšie na tejto "
+"URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Text už bol skopírovaný do schránky.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Otvorenie hlásenia o chybe sa nepodarilo. Prosím nahláste ručne na stránke:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16161,14 +16178,14 @@ msgstr "MapBox Satelit"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS Stopy"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Štandardná vrstva)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap (námorná mapa)"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr "OpenStreetMap Carto (Štandardná vrstva)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Čiernobiely)"
@@ -16176,8 +16193,14 @@ msgstr "OpenStreetMap (Mapnik Čiernobiely)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, bez nápisov)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (Francúzsky štýl)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Nemecký štýl)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS Stopy"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16188,15 +16211,12 @@ msgstr "Hromadná doprava (ÖPNV)"
msgid "Hike & Bike"
msgstr "Turistika & Cyklistika"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Nemecký štýl)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Kambodža, Laos, Thajsko, Vietnam dvojjazyčné"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -16293,6 +16313,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (základná mapa)"
@@ -16317,14 +16340,14 @@ msgstr "VoGIS: Obraz v skutočných farbách 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Obraz v skutočných farbách Zima 2015 (20cm)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: Obraz v reálnych farbách 2015 (10cm)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Plán využitia územia"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Terénny model)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Povrchový model)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: Výšky a pozemky"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) letecké snímky (pokrýva aj región Bruselu)"
@@ -16470,11 +16493,11 @@ msgstr "Géolittoral V2 - Orthofoto 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr "Lyon - Ortofoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Lyon - Ortofoto 2012-03 10cm - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr "Lyon - Ortofoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Lyon - Ortofoto 2015-05 8cm - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Loire-Atlantique - Ortofoto 2012 - 20 cm"
@@ -16528,6 +16551,15 @@ msgstr "Bavorsko (80 cm)"
msgid "Bavaria (2 m)"
msgstr "Bavorsko (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Berlín letecké fotografie 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Berlín letecké fotografie 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Berlín letecké fotografie 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Stuttgart (letecké snímky)"
@@ -16543,18 +16575,6 @@ msgstr "Stará mapa Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Stará mapa Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - Prírodná mapa (prírodné oblasti)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE:Harz - Prírodná mapa (prírodné oblasti)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE:Harz - Prekrytie pre Bing (napr. použite priehľadnosť medzi 20% "
-"a 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16600,6 +16620,9 @@ 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"
+msgstr "Törökbálint ortofoto 2015"
+
msgid "Danube flood ortophoto 2013"
msgstr "Dunajská záplava ortofoto 2013"
@@ -16660,6 +16683,9 @@ msgstr "OSMIE T.ie Pozemky mimo okresov"
msgid "Lodi - Italy"
msgstr "Lodi - Taliansko"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Lombardia - Taliansko (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Lombardia - Taliansko (CTR DBT)"
@@ -16696,11 +16722,8 @@ msgstr "1.cikla ortofotokarte - Lotyšsko"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Litva)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Orto 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Orto 2013"
+msgid "geoportail.lu"
+msgstr "geoportail.lu"
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Železnice"
@@ -16801,6 +16824,9 @@ msgstr "Powiat poznański: Budynki (budovy)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (Letecký snímok)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Powiat ropczycko-sędziszowski: Budynki (budovy)"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Powiat rzeszowski: Budynki (budovy)"
@@ -16810,6 +16836,9 @@ msgstr "Powiat rzeszowski: Ortofotomapa (Letecké snímky)"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Powiat stalowowolski: Budynki (budovy)"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr "Poznań: Ortofotomapa 2014 (letecké snímky)"
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Przemyśl: Budynki (budovy)"
@@ -17505,6 +17534,13 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr "Tento plugin zjednodušuje mapovanie a úpravy chodieb v budovách."
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Asistuje pri mapovaní vovnútri budov. Obsahuje validátor a štýl pre údaje "
+"vovnúri budov."
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18808,7 +18844,7 @@ msgid "Toll"
msgstr "Mýto (Toll)"
msgid "Intermittent"
-msgstr "nepravidelné"
+msgstr "Nepravidelné"
msgid "Seasonal"
msgstr "Sezónne"
@@ -18939,6 +18975,12 @@ msgstr "Hlavné komunikácie"
msgid "Motorway"
msgstr "Diaľnica"
+msgid "Destination"
+msgstr "Cieľ"
+
+msgid "Destination reference"
+msgstr "Smer na (cieľ)"
+
msgid "Placement"
msgstr "Umiestnenie"
@@ -19532,9 +19574,6 @@ msgstr "Diaľničná križovatka"
msgid "Number"
msgstr "Číslo"
-msgid "Exit to"
-msgstr "Výjazd do"
-
msgid "Services"
msgstr "Odpočívadlo so službami"
@@ -20019,6 +20058,15 @@ msgstr "prílivová oblasť"
msgid "mangrove"
msgstr "mangrovová oblasť"
+msgid "wet_meadow"
+msgstr "mokrá lúka"
+
+msgid "string_bog"
+msgstr "pásová slatina"
+
+msgid "saltern"
+msgstr "soľné odparovacie pláne"
+
msgid "Mud"
msgstr "Blato"
@@ -21169,6 +21217,9 @@ msgstr "Ohnisko"
msgid "Fishing"
msgstr "Rybolov"
+msgid "Bird Hide"
+msgstr "Skrýša na pozorovanie vtákov"
+
msgid "Night Club"
msgstr "Nočný zábavný klub"
@@ -22437,6 +22488,10 @@ msgid "transformer_tower"
msgstr "veža transformátora"
msgctxt "building"
+msgid "public"
+msgstr "verejná"
+
+msgctxt "building"
msgid "Levels"
msgstr "Počet podlaží"
@@ -24026,7 +24081,7 @@ msgstr "sáčky na výkaly"
msgid "food"
msgstr "jedlo"
-msgid "news_papers"
+msgid "newspapers"
msgstr "noviny"
msgid "parking_tickets"
@@ -24041,8 +24096,8 @@ msgstr "plány MHD"
msgid "public_transport_tickets"
msgstr "lístky MHD"
-msgid "SIM-cards"
-msgstr "SIM-karty"
+msgid "SIM_cards"
+msgstr "SIM karty"
msgid "stamps"
msgstr "známky"
@@ -25314,6 +25369,21 @@ msgstr "prírodné (natural)"
msgid "Walking Route"
msgstr "Trasa pre chodcov"
+msgid "Riding Route"
+msgstr "Jazdecká trasa"
+
+msgid "ihn"
+msgstr "medzinárodná jazdecká trasa"
+
+msgid "nhn"
+msgstr "národná jazdecká trasa"
+
+msgid "rhn"
+msgstr "regionálna jazdecká trasa"
+
+msgid "lhn"
+msgstr "lokálna jazdecká trasa"
+
msgid "Piste Route"
msgstr "Zjazdovka"
@@ -25338,9 +25408,6 @@ msgstr "alpské lyžovanie"
msgid "Detour Route"
msgstr "Obchádzková trasa"
-msgid "Destination"
-msgstr "Cieľ"
-
msgid "Ref of the way this is a detour to"
msgstr "číslo trasy, pre ktorú je toto skratkou"
@@ -25500,8 +25567,14 @@ msgstr "Táborisko"
msgid "Test"
msgstr "Otestovať"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Klesajúce čísla domov v interpolácii adries"
+msgid "Even housenumber in odd address interpolation."
+msgstr "Párne čísla domov na nepárnej interpolácii adries."
+
+msgid "Odd housenumber in even address interpolation."
+msgstr "Nepárne čísla domov na párnej interpolácii adries."
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr "Cesta s {0}. Ak je to možné, označkujte každé číslo domu samostatne."
msgid "{0} without {1}"
msgstr "{0} bez {1}"
@@ -25588,6 +25661,13 @@ msgstr ""
"Nesprávne použitie značky {0}. Odstráňte {1}, pretože je zrejmé, že názov "
"chýba aj bez doplňujúcej značky."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+"{0} je málo presné. Použite namiesto toho kľúč fixme s informáciou čo presne "
+"má byť opravené."
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} je zastaralé. Prosím použite radšej multipolygón."
@@ -25693,6 +25773,9 @@ msgstr "{0} musí byť pripojené k ceste"
msgid "node connects waterway and bridge"
msgstr "bod spája vodnú cestu a most"
+msgid "{0} node connected to a highway"
+msgstr "bod {0} pripojený k ceste"
+
msgid "suspicious roundabout direction"
msgstr "podozrivý smer kruhového objazdu"
@@ -25702,6 +25785,15 @@ msgstr "{0} na veľkej ploche"
msgid "{0} on a small area"
msgstr "{0} na malej ploche"
+msgid "Too large building"
+msgstr "Príliš veľká budova"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+"Bod spája elektrické vedenie s objektom, ktorý nepatrí do elektrickej siete."
+
msgid "abbreviated street name"
msgstr "skrátený názov ulice"
@@ -25731,7 +25823,7 @@ msgstr ""
"\"{3}\"."
msgid "pedestrian railway crossing without {0}"
-msgstr "peší prechod cez železnicu bez {0}"
+msgstr "peší priechod cez železnicu bez {0}"
msgid "railway crossing without {0}"
msgstr "železničné priecestie bez {0}"
@@ -28921,6 +29013,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -31268,6 +31420,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Chybný výber"
+
msgid "Public transport routes"
msgstr ""
@@ -32066,9 +32227,6 @@ msgstr "Vytvoriť rad budov"
msgid "Creates individual buildings from a long building."
msgstr "Vytvoriť viac jednotlivých budov z jednej dlhej budovy."
-msgid "Invalid selection"
-msgstr "Chybný výber"
-
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 "
@@ -33957,19 +34115,3 @@ msgstr "Ísť jazdiť"
msgid "Drive a race car on this layer"
msgstr "Jazdiť so závodným autom na tejto vrstve"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "Nesprávna kresba prerušovanej čiary, aspoň jedna hodnota musí byť > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "Nesprávna kresba prerušovanej čiary, hodnoty musia byť kladné"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Nepodarilo sa prečítať štýl kreslenia mapy z \"{0}\". Chyba bola: [{1}:{2}] "
-#~ "{3}"
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 391a504..db64e4c 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:04+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:02+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -149,9 +149,6 @@ msgstr "Java različica {0}"
msgid "Homepage"
msgstr "Domača stran"
-msgid "Bug Reports"
-msgstr "Prijava napak"
-
msgid "Info"
msgstr "Podrobnosti"
@@ -173,6 +170,12 @@ msgstr "Vstavki"
msgid "About JOSM..."
msgstr "O JOSM..."
+msgid "OK"
+msgstr "Potrdi"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -579,9 +582,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "Potrdi"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1171,9 +1171,6 @@ msgstr "Hkrati preimenuj datoteko"
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1790,6 +1787,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Počasneje naprej"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1939,9 +1960,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2259,8 +2277,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3043,9 +3061,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr "Uveljavim?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3065,27 +3080,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "Relacija"
-
-msgid "Old role"
-msgstr "Stara vloga"
-
-msgid "New role"
-msgstr "Nova vloga"
-
-msgid "Old key"
-msgstr "Star ključ"
-
-msgid "Old value"
-msgstr "Stara vrednost"
-
-msgid "New key"
-msgstr "Nov ključ"
-
-msgid "New value"
-msgstr "Nova vrednost"
-
msgid "Apply selected changes"
msgstr "Uveljavi izbrane spremembe"
@@ -4151,6 +4145,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4802,6 +4799,12 @@ msgstr ""
msgid "Initializing"
msgstr "Inicializacija"
+msgid "Setting defaults"
+msgstr "Privzete nastavitve"
+
+msgid "Creating main GUI"
+msgstr "Priprava grafičnega uporabniškega vmesnika"
+
msgid "Updating plugins"
msgstr ""
@@ -4811,12 +4814,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr "Nalaganje zgodnjih vstavkov"
-msgid "Setting defaults"
-msgstr "Privzete nastavitve"
-
-msgid "Creating main GUI"
-msgstr "Priprava grafičnega uporabniškega vmesnika"
-
msgid "Loading plugins"
msgstr "Nalaganje vstavkov"
@@ -5787,6 +5784,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "Uveljavim?"
+
+msgid "Relation"
+msgstr "Relacija"
+
+msgid "Old role"
+msgstr "Stara vloga"
+
+msgid "New role"
+msgstr "Nova vloga"
+
+msgid "Old key"
+msgstr "Star ključ"
+
+msgid "Old value"
+msgstr "Stara vrednost"
+
+msgid "New key"
+msgstr "Nov ključ"
+
+msgid "New value"
+msgstr "Nova vrednost"
+
msgid "For selected objects only"
msgstr ""
@@ -6274,51 +6295,6 @@ msgstr "Preklop vidnost plasti: {0}"
msgid "Open a list of all loaded layers."
msgstr "Odpri seznam vseh naloženih plasti."
-msgid "Delete the selected layers."
-msgstr "Izbriši izbrano plast."
-
-msgid "Show/hide"
-msgstr "Pokaži/Skrij"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Preklopi vidnost izbrane plasti."
-
-msgid "Show/hide layer"
-msgstr "Pokaži/skrij plast"
-
-msgid "Opacity"
-msgstr "Prekrivnost"
-
-msgid "Adjust opacity of the layer."
-msgstr "Nastavi prekrivnost plasti."
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Aktiviraj"
-
-msgid "Activate the selected layer"
-msgstr "Aktiviraj izbrano plast"
-
-msgid "Activate layer"
-msgstr "Aktiviraj plast"
-
-msgid "Merge this layer into another layer"
-msgstr "To plast pripojite drugi plasti"
-
-msgid "Duplicate this layer"
-msgstr "Podvoji to plast"
-
-msgid "Copy of {0}"
-msgstr "Kopija {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopija {1} {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "plast je trenutno vidna (kliknite, če želite skriti plast)"
@@ -6341,12 +6317,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Pomakni izbrano plast vrstico višje."
-
-msgid "Move the selected layer one row down."
-msgstr "Pomakni izbrano plast vrstico nižje."
-
msgid "Information about layer"
msgstr "Informacije o plasti"
@@ -6769,15 +6739,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6883,9 +6844,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7037,14 +6995,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7129,15 +7079,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7155,6 +7096,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr "Aktiviraj"
+
+msgid "Activate the selected layer"
+msgstr "Aktiviraj izbrano plast"
+
+msgid "Activate layer"
+msgstr "Aktiviraj plast"
+
+msgid "Delete the selected layers."
+msgstr "Izbriši izbrano plast."
+
+msgid "Duplicate this layer"
+msgstr "Podvoji to plast"
+
+msgid "Copy of {0}"
+msgstr "Kopija {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopija {1} {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Nastavi prekrivnost plasti."
+
+msgid "Opacity"
+msgstr "Prekrivnost"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "To plast pripojite drugi plasti"
+
+msgid "Move the selected layer one row down."
+msgstr "Pomakni izbrano plast vrstico nižje."
+
+msgid "Move the selected layer one row up."
+msgstr "Pomakni izbrano plast vrstico višje."
+
+msgid "Show/hide"
+msgstr "Pokaži/Skrij"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Preklopi vidnost izbrane plasti."
+
+msgid "Show/hide layer"
+msgstr "Pokaži/skrij plast"
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7474,10 +7484,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9145,9 +9155,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9954,12 +9961,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11969,6 +11970,12 @@ msgstr "Nastavitve povezave"
msgid "Connection Settings for the OSM server."
msgstr "Nastavitve povezave do strežnika OSM."
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12481,6 +12488,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13732,62 +13747,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr "Ne stori ničesar"
-
-msgid "Report Bug"
-msgstr "Prijavi napako"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "Nepričakovana napaka"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Besedilo je že bilo prekopirano na odložišče.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14039,9 +13998,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14226,6 +14182,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Ne stori ničesar"
+
+msgid "Report Bug"
+msgstr "Prijavi napako"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Nepričakovana napaka"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Besedilo je že bilo prekopirano na odložišče.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14560,13 +14576,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14575,7 +14591,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14587,15 +14609,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14692,6 +14711,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14716,13 +14738,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14869,10 +14891,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14925,29 +14947,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14995,6 +15016,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15055,6 +15079,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15091,10 +15118,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15196,6 +15220,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15205,6 +15232,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15860,6 +15890,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17217,6 +17252,12 @@ msgstr "Ceste"
msgid "Motorway"
msgstr "Avtocesta"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17793,9 +17834,6 @@ msgstr "Avtocestno križišče"
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18274,6 +18312,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19422,6 +19469,9 @@ msgstr ""
msgid "Fishing"
msgstr "Ribarjenje"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20690,6 +20740,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22277,7 +22331,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22292,8 +22346,8 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
-msgstr "SIM kartice"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr ""
@@ -23547,6 +23601,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23571,9 +23640,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23733,7 +23799,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23817,6 +23889,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23915,6 +23992,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23924,6 +24004,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27023,6 +27111,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29346,6 +29494,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30130,9 +30287,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index f9db5c1..56b9b5d 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 04:31+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 04:31+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr "Versioni në Java {0}"
msgid "Homepage"
msgstr "Faqja kryesore"
-msgid "Bug Reports"
-msgstr "Raportimi i Gabimeve"
-
msgid "Info"
msgstr "Informacion"
@@ -172,6 +169,12 @@ msgstr "Shtojca"
msgid "About JOSM..."
msgstr "Rreth JOSM..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,6 +4769,12 @@ msgstr ""
msgid "Initializing"
msgstr ""
+msgid "Setting defaults"
+msgstr ""
+
+msgid "Creating main GUI"
+msgstr "Krijimi i GUI-të kryesor"
+
msgid "Updating plugins"
msgstr ""
@@ -4781,12 +4784,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr ""
-msgid "Setting defaults"
-msgstr ""
-
-msgid "Creating main GUI"
-msgstr "Krijimi i GUI-të kryesor"
-
msgid "Loading plugins"
msgstr ""
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index 5b5dbc0..7b3c683 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:02+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:01+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -149,9 +149,6 @@ msgstr "Џава верзија {0}"
msgid "Homepage"
msgstr "Матична страница"
-msgid "Bug Reports"
-msgstr "Пријаве грешака"
-
msgid "Info"
msgstr "Подаци"
@@ -173,6 +170,12 @@ msgstr "Додаци"
msgid "About JOSM..."
msgstr "О програму ЈОСМ"
+msgid "OK"
+msgstr "У реду"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -575,9 +578,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "У реду"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1167,9 +1167,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1779,6 +1776,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1928,9 +1949,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2246,8 +2264,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3028,9 +3046,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3050,27 +3065,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4128,6 +4122,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4773,19 +4770,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5758,6 +5755,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6245,51 +6266,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6312,12 +6288,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6740,15 +6710,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6854,9 +6815,6 @@ msgstr ""
msgid "Date"
msgstr "Датум"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7008,14 +6966,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7100,15 +7050,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7126,6 +7067,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7441,10 +7451,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9101,9 +9111,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9906,12 +9913,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11919,6 +11920,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12429,6 +12436,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13670,62 +13685,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13977,9 +13936,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14164,6 +14120,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14498,13 +14514,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14513,7 +14529,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14525,15 +14547,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14630,6 +14649,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14654,13 +14676,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14807,10 +14829,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14863,29 +14885,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14933,6 +14954,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14993,6 +15017,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15029,10 +15056,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15134,6 +15158,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15143,6 +15170,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15798,6 +15828,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17155,6 +17190,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17731,9 +17772,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18212,6 +18250,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19360,6 +19407,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20628,6 +20678,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22215,7 +22269,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22230,7 +22284,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23485,6 +23539,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23509,9 +23578,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23671,7 +23737,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23755,6 +23827,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23853,6 +23930,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23862,6 +23942,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26961,6 +27049,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29282,6 +29430,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30066,9 +30223,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 073b6af..56a5942 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2016-02-08 15:05+0000\n"
"Last-Translator: Andreas Vilén <andreas.vilen at gmail.com>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:05+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:03+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -151,9 +151,6 @@ msgstr "Java-version {0}"
msgid "Homepage"
msgstr "Hemsida"
-msgid "Bug Reports"
-msgstr "Buggrapporter"
-
msgid "Info"
msgstr "Information"
@@ -175,6 +172,12 @@ msgstr "Insticksmoduler"
msgid "About JOSM..."
msgstr "Om JOSM..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Rapportera fel"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Kunde inte hitta resursen ''{0}''."
@@ -598,9 +601,6 @@ msgstr "Justera positionen av detta bildlager"
msgid "Adjust imagery offset"
msgstr "Justera detta bildlagers offset"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1252,9 +1252,6 @@ msgstr "Byt också namn på filen"
msgid "Could not rename file ''{0}''"
msgstr "Kunde inte döpa om filen ''{0}''"
-msgid "Report bug"
-msgstr "Rapportera fel"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Rapportera ett fel till JOSM"
@@ -1910,6 +1907,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Långsammare framåt"
+msgid "Downloading changeset content"
+msgstr "Hämtar hem innehållet i ändringsuppsättningar"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Hämtar hem ändringsuppsättning {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Hämtar hem innehållet i ändringsuppsättning {2}..."
+
+msgid "Download changesets"
+msgstr "Hämta ändringsuppsättningar"
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr "Fel under hämtning"
+
msgid "Download GPS"
msgstr "Ladda ner från GPS"
@@ -2074,9 +2095,6 @@ msgstr "Borttagna eller flyttade objekt"
msgid "The following errors occurred during mass download: {0}"
msgstr "Följande fel uppstod under masshämtning: {0}"
-msgid "Errors during download"
-msgstr "Fel under hämtning"
-
msgid "Error during download"
msgstr "Fel vid hämtning"
@@ -2423,11 +2441,9 @@ msgid "Add selection to relation"
msgstr "Lägg till det valda till relationen"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Lägg till det valda till relation</strong>: Kontrollera "
-"varenda relation!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3263,9 +3279,6 @@ msgstr "Rätta till konflikter i nodlistan för sträcka {0}"
msgid "Main dataset does not include node {0}"
msgstr "Huvuddatasetet inkluderar ej noden {0}"
-msgid "Apply?"
-msgstr "Tillämpa?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3295,27 +3308,6 @@ msgstr ""
"När du byter riktning på sträckan föreslås dessa förändringar för att "
"behålla betydelsen av datat."
-msgid "Relation"
-msgstr "Relation"
-
-msgid "Old role"
-msgstr "Gammal roll"
-
-msgid "New role"
-msgstr "Ny roll"
-
-msgid "Old key"
-msgstr "Gammal nyckel"
-
-msgid "Old value"
-msgstr "Gammalt värde"
-
-msgid "New key"
-msgstr "Ny nyckel"
-
-msgid "New value"
-msgstr "Nytt värde"
-
msgid "Apply selected changes"
msgstr "Verkställ valda ändringar"
@@ -4403,6 +4395,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Rollverifieringsproblem"
@@ -5075,6 +5070,12 @@ msgstr ""
msgid "Initializing"
msgstr "Initierar"
+msgid "Setting defaults"
+msgstr "Anger förval"
+
+msgid "Creating main GUI"
+msgstr "Skapar huvudgränssnittet"
+
msgid "Updating plugins"
msgstr "Uppdaterar insticksmoduler"
@@ -5084,12 +5085,6 @@ msgstr "Installerar uppdaterade insticksmoduler"
msgid "Loading early plugins"
msgstr "Hämtar tidiga insticksmoduler"
-msgid "Setting defaults"
-msgstr "Anger förval"
-
-msgid "Creating main GUI"
-msgstr "Skapar huvudgränssnittet"
-
msgid "Loading plugins"
msgstr "Hämtar insticksmoduler"
@@ -6067,6 +6062,30 @@ msgstr "Visa enbart taggar med konflikter"
msgid "Show tags with multiple values only"
msgstr "Visa taggar med enbart flera värden"
+msgid "Apply?"
+msgstr "Tillämpa?"
+
+msgid "Relation"
+msgstr "Relation"
+
+msgid "Old role"
+msgstr "Gammal roll"
+
+msgid "New role"
+msgstr "Ny roll"
+
+msgid "Old key"
+msgstr "Gammal nyckel"
+
+msgid "Old value"
+msgstr "Gammalt värde"
+
+msgid "New key"
+msgstr "Ny nyckel"
+
+msgid "New value"
+msgstr "Nytt värde"
+
msgid "For selected objects only"
msgstr "Visa enbart för valda objekt"
@@ -6565,51 +6584,6 @@ msgstr "Växla synlighet på lager: {0}"
msgid "Open a list of all loaded layers."
msgstr "Öppna en lista över alla inlästa lager."
-msgid "Delete the selected layers."
-msgstr "Radera de valda lagren."
-
-msgid "Show/hide"
-msgstr "Visa/dölj"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Alternera visning av det valda lagret."
-
-msgid "Show/hide layer"
-msgstr "Visa/dölj lager"
-
-msgid "Opacity"
-msgstr "Genomskinlighet"
-
-msgid "Adjust opacity of the layer."
-msgstr "Justera genomskinlighet på lagret."
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Aktivera"
-
-msgid "Activate the selected layer"
-msgstr "Aktivera det valda lagret"
-
-msgid "Activate layer"
-msgstr "Aktivera lager"
-
-msgid "Merge this layer into another layer"
-msgstr "Sammanfoga detta lager med ett annat"
-
-msgid "Duplicate this layer"
-msgstr "Duplicera det här lagret"
-
-msgid "Copy of {0}"
-msgstr "Kopia av {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Kopia {1} av {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "lagret är för närvarande synligt (klicka för att dölja lagret)"
@@ -6633,12 +6607,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Flytta det valda lagret en rad upp."
-
-msgid "Move the selected layer one row down."
-msgstr "Flytta det valda lagret en rad ner."
-
msgid "Information about layer"
msgstr "Information om lager"
@@ -7067,15 +7035,6 @@ msgstr ""
msgid "Discussions"
msgstr "Diskussioner"
-msgid "Downloading changeset content"
-msgstr "Hämtar hem innehållet i ändringsuppsättningar"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Hämtar hem ändringsuppsättning {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Hämtar hem innehållet i ändringsuppsättning {2}..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7181,9 +7140,6 @@ msgstr ""
msgid "Date"
msgstr "Datum"
-msgid "Download changesets"
-msgstr "Hämta ändringsuppsättningar"
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7336,16 +7292,6 @@ msgid "Please enter an integer value > 0"
msgstr "Ange ett heltal > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Nuvarande värde är inte ett giltigt användarnamn.<br>Ange ett icke-"
-"tomt användarnamn.</html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Ange ett icke-tomt användarnamn"
-
-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 ""
@@ -7434,15 +7380,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr "URL: "
@@ -7462,6 +7399,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr "Aktivera"
+
+msgid "Activate the selected layer"
+msgstr "Aktivera det valda lagret"
+
+msgid "Activate layer"
+msgstr "Aktivera lager"
+
+msgid "Delete the selected layers."
+msgstr "Radera de valda lagren."
+
+msgid "Duplicate this layer"
+msgstr "Duplicera det här lagret"
+
+msgid "Copy of {0}"
+msgstr "Kopia av {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Kopia {1} av {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Justera genomskinlighet på lagret."
+
+msgid "Opacity"
+msgstr "Genomskinlighet"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Sammanfoga detta lager med ett annat"
+
+msgid "Move the selected layer one row down."
+msgstr "Flytta det valda lagret en rad ner."
+
+msgid "Move the selected layer one row up."
+msgstr "Flytta det valda lagret en rad upp."
+
+msgid "Show/hide"
+msgstr "Visa/dölj"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Alternera visning av det valda lagret."
+
+msgid "Show/hide layer"
+msgstr "Visa/dölj lager"
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7777,13 +7783,13 @@ msgstr "Föräldra-relationer"
msgid "Child Relations"
msgstr "Barn-relationer"
-msgid "Apply Role:"
-msgstr "Applicera Roll:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
"Ange en roll och applicera den på den valda relationsmedlemmen/medlemmarna"
+msgid "Apply Role:"
+msgstr "Applicera Roll:"
+
msgid "New Relation"
msgstr "Ny Relation"
@@ -9504,9 +9510,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "FEL"
-
msgid "Next marker"
msgstr "Nästa markör"
@@ -10341,12 +10344,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr "Ange ditt OSM-användarnamn"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "Användarnamn kan inte vara tomt. Ange ditt OSM-användarnamn"
-
msgid "Please enter your OSM password"
msgstr "Ange ditt OSM-lösenord"
@@ -12407,6 +12404,12 @@ msgstr "Anslutningsinställningar"
msgid "Connection Settings for the OSM server."
msgstr "Anslutningsinställningar för OSM-servern"
+msgid "Please enter your OSM user name"
+msgstr "Ange ditt OSM-användarnamn"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "Användarnamn kan inte vara tomt. Ange ditt OSM-användarnamn"
+
msgid "Action"
msgstr "Åtgärd"
@@ -12925,6 +12928,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -14164,107 +14175,48 @@ msgstr ""
msgid "Download plugin list..."
msgstr "Hämtar lista över insticksmoduler..."
-msgid "Downloading plugin list from ''{0}''"
-msgstr "Hämtar lista över insticksmoduler från ''{0}''"
-
-msgid "Unsuccessful HTTP request"
-msgstr ""
-
-msgid "Plugin list download error"
-msgstr ""
-
-msgid "JOSM failed to download plugin list:"
-msgstr ""
-
-msgid "Details:"
-msgstr "Detaljer:"
-
-msgid ""
-"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
-"plugin site ''{1}''."
-msgstr ""
-
-msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
-
-msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
-
-msgid ""
-"Failed to parse plugin list document from site ''{0}''. Skipping site. "
-"Exception was: {1}"
-msgstr ""
-
-msgid "Processing plugin list from site ''{0}''"
-msgstr ""
-
-msgid "This is after the end of the recording"
-msgstr "Detta är slutet av inspelningen"
-
-msgid "unspecified reason"
-msgstr "ospecificerad anledning"
-
-msgid "Error playing sound"
-msgstr "Fel vid uppspelning av ljud"
-
-msgid "Do nothing"
-msgstr "Gör ingenting"
-
-msgid "Report Bug"
-msgstr "Rapportera en bugg"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
+msgid "Downloading plugin list from ''{0}''"
+msgstr "Hämtar lista över insticksmoduler från ''{0}''"
+
+msgid "Unsuccessful HTTP request"
msgstr ""
-"Ett oväntat fel inträffade.<br> Detta beror alltid på programkodsfel. Om du "
-"använder<br> den senaste versionen av JOSM, överväg att vara snäll och "
-"skicka in en buggrapport."
-msgid "Update JOSM"
+msgid "Plugin list download error"
msgstr ""
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
+msgid "JOSM failed to download plugin list:"
msgstr ""
-msgid "Unexpected Exception"
-msgstr "Oväntat undantag"
+msgid "Details:"
+msgstr "Detaljer:"
-msgid "Suppress further error dialogs for this session."
+msgid ""
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
+msgid "Writing plugin list to local cache ''{0}''"
msgstr ""
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
+msgid "Parsing plugin list from site ''{0}''"
msgstr ""
msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
msgstr ""
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
+msgid "Processing plugin list from site ''{0}''"
msgstr ""
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Texten finns redan i urklipp.)"
+msgid "This is after the end of the recording"
+msgstr "Detta är slutet av inspelningen"
-msgid "You have encountered a bug in JOSM"
-msgstr "Du har stött på en bugg i JOSM"
+msgid "unspecified reason"
+msgstr "ospecificerad anledning"
+
+msgid "Error playing sound"
+msgstr "Fel vid uppspelning av ljud"
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
@@ -14569,9 +14521,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
"Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}."
@@ -14763,6 +14712,69 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Gör ingenting"
+
+msgid "Report Bug"
+msgstr "Rapportera en bugg"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Ett oväntat fel inträffade.<br> Detta beror alltid på programkodsfel. Om du "
+"använder<br> den senaste versionen av JOSM, överväg att vara snäll och "
+"skicka in en buggrapport."
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Oväntat undantag"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Du har stött på en bugg i JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Texten finns redan i urklipp.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15101,13 +15113,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -15116,7 +15128,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -15128,15 +15146,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -15233,6 +15248,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -15257,13 +15275,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -15410,10 +15428,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -15466,29 +15484,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15536,6 +15553,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15596,6 +15616,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15632,10 +15655,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15737,6 +15757,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15746,6 +15769,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16403,6 +16429,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17770,6 +17801,12 @@ msgstr "Vägar"
msgid "Motorway"
msgstr "Motorväg"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -18358,9 +18395,6 @@ msgstr "Motorvägskorsning"
msgid "Number"
msgstr "Nummer"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Tjänster"
@@ -18839,6 +18873,15 @@ msgstr "marskland"
msgid "mangrove"
msgstr "mangroveträsk"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Lera"
@@ -19989,6 +20032,9 @@ msgstr "Eldningsplats"
msgid "Fishing"
msgstr "Fiske"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Nattklubb"
@@ -21257,6 +21303,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Våningsplan"
@@ -22844,8 +22894,8 @@ msgstr "hundpåsar"
msgid "food"
msgstr "mat"
-msgid "news_papers"
-msgstr "tidningar"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parkeringsbiljetter"
@@ -22859,8 +22909,8 @@ msgstr ""
msgid "public_transport_tickets"
msgstr "biljetter för allmänna transportmedel"
-msgid "SIM-cards"
-msgstr "SIM-kort"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "frimärken"
@@ -24121,6 +24171,21 @@ msgstr "naturfenomen"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -24145,9 +24210,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -24307,7 +24369,13 @@ msgstr "Camping"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -24391,6 +24459,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -24489,6 +24562,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -24498,6 +24574,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "förkortat gatunamn"
@@ -27617,6 +27701,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29960,6 +30104,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "Ogiltigt val"
+
msgid "Public transport routes"
msgstr ""
@@ -30747,9 +30900,6 @@ msgstr "Gör radhus av husrad"
msgid "Creates individual buildings from a long building."
msgstr "Skapar enskilda byggnader från en lång byggnad."
-msgid "Invalid selection"
-msgstr "Ogiltigt val"
-
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 "
@@ -32497,6 +32647,3 @@ msgstr "Ut och kör"
msgid "Drive a race car on this layer"
msgstr "Kör en racerbil i detta lager"
-
-#~ msgid "xml"
-#~ msgstr "xml"
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 8e96029..83de840 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:05+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:04+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -150,9 +150,6 @@ msgstr "ஜாவா பதிப்பு {0}"
msgid "Homepage"
msgstr "முகப்புபக்கம்"
-msgid "Bug Reports"
-msgstr "பிழை அறிவிப்புகள்"
-
msgid "Info"
msgstr "விவரம்"
@@ -174,6 +171,12 @@ msgstr "செருகல்கள்"
msgid "About JOSM..."
msgstr "JOSM பற்றி"
+msgid "OK"
+msgstr "சரி"
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -585,9 +588,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr "சரி"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1190,9 +1190,6 @@ msgstr "கோப்பின் பெயரையும் மாற்றவ
msgid "Could not rename file ''{0}''"
msgstr "\"{0}\" ஆம் கோப்பின் பெயரை மாற்ற முடியவில்லை"
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1814,6 +1811,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1963,9 +1984,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2281,8 +2299,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3063,9 +3081,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3085,27 +3100,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "உறவு"
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr "தேர்ந்தெடுக்கப்பட்ட மாற்றங்களை செயல்படுத்து"
@@ -4163,6 +4157,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4808,19 +4805,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5793,6 +5790,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr "உறவு"
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6280,51 +6301,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr "இந்த அடுக்கையை நகலாக்கு"
-
-msgid "Copy of {0}"
-msgstr "{0} வின் நகல்"
-
-msgid "Copy {1} of {0}"
-msgstr "{0} வில் {1} ஆம் நகல்"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6347,12 +6323,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6775,15 +6745,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6889,9 +6850,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7043,14 +7001,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7136,15 +7086,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7162,6 +7103,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr "இந்த அடுக்கையை நகலாக்கு"
+
+msgid "Copy of {0}"
+msgstr "{0} வின் நகல்"
+
+msgid "Copy {1} of {0}"
+msgstr "{0} வில் {1} ஆம் நகல்"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7477,10 +7487,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9136,9 +9146,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9943,12 +9950,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11956,6 +11957,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12466,6 +12473,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13707,62 +13722,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14014,9 +13973,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14201,6 +14157,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14535,13 +14551,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14550,7 +14566,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14562,15 +14584,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14667,6 +14686,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14691,13 +14713,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14844,10 +14866,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14900,29 +14922,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14970,6 +14991,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15030,6 +15054,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15066,10 +15093,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15171,6 +15195,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15180,6 +15207,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15835,6 +15865,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17192,6 +17227,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17768,9 +17809,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18249,6 +18287,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19397,6 +19444,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20665,6 +20715,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22252,8 +22306,8 @@ msgstr ""
msgid "food"
msgstr "உணவு"
-msgid "news_papers"
-msgstr "செய்தித்தாள்கள்"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr ""
@@ -22267,8 +22321,8 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
-msgstr "சிம்க்கார்டுகள்"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "தபால்த்தலைகள்"
@@ -23522,6 +23576,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23546,9 +23615,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23708,7 +23774,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23792,6 +23864,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23890,6 +23967,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23899,6 +23979,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26998,6 +27086,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29325,6 +29473,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30109,9 +30266,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/te.po b/i18n/po/te.po
index c0f5471..0630ec9 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:06+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:04+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr "బగ్ నివేదికలు"
-
msgid "Info"
msgstr "సమాచారం"
@@ -172,6 +169,12 @@ msgstr "ప్లగిన్లు"
msgid "About JOSM..."
msgstr "JOSM గురించి..."
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 55ce07f..128c50e 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:06+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:05+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index ac52980..b336808 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2015-11-16 12:04+0000\n"
"Last-Translator: Erkin Alp Güney <Unknown>\n"
"Language-Team: Türkçe <>\n"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:07+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:05+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -152,9 +152,6 @@ msgstr "Java Sürümü {0}"
msgid "Homepage"
msgstr "Anasayfa"
-msgid "Bug Reports"
-msgstr "Hata raporları"
-
msgid "Info"
msgstr "Bilgi"
@@ -176,6 +173,12 @@ msgstr "Eklentiler"
msgid "About JOSM..."
msgstr "JOSM Hakkında..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Hata Raporla"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -588,9 +591,6 @@ msgstr "Bu görüntü katmanın konumunu düzelt"
msgid "Adjust imagery offset"
msgstr "Referans görüntü katmanı ofsetini ayarla"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1199,9 +1199,6 @@ msgstr "Dosyayıda yeniden isimlendir"
msgid "Could not rename file ''{0}''"
msgstr "''{0}'' dosyası yeniden adlandırılamadı"
-msgid "Report bug"
-msgstr "Hata Raporla"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1822,6 +1819,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Yavaş İleri Götür"
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr "İndirme sırasında hatalarla karşılaşıldı"
+
msgid "Download GPS"
msgstr ""
@@ -1970,9 +1991,6 @@ msgstr "Silindi veya taşındı nesneler"
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr "İndirme sırasında hatalarla karşılaşıldı"
-
msgid "Error during download"
msgstr "İndirirken hata oluştu"
@@ -2295,8 +2313,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3081,9 +3099,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr "Uygula?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3103,27 +3118,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "İlişki"
-
-msgid "Old role"
-msgstr "Eski Rol"
-
-msgid "New role"
-msgstr "Yeni Rol"
-
-msgid "Old key"
-msgstr "Eski Anahtar"
-
-msgid "Old value"
-msgstr "Eski Değer"
-
-msgid "New key"
-msgstr "Yeni Anahtar"
-
-msgid "New value"
-msgstr "Yeni Değer"
-
msgid "Apply selected changes"
msgstr "Seçili değişiklikleri uygula"
@@ -4184,6 +4178,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4838,6 +4835,12 @@ msgstr ""
msgid "Initializing"
msgstr "Ayarlar Okunuyor"
+msgid "Setting defaults"
+msgstr "Varsayılan ayarlar alınıyor"
+
+msgid "Creating main GUI"
+msgstr "Arayüz Oluşturuluyor."
+
msgid "Updating plugins"
msgstr ""
@@ -4847,12 +4850,6 @@ msgstr ""
msgid "Loading early plugins"
msgstr "Eski eklentiler yükleniyor"
-msgid "Setting defaults"
-msgstr "Varsayılan ayarlar alınıyor"
-
-msgid "Creating main GUI"
-msgstr "Arayüz Oluşturuluyor."
-
msgid "Loading plugins"
msgstr "Eklentiler yükleniyor"
@@ -5821,6 +5818,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr "Uygula?"
+
+msgid "Relation"
+msgstr "İlişki"
+
+msgid "Old role"
+msgstr "Eski Rol"
+
+msgid "New role"
+msgstr "Yeni Rol"
+
+msgid "Old key"
+msgstr "Eski Anahtar"
+
+msgid "Old value"
+msgstr "Eski Değer"
+
+msgid "New key"
+msgstr "Yeni Anahtar"
+
+msgid "New value"
+msgstr "Yeni Değer"
+
msgid "For selected objects only"
msgstr ""
@@ -6308,51 +6329,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "Yüklenmiş katmanların listesini aç"
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Seçili tabakanın görünen kısmını sabitle."
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr "{0} katmanın kopyası"
-
-msgid "Copy {1} of {0}"
-msgstr "{0} katmanın {1} kopyası"
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6375,12 +6351,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Seçili tabakayı bir satır yukarı taşı."
-
-msgid "Move the selected layer one row down."
-msgstr "Seçili tabakayı bir satır aşağı taşı."
-
msgid "Information about layer"
msgstr ""
@@ -6803,15 +6773,6 @@ msgstr "Kapanış Tarihi"
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6917,9 +6878,6 @@ msgstr ""
msgid "Date"
msgstr "Tarih"
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7071,14 +7029,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7163,15 +7113,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7189,6 +7130,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr "{0} katmanın kopyası"
+
+msgid "Copy {1} of {0}"
+msgstr "{0} katmanın {1} kopyası"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr "Seçili tabakayı bir satır aşağı taşı."
+
+msgid "Move the selected layer one row up."
+msgstr "Seçili tabakayı bir satır yukarı taşı."
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Seçili tabakanın görünen kısmını sabitle."
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7504,10 +7514,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9165,9 +9175,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9988,12 +9995,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -12008,6 +12009,12 @@ msgstr "Bağlantı Ayarları"
msgid "Connection Settings for the OSM server."
msgstr "OSM server bağlantı ayarları."
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr "Aksiyon"
@@ -12519,6 +12526,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13769,62 +13784,6 @@ msgstr ""
msgid "Error playing sound"
msgstr "Sesin çalıştırılmasında hata"
-msgid "Do nothing"
-msgstr "Birşey Yapma"
-
-msgid "Report Bug"
-msgstr "hatayı Bildir"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "Beklenmedik Durum"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Metin zaten panoda mevcut.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14076,9 +14035,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14263,6 +14219,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr "Birşey Yapma"
+
+msgid "Report Bug"
+msgstr "hatayı Bildir"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "Beklenmedik Durum"
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Metin zaten panoda mevcut.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14601,13 +14617,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14616,7 +14632,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14628,15 +14650,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14733,6 +14752,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14757,13 +14779,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14910,10 +14932,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14966,29 +14988,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15036,6 +15057,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15096,6 +15120,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15132,10 +15159,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15237,6 +15261,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15246,6 +15273,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15901,6 +15931,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17258,6 +17293,12 @@ msgstr "Sokaklar"
msgid "Motorway"
msgstr "Araçyolu"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17834,9 +17875,6 @@ msgstr "Otoyol Kavşağı"
msgid "Number"
msgstr "Numara"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "Servis"
@@ -18315,6 +18353,15 @@ msgstr "gelgit alanı"
msgid "mangrove"
msgstr "bataklık ormanı"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Çamur"
@@ -19463,6 +19510,9 @@ msgstr ""
msgid "Fishing"
msgstr "Balıkçılık"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20731,6 +20781,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22318,8 +22372,8 @@ msgstr "dışkı_poşeti"
msgid "food"
msgstr "yiyecek"
-msgid "news_papers"
-msgstr "gazeteler"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "Park_bileti"
@@ -22333,8 +22387,8 @@ msgstr "toplu_taşıma_hatları"
msgid "public_transport_tickets"
msgstr "toplu_taşıma_bileti"
-msgid "SIM-cards"
-msgstr "SIM-kart"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "pullar"
@@ -23588,6 +23642,21 @@ msgstr "doğal"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23612,9 +23681,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23774,7 +23840,13 @@ msgstr "Kampyeri"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23858,6 +23930,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23956,6 +24033,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23965,6 +24045,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27066,6 +27154,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29399,6 +29547,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30183,9 +30340,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 85b62e3..8e8fe3e 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:07+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:06+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -172,6 +169,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index dbe9c3d..3fc1c4d 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: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-03-11 09:59+0000\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-27 09:38+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: 2016-03-13 05:08+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:06+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -155,9 +155,6 @@ msgstr "Версія Java {0}"
msgid "Homepage"
msgstr "Домівка"
-msgid "Bug Reports"
-msgstr "Звітувати про помилки"
-
msgid "Info"
msgstr "Відомості"
@@ -179,6 +176,12 @@ msgstr "Втулки"
msgid "About JOSM..."
msgstr "Про JOSM…"
+msgid "OK"
+msgstr "Так"
+
+msgid "Report bug"
+msgstr "Звіт про збій програми"
+
msgid "Failed to locate resource ''{0}''."
msgstr "Не вдалося знайти ресурс ''{0}''"
@@ -610,9 +613,6 @@ msgstr "Підлаштуйте положення шару з фоновим з
msgid "Adjust imagery offset"
msgstr "Налаштування положення фону"
-msgid "OK"
-msgstr "Так"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1287,9 +1287,6 @@ msgstr "Також змінити назву файлу"
msgid "Could not rename file ''{0}''"
msgstr "Неможливо перейменувати файл \"{0}\""
-msgid "Report bug"
-msgstr "Звіт про збій програми"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Надіслати повідомлення до системи відстежування помилок JOSM"
@@ -1956,6 +1953,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Відтворювати повільніше."
+msgid "Downloading changeset content"
+msgstr "Завантаження з сервера вмісту набору змін"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Завантаження набору змін {2}…"
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Завантаження вмісту набору змін {2}…"
+
+msgid "Download changesets"
+msgstr "Завантажити з сервера набори змін"
+
+msgid "Querying and downloading changesets"
+msgstr "Отримання та завантаження наборів змін"
+
+msgid "Determine user id for current user..."
+msgstr "Визначення ідентифікатора для поточного користувача…"
+
+msgid "Query and download changesets ..."
+msgstr "Отримати та завантажити набір змін…"
+
+msgid "Errors during download"
+msgstr "Помилки під час отримання даних з сервера"
+
msgid "Download GPS"
msgstr "Завантажити GPS"
@@ -2126,9 +2147,6 @@ msgstr "Вилучені та переміщені об’єкти"
msgid "The following errors occurred during mass download: {0}"
msgstr "Під час масового завантаження виникли наступні помилки: {0}"
-msgid "Errors during download"
-msgstr "Помилки під час отримання даних з сервера"
-
msgid "Error during download"
msgstr "Помилка під час завантаження з сервера"
@@ -2487,11 +2505,11 @@ msgid "Add selection to relation"
msgstr "Додати виділення до зв’язку"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
-"<html><strong>Додати виділення до звʼязку</strong>: перевірте кожен звʼязок, "
-"щоб уникнути пошкоджень!"
+"{0}Додавання виділеного до звʼязку{1}: Перевірте кожен звʼязок, щоб уникнути "
+"пошкоджень!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -3347,9 +3365,6 @@ msgstr "Розв’язати конфлікт у переліку точок л
msgid "Main dataset does not include node {0}"
msgstr "Основний набір даних не містить точку {0}"
-msgid "Apply?"
-msgstr "Застосувати?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3382,27 +3397,6 @@ msgstr ""
"Під час зміни напрямку лінії, наступні зміни пропонуються для підтримання "
"цілісності даних."
-msgid "Relation"
-msgstr "Зв’язок"
-
-msgid "Old role"
-msgstr "Стара роль"
-
-msgid "New role"
-msgstr "Нова роль"
-
-msgid "Old key"
-msgstr "Старий ключ"
-
-msgid "Old value"
-msgstr "Старе значення"
-
-msgid "New key"
-msgstr "Новий ключ"
-
-msgid "New value"
-msgstr "Нове значення"
-
msgid "Apply selected changes"
msgstr "Застосувати позначені зміни"
@@ -4547,6 +4541,9 @@ msgstr "Звʼязок маршруту містить роль ''{0}''"
msgid "Route relation contains a gap"
msgstr "Зв''язок маршруту має розриви"
+msgid "Stop position not part of route"
+msgstr "Місце зупинки не входить до складу маршруту"
+
msgid "Role verification problem"
msgstr "Проблеми перевірки ролі"
@@ -5226,6 +5223,12 @@ msgstr "Ввімкнути докладний рівень відлагодже
msgid "Initializing"
msgstr "Ініціалізація"
+msgid "Setting defaults"
+msgstr "Типові налаштування"
+
+msgid "Creating main GUI"
+msgstr "Створення головного вікна"
+
msgid "Updating plugins"
msgstr "Оновлення втулків"
@@ -5235,12 +5238,6 @@ msgstr "Встановлення оновлених втулків"
msgid "Loading early plugins"
msgstr "Завантаження ранніх втулків"
-msgid "Setting defaults"
-msgstr "Типові налаштування"
-
-msgid "Creating main GUI"
-msgstr "Створення головного вікна"
-
msgid "Loading plugins"
msgstr "Завантаження втулків"
@@ -6328,6 +6325,30 @@ msgstr "Показати тільки теґи з конфліктами"
msgid "Show tags with multiple values only"
msgstr "Показати тільки теґи з кількома значеннями"
+msgid "Apply?"
+msgstr "Застосувати?"
+
+msgid "Relation"
+msgstr "Зв’язок"
+
+msgid "Old role"
+msgstr "Стара роль"
+
+msgid "New role"
+msgstr "Нова роль"
+
+msgid "Old key"
+msgstr "Старий ключ"
+
+msgid "Old value"
+msgstr "Старе значення"
+
+msgid "New key"
+msgstr "Новий ключ"
+
+msgid "New value"
+msgstr "Нове значення"
+
msgid "For selected objects only"
msgstr "Тільки для виділених об’єктів"
@@ -6862,51 +6883,6 @@ msgstr "Показати/сховати шар: {0}"
msgid "Open a list of all loaded layers."
msgstr "Відкрити список всіх завантажених шарів."
-msgid "Delete the selected layers."
-msgstr "Вилучити вибрані шари."
-
-msgid "Show/hide"
-msgstr "Показати/приховати"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Показати/приховати виділений шар."
-
-msgid "Show/hide layer"
-msgstr "Показати/сховати шар"
-
-msgid "Opacity"
-msgstr "Непрозорість"
-
-msgid "Adjust opacity of the layer."
-msgstr "Налаштування рівня непрозрості шару."
-
-msgid "Gamma"
-msgstr "Контрастність"
-
-msgid "Adjust gamma value of the layer."
-msgstr "Підлаштовує коефіцієнт контрастності шару"
-
-msgid "Activate"
-msgstr "Активувати"
-
-msgid "Activate the selected layer"
-msgstr "Активувати вибраний шар"
-
-msgid "Activate layer"
-msgstr "Активувати шар"
-
-msgid "Merge this layer into another layer"
-msgstr "Об’єднати цей шар з іншим шаром"
-
-msgid "Duplicate this layer"
-msgstr "Дублювати шар"
-
-msgid "Copy of {0}"
-msgstr "Копія {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Копія {1} з {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "шар є видимим (клацніть, щоб його сховати)"
@@ -6931,12 +6907,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr "цей шар немає інформації про роздільну здатність"
-msgid "Move the selected layer one row up."
-msgstr "Перемістити вибраний шар на один рядок вгору."
-
-msgid "Move the selected layer one row down."
-msgstr "Перемістити вибраний шар на один рядок вниз."
-
msgid "Information about layer"
msgstr "Інформація про шар"
@@ -6944,7 +6914,7 @@ msgid "Map paint preferences"
msgstr "Налаштування кольорів мапи"
msgid "Map Paint Styles"
-msgstr "Стиль кольорів мапи"
+msgstr "Стилі кольорів мапи"
msgid "configure the map painting style"
msgstr "налаштування стилю мапи"
@@ -7373,15 +7343,6 @@ msgstr "Закрито"
msgid "Discussions"
msgstr "Обговорення"
-msgid "Downloading changeset content"
-msgstr "Завантаження з сервера вмісту набору змін"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Завантаження набору змін {2}…"
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Завантаження вмісту набору змін {2}…"
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7500,9 +7461,6 @@ msgstr "Оновити обговорення набору змін з серв
msgid "Date"
msgstr "Дата"
-msgid "Download changesets"
-msgstr "Завантажити з сервера набори змін"
-
msgid "{0} [incomplete]"
msgstr "{0} [неповний]"
@@ -7675,16 +7633,6 @@ msgid "Please enter an integer value > 0"
msgstr "Будь ласка, введіть ціле число > 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<html>Поточне значення не є правильним ідентифікатором учасника.<br>Будь "
-"ласка, введіть непорожнє ім’я учасника.</html>"
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7786,15 +7734,6 @@ msgstr "Недійсний URL запиту для отримання набор
msgid "Close the dialog and abort querying of changesets"
msgstr "Закрити діалог і припинити запит на отримання наборів змін"
-msgid "Querying and downloading changesets"
-msgstr "Отримання та завантаження наборів змін"
-
-msgid "Determine user id for current user..."
-msgstr "Визначення ідентифікатора для поточного користувача…"
-
-msgid "Query and download changesets ..."
-msgstr "Отримати та завантажити набір змін…"
-
msgid "URL: "
msgstr "URL: "
@@ -7815,6 +7754,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Недійсний URL запиту отримання набору змін"
+msgid "Activate"
+msgstr "Активувати"
+
+msgid "Activate the selected layer"
+msgstr "Активувати вибраний шар"
+
+msgid "Activate layer"
+msgstr "Активувати шар"
+
+msgid "Delete the selected layers."
+msgstr "Вилучити вибрані шари."
+
+msgid "Duplicate this layer"
+msgstr "Дублювати шар"
+
+msgid "Copy of {0}"
+msgstr "Копія {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Копія {1} з {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr "Змінити видимість виділеного шару"
+
+msgid "Show layer"
+msgstr "Показати шар"
+
+msgid "Adjust opacity of the layer."
+msgstr "Налаштування рівня непрозрості шару."
+
+msgid "Opacity"
+msgstr "Непрозорість"
+
+msgid "Adjust gamma value of the layer."
+msgstr "Підлаштовує коефіцієнт контрастності шару"
+
+msgid "Gamma"
+msgstr "Контрастність"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr "Регулювання різкості/розмиття шару."
+
+msgid "Sharpness"
+msgstr "Різкість"
+
+msgid "Adjust colorfulness of the layer."
+msgstr "Регулювання барвистосі шару"
+
+msgid "Colorfulness"
+msgstr "Барвистисть"
+
+msgid "Merge this layer into another layer"
+msgstr "Об’єднати цей шар з іншим шаром"
+
+msgid "Move the selected layer one row down."
+msgstr "Перемістити вибраний шар на один рядок вниз."
+
+msgid "Move the selected layer one row up."
+msgstr "Перемістити вибраний шар на один рядок вгору."
+
+msgid "Show/hide"
+msgstr "Показати/приховати"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Показати/приховати виділений шар."
+
+msgid "Show/hide layer"
+msgstr "Показати/сховати шар"
+
msgid "Discardable key: selection Foreground"
msgstr "Застарілий теґ: виділення Foreground"
@@ -8145,12 +8153,12 @@ msgstr "Батьківські зв’язки"
msgid "Child Relations"
msgstr "Підпорядковані зв’язки"
-msgid "Apply Role:"
-msgstr "Застосувати роль:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "Ввести роль та застосувати її до виділених членів зв’язку"
+msgid "Apply Role:"
+msgstr "Застосувати роль:"
+
msgid "New Relation"
msgstr "Новий зв’язок"
@@ -10062,9 +10070,6 @@ msgstr "Прозорість зображення"
msgid "Unsupported imagery type: {0}"
msgstr "Непідтримуваний тип фонового зображення: {0}"
-msgid "ERROR"
-msgstr "ПОМИЛКА"
-
msgid "Next marker"
msgstr "Наступна мітка"
@@ -10792,6 +10797,9 @@ msgid ""
"JOSM does no longer support mappaint styles written in the old XML format.\n"
"Please update ''{0}'' to MapCSS"
msgstr ""
+"JOSM більше не підтримує стилі розфарбовування мапи, стоврені в старому "
+"форматі XML.\n"
+"Оновіть ''{0}'' на MapCSS"
msgid "loading style ''{0}''..."
msgstr "завантаження стилю ''{0}''…"
@@ -10963,14 +10971,6 @@ msgstr "Запустити процедуру автоматичної авто
msgid "Test Access Token"
msgstr "Перевірити мітку доступу"
-msgid "Please enter your OSM user name"
-msgstr "Будь ласка, введіть ваше ім’я користувача в OSM"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Ім’я користувача не може бути порожнім. Будь ласка, введіть Ваше ім’я "
-"користувача в OSM"
-
msgid "Please enter your OSM password"
msgstr "Будь ласка, введіть Ваш пароль OSM"
@@ -13193,6 +13193,14 @@ msgstr "Параметри з’єднання"
msgid "Connection Settings for the OSM server."
msgstr "Параметри з’єднання з сервером OSM."
+msgid "Please enter your OSM user name"
+msgstr "Будь ласка, введіть ваше ім’я користувача в OSM"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Ім’я користувача не може бути порожнім. Будь ласка, введіть Ваше ім’я "
+"користувача в OSM"
+
msgid "Action"
msgstr "Дія"
@@ -13755,6 +13763,16 @@ msgstr ""
"Неприпустиме значення ''{2}'' атрибуту ''{0}'' елемента ''{1}'' у "
"можливостях сервера."
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+"Помилка додавання сертифікату {0} – невідповідність відбитків сертифіката. "
+"Очікувалось {1}, замість {2}"
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr "Додавання сертфіката для TLS-зʼєднань: {0}"
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Сервер повідомив про невдалий розбір дати ''{0}''."
@@ -15154,77 +15172,6 @@ msgstr "невизначена причина"
msgid "Error playing sound"
msgstr "Помилка відтворення звуку"
-msgid "Do nothing"
-msgstr "Нічого не робити"
-
-msgid "Report Bug"
-msgstr "Повідомити про помилку"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Виникла несподівана помилка.<br>Вона завжди є помилкою в програмуванні. Якщо "
-"ви запускаєте останню<br>версію JOSM, будь ласка, надішліть звіт про помилку."
-
-msgid "Update JOSM"
-msgstr "Оновити JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Сталась непередбачувана помилка. Такі помилки завжди виникають під час "
-"помилок в програмуванні.<br><br>Однак, ви використовуєте стару версію JOSM "
-"({0}),<br>замість поточної протестованої версії (<b>{1}</b>).<br><br><b>Будь "
-"ласка, оновіть JOSM</b>, перед тим як надсилати розробникам звіт про помилку."
-
-msgid "Unexpected Exception"
-msgstr "Непередбачена помилка"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Не показувати наступні повідомлення про помилки для цього сеансу."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Ви виявили помилку в JOSM. Перш ніж подати повідомлення про помилку, "
-"переконайтеся, що у вас здійснено оновлення до останньої версії JOSM тут:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Ви повинні також оновити втулки. Якщо жодна з цих порад не допомогла, будь "
-"ласка, повідомте про помилку на баг-трекері, використовуючи це посилання:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Представлена нижче інформація про помилку вже підготовлена для вас. Будь "
-"ласка, додайте інформацію про те, як відтворити помилку і спробуйте описати "
-"це настільки детально, наскільки це можливо."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Або ж, якщо це не спрацює, ви можете вручну заповнити інформацію нижче за "
-"цим URL:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Текст вже скопійовано у буфер обміну)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Ви зіткнулися з помилкою в JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15627,9 +15574,6 @@ msgstr "Завантаження перенаправлено на ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Виявлено забагато переадресувань на URL завантаження. Припинення."
-msgid "Fetching content..."
-msgstr "Отримання вмісту…"
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Не вдається знайти переклад мовою «{0}». Повертаємось до {1}."
@@ -15847,6 +15791,83 @@ msgstr "Ігнорування спотвореної геометрії: {0}"
msgid "Failed to load XML schema."
msgstr "Помилка завантаження XML схеми"
+msgid "Do nothing"
+msgstr "Нічого не робити"
+
+msgid "Report Bug"
+msgstr "Повідомити про помилку"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Виникла несподівана помилка.<br>Вона завжди є помилкою в програмуванні. Якщо "
+"ви запускаєте останню<br>версію JOSM, будь ласка, надішліть звіт про помилку."
+
+msgid "Update JOSM"
+msgstr "Оновити JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Сталась непередбачувана помилка. Такі помилки завжди виникають під час "
+"помилок в програмуванні.<br><br>Однак, ви використовуєте стару версію JOSM "
+"({0}),<br>замість поточної протестованої версії (<b>{1}</b>).<br><br><b>Будь "
+"ласка, оновіть JOSM</b>, перед тим як надсилати розробникам звіт про помилку."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Не показувати наступні повідомлення про помилки для цього сеансу."
+
+msgid "Unexpected Exception"
+msgstr "Непередбачена помилка"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Ви зіткнулися з помилкою в JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Ви виявили помилку в JOSM. Перш ніж подати повідомлення про помилку, "
+"переконайтеся, що у вас здійснено оновлення до останньої версії JOSM тут:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Ви повинні також оновити втулки. Якщо жодна з цих порад не допомогла, будь "
+"ласка, повідомте про помилку на баг-трекері, використовуючи це посилання:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Представлена нижче інформація про помилку вже підготовлена для вас. Будь "
+"ласка, додайте інформацію про те, як відтворити помилку і спробуйте описати "
+"це настільки детально, наскільки це можливо."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Або ж, якщо це не спрацює, ви можете вручну заповнити інформацію нижче за "
+"цим URL:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Текст вже скопійовано у буфер обміну)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+"Збій створення повідомлення про помилку. Будь ласка, створіть повідомлення "
+"самі на цьому сайті:"
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -16196,14 +16217,14 @@ msgstr "Супутникові знімки Mapbox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "GPS-треки OpenStreetMap"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (Стандартний шар)"
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr "OpenStreetMap Carto (Стандартний шар)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Мапнік Ч&Б)"
@@ -16211,8 +16232,14 @@ msgstr "OpenStreetMap (Мапнік Ч&Б)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Мапнік, без підписів)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr "OpenStreetMap (французький стиль)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (німецький стиль)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "GPS-треки OpenStreetMap"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -16223,15 +16250,12 @@ msgstr "Громадський транспорт (ÖPNV)"
msgid "Hike & Bike"
msgstr "Піший та велотуризм"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (німецький стиль)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Камбоджа, Лаос, Таїланд, В’єтнам 2-мовна"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (шар)"
@@ -16328,6 +16352,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at ортофото"
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Грац: Базова мапа"
@@ -16352,14 +16379,14 @@ msgstr "VoGIS: Повнокольорове зображення 2012 (12см)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr "VoGIS: Кольорова мапа Зима 2015 (20см)"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr "VoGIS: повнокольорове зображення 2015 (10 см)"
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Плани"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (Модель ґрунтів)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (Модель поверхні)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr "VoGIS: висоти і рельєф місцевості"
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr "AGIV(laanderen) - аерофото (разом з Брюсселем)"
@@ -16505,11 +16532,11 @@ msgstr "Géolittoral V2 - Ортофото 2011-2014"
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
-msgstr "Ліон – Ортофото 2012 10 см"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
+msgstr "Ліон - ортофото 2012-03 10 см - EPSG:3946"
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
-msgstr "Ліон – Ортофото 2012 16 см - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
+msgstr "Ліон - ортофото 2015-05 8 см - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr "Атлантична Луара - Ортофото 2012 - 20 см"
@@ -16561,6 +16588,15 @@ msgstr "Баварія (80 см)"
msgid "Bavaria (2 m)"
msgstr "Баварія (2 м)"
+msgid "Berlin aerial photograph 2011"
+msgstr "Берлін - аерофото 2011"
+
+msgid "Berlin aerial photograph 2014"
+msgstr "Берлін - аерофото 2014"
+
+msgid "Berlin aerial photograph 2015"
+msgstr "Берлін - аерофото 2015"
+
msgid "Stuttgart (aerial imagery)"
msgstr "Штутгарт (аерофото)"
@@ -16576,18 +16612,6 @@ msgstr "Стара мапа Цвенкау - TK25 Messtischblatt (4739; 1906; PR
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Стара мапа Пегау - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr "Physical DE - фізична мапа (природні зони)"
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr "Physical DE: Гарц - фізична мапа (природні зони)"
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-"Physical DE: Гарц - оверлей для Bing (напр., використовуйте прозорість від "
-"20% до 50%)"
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16633,6 +16657,9 @@ msgstr "Терекбалінт ортофото 2013"
msgid "5 cm resolution bald image"
msgstr "5 см нерозфарбоване зображення"
+msgid "Törökbálint ortophoto 2015"
+msgstr "Тьорьокбалінт - ортофото 2015"
+
msgid "Danube flood ortophoto 2013"
msgstr "Розлив Дунаю - ортофото 2013"
@@ -16694,6 +16721,9 @@ msgstr "OSMIE T.ie Землі по за графствами"
msgid "Lodi - Italy"
msgstr "Лоді - Італія"
+msgid "Lombardia - Italy (CTR)"
+msgstr "Ломбардія - Італія (CTR)"
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr "Ломбардія - Італія (CTR DBT)"
@@ -16730,11 +16760,8 @@ msgstr "Цикл 1 ортофотоплан - Латвія"
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Литва)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Люксембург Inspire Орто 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Люксембург Inspire Орто 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Люксембург Inspire Залізниця"
@@ -16835,6 +16862,9 @@ msgstr "Познанський повіт: будівлі"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Познанський повіт: Ортофотомапа (супутник)"
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr "Ропчицько-Сендзішовський повіт: Будинки"
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr "Ряшівський повіт: Будинки"
@@ -16844,6 +16874,9 @@ msgstr "Ряшівський повіт: Ортофотомапа"
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr "Стальововольський повіт: Будинки"
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr "Познань: ортофотомапа 2014 (аерофото)"
+
msgid "Przemyśl: Budynki (buildings)"
msgstr "Перемишль: Будинки"
@@ -17553,6 +17586,13 @@ msgstr ""
"Цей втулок спрощує додавання та редагування коридорів в середині будівель."
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+"Надає допомогу у створені мап приміщень всередині будівль в OSM. Містить "
+"валідатор та стиль для показу даних."
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18994,6 +19034,12 @@ msgstr "Дороги"
msgid "Motorway"
msgstr "Автомагістраль"
+msgid "Destination"
+msgstr "Пункт призначення"
+
+msgid "Destination reference"
+msgstr "Пункт призначення (номер)"
+
msgid "Placement"
msgstr "Розташування"
@@ -19589,9 +19635,6 @@ msgstr "Магістральна розв’язка"
msgid "Number"
msgstr "Номер"
-msgid "Exit to"
-msgstr "Виїзд/вихід на"
-
msgid "Services"
msgstr "Придорожні послуги"
@@ -20071,6 +20114,15 @@ msgstr "припливно-відливні ділянки"
msgid "mangrove"
msgstr "мангрові зарості"
+msgid "wet_meadow"
+msgstr "заболочені луки"
+
+msgid "string_bog"
+msgstr "аапа-болото"
+
+msgid "saltern"
+msgstr "солончаки"
+
msgid "Mud"
msgstr "Грязі"
@@ -21222,6 +21274,9 @@ msgstr "Місце для вогнища"
msgid "Fishing"
msgstr "Рибалка"
+msgid "Bird Hide"
+msgstr "Пункт спостереження за птахами"
+
msgid "Night Club"
msgstr "Нічний клуб"
@@ -22490,6 +22545,10 @@ msgid "transformer_tower"
msgstr "трасформаторна башта"
msgctxt "building"
+msgid "public"
+msgstr "суспільне"
+
+msgctxt "building"
msgid "Levels"
msgstr "Поверхи"
@@ -24079,7 +24138,7 @@ msgstr "пакети для екскрементів"
msgid "food"
msgstr "продукти харчування"
-msgid "news_papers"
+msgid "newspapers"
msgstr "газети"
msgid "parking_tickets"
@@ -24094,8 +24153,8 @@ msgstr "схеми громадського транспорту"
msgid "public_transport_tickets"
msgstr "квитки на громадський транспорт"
-msgid "SIM-cards"
-msgstr "SIM-карти"
+msgid "SIM_cards"
+msgstr "SIM-картки"
msgid "stamps"
msgstr "марки"
@@ -25374,6 +25433,21 @@ msgstr "довкілля"
msgid "Walking Route"
msgstr "Пішохідний маршрут"
+msgid "Riding Route"
+msgstr "Кінний маршрут"
+
+msgid "ihn"
+msgstr "міжнародна (ihn)"
+
+msgid "nhn"
+msgstr "національна (nhn)"
+
+msgid "rhn"
+msgstr "регіональна (rhn)"
+
+msgid "lhn"
+msgstr "місцева (lhn)"
+
msgid "Piste Route"
msgstr "Лижня"
@@ -25398,9 +25472,6 @@ msgstr "гірсколижний"
msgid "Detour Route"
msgstr "Маршрут об’їзду"
-msgid "Destination"
-msgstr "Пункт призначення"
-
msgid "Ref of the way this is a detour to"
msgstr "Номер/назва дороги, що оминається"
@@ -25560,8 +25631,14 @@ msgstr "Кемпінг"
msgid "Test"
msgstr "Перевірка"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Зменшення номерів будинків під час інтерполяції"
+msgid "Even housenumber in odd address interpolation."
+msgstr "Парний номер будинку в інтерполяції непарних адрес."
+
+msgid "Odd housenumber in even address interpolation."
+msgstr "Непарний номер будинку в інтерполяції парних адрес."
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr "Лінія з {0}. За можливості позначте адресу кожного будинку окремо."
msgid "{0} without {1}"
msgstr "{0} без {1}"
@@ -25651,6 +25728,13 @@ msgstr ""
"Неправильне використання теґу {0}. Вилучіть {1}, так як ясно, що назва "
"відсутня, навіть без додаткових теґів."
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+"{0} – не визначений. Замість цього використовуйте ключ fixme, в значені "
+"якого вкажіть інформацію про те, що потрібно виправити."
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr "{0} є застрілим. Використовуйте замість цього мультиполігон."
@@ -25760,6 +25844,9 @@ msgstr "{0} має бути приєднаним до лінії"
msgid "node connects waterway and bridge"
msgstr "точка є спільною для мосту та водного шляху"
+msgid "{0} node connected to a highway"
+msgstr "{0} точок приєднано до дороги"
+
msgid "suspicious roundabout direction"
msgstr "сумнівний напрям кругового руху"
@@ -25769,6 +25856,16 @@ msgstr "{0} на великій площі"
msgid "{0} on a small area"
msgstr "{0} на маленькій площі"
+msgid "Too large building"
+msgstr "Завелика будівля"
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+"Точка зʼєднує лінію електромереж або кабель з обʼєктом, який не повʼязаний є "
+"електроенергетикою."
+
msgid "abbreviated street name"
msgstr "скорочене позначення вулиці"
@@ -29170,6 +29267,69 @@ msgstr "Тип споруди:"
msgid "Offset into background:"
msgstr "Зміщення фундаменту:"
+msgid "Indoor Mapping Helper"
+msgstr "Помічник для створення мап приміщень"
+
+msgid "POWER"
+msgstr "ВМК/ВИМК"
+
+msgid "Activates the plug-in"
+msgstr "Задіяти втулок"
+
+msgid "Working Level"
+msgstr "Поверх"
+
+msgid "Selects the working level."
+msgstr "Вибір поверху для роботи"
+
+msgid "Level Name"
+msgstr "Назва поверха"
+
+msgid "Optional name-tag for a level."
+msgstr "Неробовʼязкова назва поверха"
+
+msgid "The object preset you want to tag."
+msgstr "Заготовка для обраного обʼєкта"
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr "Вкажіть назву для приміщення, якщо обрано обʼєкт room."
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr "Вкажіть номер для приміщення, якщо обрано обʼєкт room."
+
+msgid "Apply Tags"
+msgstr "Застосувати теґи"
+
+msgid "Fitting"
+msgstr "Підгонка"
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+"<html>Будь ласка, тепер підлаштуйте положення плану-схеми будівлі.<br>Для "
+"цього скористайтейтесь втулком PicLayer, який можна встановити "
+"використовуючи <br>можливості керування втулками в JOSM.</html>"
+
+msgid "Level Selection"
+msgstr "Вибір поверха"
+
+msgid "Lowest Level"
+msgstr "Найнижчій поверх"
+
+msgid "The lowest level of your building."
+msgstr "Самий нижній поверх будівлі."
+
+msgid "Highest Level"
+msgstr "Найвищій поверх"
+
+msgid "The highest level of your building."
+msgstr "Самий верхній поверх будівлі."
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr "Існтрумент для додавання планів приміщень"
+
msgid "InfoMode"
msgstr "ІнфоРежим"
@@ -31614,6 +31774,15 @@ msgstr "Громадський транспорт: Включити маршру
msgid "Public Transport: Edit waypoint name"
msgstr "Громадський транспорт: Редагувати назву маршрутної точки"
+msgid "Distance between stops"
+msgstr "Відстань між зупинками"
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr "Вимагається маршрут позначенй за схемою public_transport:version=2"
+
+msgid "Invalid selection"
+msgstr "Неправильне виділення"
+
msgid "Public transport routes"
msgstr "Маршрути громадського транспорту"
@@ -32437,9 +32606,6 @@ msgstr "Ряд будинків по вулиці"
msgid "Creates individual buildings from a long building."
msgstr "Створити окремі будівлі з довгої будівлі"
-msgid "Invalid selection"
-msgstr "Неправильне виділення"
-
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 "
@@ -34398,19 +34564,3 @@ msgstr "Кермувати"
msgid "Drive a race car on this layer"
msgstr "Керуйте гоночним автомобілем на цьому шарі"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Не вдалось розібрати стилі кольорів мапи з ''{0}''. Помилка: [{1}:{2}] {3}"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr ""
-#~ "Неправильний шаблон переривчастої лінії, принаймні одне значення має бути > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr ""
-#~ "Неправильний шаблон переривчастої лінії, значення має бути позитивним"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 49af3d9..3dafe72 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:09+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:07+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -148,9 +148,6 @@ msgstr ""
msgid "Homepage"
msgstr "ہوم پیج"
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr "معلومات"
@@ -172,6 +169,12 @@ msgstr "پلگانز"
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -574,9 +577,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1166,9 +1166,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1778,6 +1775,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1927,9 +1948,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2245,8 +2263,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3027,9 +3045,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3049,27 +3064,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4127,6 +4121,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4772,19 +4769,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5757,6 +5754,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6244,51 +6265,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6311,12 +6287,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6739,15 +6709,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6853,9 +6814,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7007,14 +6965,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7099,15 +7049,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7125,6 +7066,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7440,10 +7450,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9099,9 +9109,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9904,12 +9911,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11917,6 +11918,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12427,6 +12434,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13668,62 +13683,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13975,9 +13934,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14162,6 +14118,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14496,13 +14512,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14511,7 +14527,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14523,15 +14545,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14628,6 +14647,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14652,13 +14674,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14805,10 +14827,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14861,29 +14883,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14931,6 +14952,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14991,6 +15015,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15027,10 +15054,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15132,6 +15156,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15141,6 +15168,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15796,6 +15826,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17153,6 +17188,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17729,9 +17770,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18210,6 +18248,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19358,6 +19405,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20626,6 +20676,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22213,7 +22267,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22228,7 +22282,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23483,6 +23537,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23507,9 +23576,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23669,7 +23735,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23753,6 +23825,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23851,6 +23928,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23860,6 +23940,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26959,6 +27047,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29280,6 +29428,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30064,9 +30221,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index 5ab2c55..ad58d1a 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:09+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:07+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -153,9 +153,6 @@ msgstr "Java Version {0}"
msgid "Homepage"
msgstr "Homepage"
-msgid "Bug Reports"
-msgstr "Báo cáo Bug"
-
msgid "Info"
msgstr "Thông tin"
@@ -177,6 +174,12 @@ msgstr "Plugins"
msgid "About JOSM..."
msgstr "Về JOSM ..."
+msgid "OK"
+msgstr "OK"
+
+msgid "Report bug"
+msgstr "Báo cáo lỗi"
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -604,9 +607,6 @@ msgstr "Điều chỉnh vị trí của layer hình ảnh này"
msgid "Adjust imagery offset"
msgstr "Điều chỉnh hình ảnh bù đắp"
-msgid "OK"
-msgstr "OK"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1250,9 +1250,6 @@ msgstr "Cũng đổi tên các tập tin"
msgid "Could not rename file ''{0}''"
msgstr "Không thể đổi tên file '' {0} ''"
-msgid "Report bug"
-msgstr "Báo cáo lỗi"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "Báo cáo một vé để JOSM bugtracker"
@@ -1907,6 +1904,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Slower Forward"
+msgid "Downloading changeset content"
+msgstr "Tải nội dung changeset"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0} / {1}) Tải changeset {2} ..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0} / {1}) tải về nội dung cho changeset {2} ..."
+
+msgid "Download changesets"
+msgstr "Tải changesets"
+
+msgid "Querying and downloading changesets"
+msgstr "Truy vấn và tải changesets"
+
+msgid "Determine user id for current user..."
+msgstr "Xác định người sử dụng id cho người dùng hiện tại ..."
+
+msgid "Query and download changesets ..."
+msgstr "Truy vấn và tải changesets ..."
+
+msgid "Errors during download"
+msgstr "Lỗi trong khi tải về"
+
msgid "Download GPS"
msgstr "Download GPS"
@@ -2060,9 +2081,6 @@ msgstr "Đã bị xóa hoặc di chuyển các đối tượng"
msgid "The following errors occurred during mass download: {0}"
msgstr "Các lỗi sau đây xảy ra trong quá trình tải xuống hàng loạt: {0}"
-msgid "Errors during download"
-msgstr "Lỗi trong khi tải về"
-
msgid "Error during download"
msgstr "Lỗi trong khi tải về"
@@ -2406,8 +2424,8 @@ msgid "Add selection to relation"
msgstr "Thêm lựa chọn để mối quan hệ"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3216,9 +3234,6 @@ msgstr "Giải quyết xung đột trong danh sách nút của cách {0}"
msgid "Main dataset does not include node {0}"
msgstr "số liệu chính không bao gồm nút {0}"
-msgid "Apply?"
-msgstr "Áp dụng?"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3242,27 +3257,6 @@ msgstr ""
"Khi đảo chiều theo cách này, những thay đổi sau đây được đề nghị đểDuy trì "
"tính nhất quán dữ liệu."
-msgid "Relation"
-msgstr "quan hệ"
-
-msgid "Old role"
-msgstr "Old vai trò"
-
-msgid "New role"
-msgstr "vai trò mới"
-
-msgid "Old key"
-msgstr "Old key"
-
-msgid "Old value"
-msgstr "Old giá trị"
-
-msgid "New key"
-msgstr "chìa khóa mới"
-
-msgid "New value"
-msgstr "Giá trị mới"
-
msgid "Apply selected changes"
msgstr "Áp dụng thay đổi lựa chọn"
@@ -4386,6 +4380,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "Vấn đề xác minh vai trò"
@@ -5056,6 +5053,12 @@ msgstr "Bật mức độ gỡ lỗi chi tiết (trace)"
msgid "Initializing"
msgstr "Đang khởi tạo"
+msgid "Setting defaults"
+msgstr "Thiết lập mặc định"
+
+msgid "Creating main GUI"
+msgstr "Tạo GUI chính"
+
msgid "Updating plugins"
msgstr "Đang cập nhật plugins"
@@ -5065,12 +5068,6 @@ msgstr "Cài đặt plugin cập nhật"
msgid "Loading early plugins"
msgstr "Đang tải plugins sớm"
-msgid "Setting defaults"
-msgstr "Thiết lập mặc định"
-
-msgid "Creating main GUI"
-msgstr "Tạo GUI chính"
-
msgid "Loading plugins"
msgstr "Loading plugins"
@@ -6107,6 +6104,30 @@ msgstr "Hiển thị các thẻ chỉ có xung đột"
msgid "Show tags with multiple values only"
msgstr "Hiển thị các thẻ với nhiều giá trị duy nhất"
+msgid "Apply?"
+msgstr "Áp dụng?"
+
+msgid "Relation"
+msgstr "quan hệ"
+
+msgid "Old role"
+msgstr "Old vai trò"
+
+msgid "New role"
+msgstr "vai trò mới"
+
+msgid "Old key"
+msgstr "Old key"
+
+msgid "Old value"
+msgstr "Old giá trị"
+
+msgid "New key"
+msgstr "chìa khóa mới"
+
+msgid "New value"
+msgstr "Giá trị mới"
+
msgid "For selected objects only"
msgstr "đối tượng Đối với lựa chọn duy nhất"
@@ -6616,51 +6637,6 @@ msgstr "Bập bênh của lớp: {0}"
msgid "Open a list of all loaded layers."
msgstr "Mở một danh sách của tất cả các lớp được nạp."
-msgid "Delete the selected layers."
-msgstr "Xóa các lớp được chọn."
-
-msgid "Show/hide"
-msgstr "Hiện / ẩn"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "Chuyển đổi trạng thái ban đầu của các lớp được chọn."
-
-msgid "Show/hide layer"
-msgstr "Hiện / ẩn lớp"
-
-msgid "Opacity"
-msgstr "Opacity"
-
-msgid "Adjust opacity of the layer."
-msgstr "Điều chỉnh độ mờ đục của lớp."
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "Kích hoạt"
-
-msgid "Activate the selected layer"
-msgstr "Kích hoạt các lớp được chọn"
-
-msgid "Activate layer"
-msgstr "Kích hoạt lớp"
-
-msgid "Merge this layer into another layer"
-msgstr "Merge layer này vào một lớp"
-
-msgid "Duplicate this layer"
-msgstr "Nhân đôi layer này"
-
-msgid "Copy of {0}"
-msgstr "Bản sao của {0}"
-
-msgid "Copy {1} of {0}"
-msgstr "Copy {1} {0}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "layer hiện đang nhìn thấy được (click để ẩn layer)"
@@ -6683,12 +6659,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "Di chuyển các lớp được chọn lên một hàng."
-
-msgid "Move the selected layer one row down."
-msgstr "Di chuyển các lớp được chọn một hàng xuống."
-
msgid "Information about layer"
msgstr "Thông tin về lớp"
@@ -7120,15 +7090,6 @@ msgstr "Đóng cửa tại"
msgid "Discussions"
msgstr "Thảo luận"
-msgid "Downloading changeset content"
-msgstr "Tải nội dung changeset"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0} / {1}) Tải changeset {2} ..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0} / {1}) tải về nội dung cho changeset {2} ..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -7242,9 +7203,6 @@ msgstr "Cập nhật các cuộc thảo luận changeset từ máy chủ OSM"
msgid "Date"
msgstr "Ngày"
-msgid "Download changesets"
-msgstr "Tải changesets"
-
msgid "{0} [incomplete]"
msgstr "{0} [không đầy đủ]"
@@ -7415,16 +7373,6 @@ msgid "Please enter an integer value > 0"
msgstr "Hãy nhập một giá trị số nguyên> 0"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-"<Html> Giá trị hiện tại không phải là một tên người dùng hợp lệ. <br> Vui "
-"lòng nhập một phiTên người dùng sản phẩm nào. </ Html>"
-
-msgid "Please enter an non-empty user name"
-msgstr "Hãy nhập tên người dùng không trống"
-
-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 ""
@@ -7528,15 +7476,6 @@ msgstr "URL truy vấn changeset bất hợp pháp"
msgid "Close the dialog and abort querying of changesets"
msgstr "Đóng hộp thoại và hủy bỏ việc truy vấn của changesets"
-msgid "Querying and downloading changesets"
-msgstr "Truy vấn và tải changesets"
-
-msgid "Determine user id for current user..."
-msgstr "Xác định người sử dụng id cho người dùng hiện tại ..."
-
-msgid "Query and download changesets ..."
-msgstr "Truy vấn và tải changesets ..."
-
msgid "URL: "
msgstr "URL: "
@@ -7556,6 +7495,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "URL truy vấn changeset này là không hợp lệ"
+msgid "Activate"
+msgstr "Kích hoạt"
+
+msgid "Activate the selected layer"
+msgstr "Kích hoạt các lớp được chọn"
+
+msgid "Activate layer"
+msgstr "Kích hoạt lớp"
+
+msgid "Delete the selected layers."
+msgstr "Xóa các lớp được chọn."
+
+msgid "Duplicate this layer"
+msgstr "Nhân đôi layer này"
+
+msgid "Copy of {0}"
+msgstr "Bản sao của {0}"
+
+msgid "Copy {1} of {0}"
+msgstr "Copy {1} {0}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "Điều chỉnh độ mờ đục của lớp."
+
+msgid "Opacity"
+msgstr "Opacity"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "Merge layer này vào một lớp"
+
+msgid "Move the selected layer one row down."
+msgstr "Di chuyển các lớp được chọn một hàng xuống."
+
+msgid "Move the selected layer one row up."
+msgstr "Di chuyển các lớp được chọn lên một hàng."
+
+msgid "Show/hide"
+msgstr "Hiện / ẩn"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "Chuyển đổi trạng thái ban đầu của các lớp được chọn."
+
+msgid "Show/hide layer"
+msgstr "Hiện / ẩn lớp"
+
msgid "Discardable key: selection Foreground"
msgstr "key discardable: lựa chọn Foreground"
@@ -7868,13 +7876,13 @@ msgstr "Quan hệ phụ huynh"
msgid "Child Relations"
msgstr "Quan hệ trẻ"
-msgid "Apply Role:"
-msgstr "Áp dụng Vai trò:"
-
msgid "Enter a role and apply it to the selected relation members"
msgstr ""
"Nhập vai trò và áp dụng nó cho các thành viên liên quan được lựa chọn"
+msgid "Apply Role:"
+msgstr "Áp dụng Vai trò:"
+
msgid "New Relation"
msgstr "Mối quan hệ mới"
@@ -9703,9 +9711,6 @@ msgstr "Hình tượng phai"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "ERROR"
-
msgid "Next marker"
msgstr "marker Next"
@@ -10579,13 +10584,6 @@ msgstr "Chạy các bước cấp phép tự động một lần nữa"
msgid "Test Access Token"
msgstr "Test truy cập token"
-msgid "Please enter your OSM user name"
-msgstr "Hãy nhập tên người dùng OSM của bạn"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"Tên người dùng không thể để trống. Vui lòng nhập tên người dùng OSM của bạn"
-
msgid "Please enter your OSM password"
msgstr "Hãy nhập mật khẩu OSM của bạn"
@@ -12776,6 +12774,13 @@ msgstr "Connection Settings"
msgid "Connection Settings for the OSM server."
msgstr "Cài đặt kết nối cho các máy chủ OSM."
+msgid "Please enter your OSM user name"
+msgstr "Hãy nhập tên người dùng OSM của bạn"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Tên người dùng không thể để trống. Vui lòng nhập tên người dùng OSM của bạn"
+
msgid "Action"
msgstr "Action"
@@ -13329,6 +13334,14 @@ msgstr ""
"Giá trị không hợp của thuộc tính '' {0} '' của nguyên tố '' {1} '' trong máy "
"chủKhả năng. Chấn '' {2} ''"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Không thể ngày '' {0} '' trả lời của máy chủ phân tích."
@@ -14689,79 +14702,6 @@ msgstr "lý do không xác định"
msgid "Error playing sound"
msgstr "Lỗi chơi âm thanh"
-msgid "Do nothing"
-msgstr "Không làm gì cả"
-
-msgid "Report Bug"
-msgstr "Báo cáo Bug"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-"Một ngoại lệ bất ngờ xảy ra. <br> Này luôn luôn là một lỗi mã hóa. Nếu "
-"bạnĐang chạy phiên bản mới nhất của <br> JOSM, xin vui lòng xem xét việc "
-"loại vàNộp một báo cáo lỗi."
-
-msgid "Update JOSM"
-msgstr "Cập nhật JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"Một ngoại lệ bất ngờ xảy ra. Điều này luôn luôn là một mã hóaLỗi. <br> Tuy "
-"nhiên, bạn đang chạy một phiên bản cũ của JOSM({0}), <br> thay vì sử dụng "
-"các phiên bản thử nghiệm hiện tại(<B> {1} </ b>). <br> <B> Vui lòng cập nhật "
-"JOSM </ b> trước khi xem xét để nộpBáo cáo lỗi."
-
-msgid "Unexpected Exception"
-msgstr "ngoại lệ bất ngờ"
-
-msgid "Suppress further error dialogs for this session."
-msgstr "Ngăn chặn các hộp thoại báo lỗi hơn nữa cho phiên này."
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-"Bạn đã gặp phải một lỗi trong JOSM. Trước khi quý vị nộp một báo cáo lỗi "
-"makeChắc chắn rằng bạn đã cập nhật lên phiên bản mới nhất của JOSM đây:"
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-"Bạn cũng nên cập nhật các plugin của bạn. Nếu không phải của những người "
-"giúp đỡ xin vui lòng nộpBáo cáo lỗi trong bugtracker của chúng tôi bằng cách "
-"sử dụng liên kết này:"
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-"Có những thông tin lỗi được cung cấp dưới đây đã được điền vào choBạn. Xin "
-"bao gồm thông tin về làm thế nào để sao chép các lỗi và cố gắngCung cấp càng "
-"nhiều chi tiết càng tốt."
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-"Ngoài ra, nếu điều đó không làm việc, bạn có thể tự điền vàoThông tin dưới "
-"đây tại URL này:"
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(Các văn bản đã được sao chép vào clipboard của bạn.)"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "Bạn đã gặp phải một lỗi trong JOSM"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -15092,9 +15032,6 @@ msgstr "Download chuyển hướng đến '' {0} ''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Quá nhiều chuyển hướng đến URL tải phát hiện. hủy bỏ."
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Không tìm thấy bản dịch là các địa phương {0}. Lùi lại đến {1}."
@@ -15309,6 +15246,83 @@ msgstr "Bỏ qua hình học bị thay đổi: {0}"
msgid "Failed to load XML schema."
msgstr "Không thể tải giản đồ XML."
+msgid "Do nothing"
+msgstr "Không làm gì cả"
+
+msgid "Report Bug"
+msgstr "Báo cáo Bug"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Một ngoại lệ bất ngờ xảy ra. <br> Này luôn luôn là một lỗi mã hóa. Nếu "
+"bạnĐang chạy phiên bản mới nhất của <br> JOSM, xin vui lòng xem xét việc "
+"loại vàNộp một báo cáo lỗi."
+
+msgid "Update JOSM"
+msgstr "Cập nhật JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"Một ngoại lệ bất ngờ xảy ra. Điều này luôn luôn là một mã hóaLỗi. <br> Tuy "
+"nhiên, bạn đang chạy một phiên bản cũ của JOSM({0}), <br> thay vì sử dụng "
+"các phiên bản thử nghiệm hiện tại(<B> {1} </ b>). <br> <B> Vui lòng cập nhật "
+"JOSM </ b> trước khi xem xét để nộpBáo cáo lỗi."
+
+msgid "Suppress further error dialogs for this session."
+msgstr "Ngăn chặn các hộp thoại báo lỗi hơn nữa cho phiên này."
+
+msgid "Unexpected Exception"
+msgstr "ngoại lệ bất ngờ"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "Bạn đã gặp phải một lỗi trong JOSM"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Bạn đã gặp phải một lỗi trong JOSM. Trước khi quý vị nộp một báo cáo lỗi "
+"makeChắc chắn rằng bạn đã cập nhật lên phiên bản mới nhất của JOSM đây:"
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Bạn cũng nên cập nhật các plugin của bạn. Nếu không phải của những người "
+"giúp đỡ xin vui lòng nộpBáo cáo lỗi trong bugtracker của chúng tôi bằng cách "
+"sử dụng liên kết này:"
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Có những thông tin lỗi được cung cấp dưới đây đã được điền vào choBạn. Xin "
+"bao gồm thông tin về làm thế nào để sao chép các lỗi và cố gắngCung cấp càng "
+"nhiều chi tiết càng tốt."
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Ngoài ra, nếu điều đó không làm việc, bạn có thể tự điền vàoThông tin dưới "
+"đây tại URL này:"
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Các văn bản đã được sao chép vào clipboard của bạn.)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -15655,14 +15669,14 @@ msgstr "Mapbox vệ tinh"
msgid "MapQuest Open Aerial"
msgstr "MapQuest mở Aerial"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS vết"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
-msgstr "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Black & White)"
@@ -15670,8 +15684,14 @@ msgstr "OpenStreetMap (Mapnik Black & White)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, không có nhãn)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (German Style)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS vết"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -15682,15 +15702,12 @@ msgstr "Giao thông vận tải công cộng (ÖPNV)"
msgid "Hike & Bike"
msgstr "Hike & Bike"
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (German Style)"
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "Campuchia, Lào, Thái Lan, Việt Nam song ngữ"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -15787,6 +15804,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (bản đồ cơ sở)"
@@ -15811,14 +15831,14 @@ msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
+msgstr ""
+
msgid "VoGIS: Flächenwidmungsplan"
msgstr "VoGIS: Flächenwidmungsplan"
-msgid "VoGIS: DGM (Terrain model)"
-msgstr "VoGIS: DGM (mô hình địa hình)"
-
-msgid "VoGIS: DOM (Surface model)"
-msgstr "VoGIS: DOM (mô hình bề mặt)"
+msgid "VoGIS: Höhen und Gelände"
+msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
msgstr ""
@@ -15964,10 +15984,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr "Géolittoral - Sentiers"
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -16022,6 +16042,15 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
+msgid "Berlin aerial photograph 2011"
+msgstr ""
+
+msgid "Berlin aerial photograph 2014"
+msgstr ""
+
+msgid "Berlin aerial photograph 2015"
+msgstr ""
+
msgid "Stuttgart (aerial imagery)"
msgstr ""
@@ -16037,16 +16066,6 @@ msgstr "đồ cổ của Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "đồ cổ của Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Physical DE - Physical map (natural regions)"
-msgstr ""
-
-msgid "Physical DE:Harz - Physical map (natural regions)"
-msgstr ""
-
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
-msgstr ""
-
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -16092,6 +16111,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -16152,6 +16174,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -16188,11 +16213,8 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr "Luxembourg Inspire Ortho 2010"
-
-msgid "Luxembourg Inspire Ortho 2013"
-msgstr "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
+msgstr ""
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire đường sắt"
@@ -16293,6 +16315,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -16302,6 +16327,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -16994,6 +17022,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -18428,6 +18461,12 @@ msgstr "Streets"
msgid "Motorway"
msgstr "Đường cao tốc"
+msgid "Destination"
+msgstr "Destination"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -19020,9 +19059,6 @@ msgstr "Đường cao tốc Junction"
msgid "Number"
msgstr "Số"
-msgid "Exit to"
-msgstr "Exit để"
-
msgid "Services"
msgstr "Dịch vụ"
@@ -19504,6 +19540,15 @@ msgstr "tidalflat"
msgid "mangrove"
msgstr "ngập mặn"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "Mud"
@@ -20657,6 +20702,9 @@ msgstr "firepit"
msgid "Fishing"
msgstr "Câu cá"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "Night Club"
@@ -21925,6 +21973,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "Levels"
@@ -23514,8 +23566,8 @@ msgstr "excrement_bags"
msgid "food"
msgstr "thực phẩm"
-msgid "news_papers"
-msgstr "news_papers"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "parking_tickets"
@@ -23529,8 +23581,8 @@ msgstr "public_transport_plans"
msgid "public_transport_tickets"
msgstr "public_transport_tickets"
-msgid "SIM-cards"
-msgstr "SIM-card"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "tem"
@@ -24807,6 +24859,21 @@ msgstr "tự nhiên"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "Piste Route"
@@ -24831,9 +24898,6 @@ msgstr "alpine"
msgid "Detour Route"
msgstr "Đường vòng Route"
-msgid "Destination"
-msgstr "Destination"
-
msgid "Ref of the way this is a detour to"
msgstr "Ref của con đường này là đường vòng để"
@@ -24993,8 +25057,14 @@ msgstr "cắm trại"
msgid "Test"
msgstr "Test"
-msgid "Decreasing house numbers in addresses interpolation"
-msgstr "Giảm số căn nhà tại địa chỉ nội suy"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
+msgstr ""
msgid "{0} without {1}"
msgstr "{0} không có {1}"
@@ -25082,6 +25152,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -25187,6 +25262,9 @@ msgstr "{0} phải được kết nối một cách"
msgid "node connects waterway and bridge"
msgstr "nút kết nối đường thủy và cầu nối"
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -25196,6 +25274,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "tên đường tắt"
@@ -28555,6 +28641,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -30966,6 +31112,15 @@ msgstr "Giao thông vận tải công cộng: Enable waypoints"
msgid "Public Transport: Edit waypoint name"
msgstr "Giao thông vận tải công cộng: Chỉnh sửa tên waypoint"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "lựa chọn không hợp lệ"
+
msgid "Public transport routes"
msgstr ""
@@ -31787,9 +31942,6 @@ msgstr "Terrace một tòa nhà"
msgid "Creates individual buildings from a long building."
msgstr "Tạo ra các tòa nhà riêng lẻ từ một tòa nhà dài."
-msgid "Invalid selection"
-msgstr "lựa chọn không hợp lệ"
-
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 "
@@ -33707,17 +33859,3 @@ msgstr "Go lái xe"
msgid "Drive a race car on this layer"
msgstr "Lái một chiếc xe đua trên lớp này"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "mẫu gạch ngang bất hợp pháp, giá trị phải được tích cực"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "mẫu gạch ngang bất hợp pháp, ít nhất một giá trị phải được> 0"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr ""
-#~ "Không phân tích Mappaint phong cách từ '' {0} '' Lỗi là:. [{1}: {2}] {3}"
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index 0fa353e..ebfe15e 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+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: 2016-03-13 05:14+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:13+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -147,9 +147,6 @@ msgstr ""
msgid "Homepage"
msgstr ""
-msgid "Bug Reports"
-msgstr ""
-
msgid "Info"
msgstr ""
@@ -171,6 +168,12 @@ msgstr ""
msgid "About JOSM..."
msgstr ""
+msgid "OK"
+msgstr ""
+
+msgid "Report bug"
+msgstr ""
+
msgid "Failed to locate resource ''{0}''."
msgstr ""
@@ -573,9 +576,6 @@ msgstr ""
msgid "Adjust imagery offset"
msgstr ""
-msgid "OK"
-msgstr ""
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1165,9 +1165,6 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
-msgid "Report bug"
-msgstr ""
-
msgid "Report a ticket to JOSM bugtracker"
msgstr ""
@@ -1777,6 +1774,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Downloading changeset content"
+msgstr ""
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr ""
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr ""
+
+msgid "Download changesets"
+msgstr ""
+
+msgid "Querying and downloading changesets"
+msgstr ""
+
+msgid "Determine user id for current user..."
+msgstr ""
+
+msgid "Query and download changesets ..."
+msgstr ""
+
+msgid "Errors during download"
+msgstr ""
+
msgid "Download GPS"
msgstr ""
@@ -1926,9 +1947,6 @@ msgstr ""
msgid "The following errors occurred during mass download: {0}"
msgstr ""
-msgid "Errors during download"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -2244,8 +2262,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3026,9 +3044,6 @@ msgstr ""
msgid "Main dataset does not include node {0}"
msgstr ""
-msgid "Apply?"
-msgstr ""
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3048,27 +3063,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr ""
-
-msgid "Old role"
-msgstr ""
-
-msgid "New role"
-msgstr ""
-
-msgid "Old key"
-msgstr ""
-
-msgid "Old value"
-msgstr ""
-
-msgid "New key"
-msgstr ""
-
-msgid "New value"
-msgstr ""
-
msgid "Apply selected changes"
msgstr ""
@@ -4126,6 +4120,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr ""
@@ -4771,19 +4768,19 @@ msgstr ""
msgid "Initializing"
msgstr ""
-msgid "Updating plugins"
+msgid "Setting defaults"
msgstr ""
-msgid "Installing updated plugins"
+msgid "Creating main GUI"
msgstr ""
-msgid "Loading early plugins"
+msgid "Updating plugins"
msgstr ""
-msgid "Setting defaults"
+msgid "Installing updated plugins"
msgstr ""
-msgid "Creating main GUI"
+msgid "Loading early plugins"
msgstr ""
msgid "Loading plugins"
@@ -5756,6 +5753,30 @@ msgstr ""
msgid "Show tags with multiple values only"
msgstr ""
+msgid "Apply?"
+msgstr ""
+
+msgid "Relation"
+msgstr ""
+
+msgid "Old role"
+msgstr ""
+
+msgid "New role"
+msgstr ""
+
+msgid "Old key"
+msgstr ""
+
+msgid "Old value"
+msgstr ""
+
+msgid "New key"
+msgstr ""
+
+msgid "New value"
+msgstr ""
+
msgid "For selected objects only"
msgstr ""
@@ -6243,51 +6264,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr ""
-msgid "Delete the selected layers."
-msgstr ""
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr ""
-
-msgid "Adjust opacity of the layer."
-msgstr ""
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr ""
-
-msgid "Activate the selected layer"
-msgstr ""
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr ""
-
-msgid "Duplicate this layer"
-msgstr ""
-
-msgid "Copy of {0}"
-msgstr ""
-
-msgid "Copy {1} of {0}"
-msgstr ""
-
msgid "layer is currently visible (click to hide layer)"
msgstr ""
@@ -6310,12 +6286,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr ""
-
-msgid "Move the selected layer one row down."
-msgstr ""
-
msgid "Information about layer"
msgstr ""
@@ -6738,15 +6708,6 @@ msgstr ""
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr ""
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6852,9 +6813,6 @@ msgstr ""
msgid "Date"
msgstr ""
-msgid "Download changesets"
-msgstr ""
-
msgid "{0} [incomplete]"
msgstr ""
@@ -7006,14 +6964,6 @@ msgid "Please enter an integer value > 0"
msgstr ""
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr ""
-
-msgid "Please enter an non-empty user name"
-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 ""
@@ -7098,15 +7048,6 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
-msgid "Querying and downloading changesets"
-msgstr ""
-
-msgid "Determine user id for current user..."
-msgstr ""
-
-msgid "Query and download changesets ..."
-msgstr ""
-
msgid "URL: "
msgstr ""
@@ -7124,6 +7065,75 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Activate"
+msgstr ""
+
+msgid "Activate the selected layer"
+msgstr ""
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr ""
+
+msgid "Duplicate this layer"
+msgstr ""
+
+msgid "Copy of {0}"
+msgstr ""
+
+msgid "Copy {1} of {0}"
+msgstr ""
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr ""
+
+msgid "Opacity"
+msgstr ""
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr ""
+
+msgid "Move the selected layer one row down."
+msgstr ""
+
+msgid "Move the selected layer one row up."
+msgstr ""
+
+msgid "Show/hide"
+msgstr ""
+
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+msgid "Show/hide layer"
+msgstr ""
+
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7439,10 +7449,10 @@ msgstr ""
msgid "Child Relations"
msgstr ""
-msgid "Apply Role:"
+msgid "Enter a role and apply it to the selected relation members"
msgstr ""
-msgid "Enter a role and apply it to the selected relation members"
+msgid "Apply Role:"
msgstr ""
msgid "New Relation"
@@ -9098,9 +9108,6 @@ msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr ""
-
msgid "Next marker"
msgstr ""
@@ -9903,12 +9910,6 @@ msgstr ""
msgid "Test Access Token"
msgstr ""
-msgid "Please enter your OSM user name"
-msgstr ""
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-
msgid "Please enter your OSM password"
msgstr ""
@@ -11916,6 +11917,12 @@ msgstr ""
msgid "Connection Settings for the OSM server."
msgstr ""
+msgid "Please enter your OSM user name"
+msgstr ""
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
msgid "Action"
msgstr ""
@@ -12426,6 +12433,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -13667,62 +13682,6 @@ msgstr ""
msgid "Error playing sound"
msgstr ""
-msgid "Do nothing"
-msgstr ""
-
-msgid "Report Bug"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr ""
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr ""
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr ""
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr ""
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr ""
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr ""
-
-msgid "You have encountered a bug in JOSM"
-msgstr ""
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -13974,9 +13933,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14161,6 +14117,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr ""
+msgid "Do nothing"
+msgstr ""
+
+msgid "Report Bug"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr ""
+
+msgid "You have encountered a bug in JOSM"
+msgstr ""
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr ""
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14495,13 +14511,13 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14510,7 +14526,13 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
msgid "MapQuest OSM"
@@ -14522,15 +14544,12 @@ msgstr ""
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "skobbler"
msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
msgstr ""
@@ -14627,6 +14646,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14651,13 +14673,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14804,10 +14826,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14860,29 +14882,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14930,6 +14951,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -14990,6 +15014,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15026,10 +15053,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15131,6 +15155,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15140,6 +15167,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15795,6 +15825,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
@@ -17152,6 +17187,12 @@ msgstr ""
msgid "Motorway"
msgstr ""
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17728,9 +17769,6 @@ msgstr ""
msgid "Number"
msgstr ""
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr ""
@@ -18209,6 +18247,15 @@ msgstr ""
msgid "mangrove"
msgstr ""
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr ""
@@ -19357,6 +19404,9 @@ msgstr ""
msgid "Fishing"
msgstr ""
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr ""
@@ -20625,6 +20675,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -22212,7 +22266,7 @@ msgstr ""
msgid "food"
msgstr ""
-msgid "news_papers"
+msgid "newspapers"
msgstr ""
msgid "parking_tickets"
@@ -22227,7 +22281,7 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
+msgid "SIM_cards"
msgstr ""
msgid "stamps"
@@ -23482,6 +23536,21 @@ msgstr ""
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr ""
@@ -23506,9 +23575,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23668,7 +23734,13 @@ msgstr ""
msgid "Test"
msgstr ""
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23752,6 +23824,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23850,6 +23927,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23859,6 +23939,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -26958,6 +27046,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29279,6 +29427,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr ""
+
msgid "Public transport routes"
msgstr ""
@@ -30063,9 +30220,6 @@ msgstr ""
msgid "Creates individual buildings from a long building."
msgstr ""
-msgid "Invalid selection"
-msgstr ""
-
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 "
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 16f055e..efcbfc6 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
"PO-Revision-Date: 2016-03-03 01:46+0000\n"
"Last-Translator: sinopitt <Unknown>\n"
"Language-Team: 汉语 <>\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:12+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:11+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: zh_CN\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -153,9 +153,6 @@ msgstr "Java 版本 {0}"
msgid "Homepage"
msgstr "主页"
-msgid "Bug Reports"
-msgstr "错误报告"
-
msgid "Info"
msgstr "信息"
@@ -177,6 +174,12 @@ msgstr "插件"
msgid "About JOSM..."
msgstr "关于 JOSM..."
+msgid "OK"
+msgstr "确定"
+
+msgid "Report bug"
+msgstr "报告错误"
+
msgid "Failed to locate resource ''{0}''."
msgstr "无法定位资源\"{0}\"。"
@@ -579,9 +582,6 @@ msgstr "调整此图像图层的位置"
msgid "Adjust imagery offset"
msgstr "调整图像偏移"
-msgid "OK"
-msgstr "确定"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -1177,9 +1177,6 @@ msgstr "同时重命名文件"
msgid "Could not rename file ''{0}''"
msgstr "无法重命名文件“{0}”"
-msgid "Report bug"
-msgstr "报告错误"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "回报给 JOSM 错误追踪系统"
@@ -1784,6 +1781,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "慢进"
+msgid "Downloading changeset content"
+msgstr "下载修改集合内容"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) 正在下载修改集合 {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) 正在下载修改集合 {2} 的内容..."
+
+msgid "Download changesets"
+msgstr "下载修改集合"
+
+msgid "Querying and downloading changesets"
+msgstr "查询并下载修改集合"
+
+msgid "Determine user id for current user..."
+msgstr "判断目前用户的 id..."
+
+msgid "Query and download changesets ..."
+msgstr "查询并下载修改集合..."
+
+msgid "Errors during download"
+msgstr "下载时发生错误"
+
msgid "Download GPS"
msgstr "下载 GPS"
@@ -1928,9 +1949,6 @@ msgstr "已删除或移动的对象"
msgid "The following errors occurred during mass download: {0}"
msgstr "在大量下载时发生下列错误：{0}"
-msgid "Errors during download"
-msgstr "下载时发生错误"
-
msgid "Error during download"
msgstr "下载时发生错误"
@@ -2248,8 +2266,8 @@ msgid "Add selection to relation"
msgstr "添加选择到关系"
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3020,9 +3038,6 @@ msgstr "解决路径 {0} 节点列表中的版本冲突"
msgid "Main dataset does not include node {0}"
msgstr "主要数据集合不包含节点 {0}"
-msgid "Apply?"
-msgstr "应用？"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3043,27 +3058,6 @@ msgid ""
"maintain data consistency."
msgstr "反转该路径时，建议进行以下修改以保持数据的一致性。"
-msgid "Relation"
-msgstr "关系"
-
-msgid "Old role"
-msgstr "旧的角色"
-
-msgid "New role"
-msgstr "新的角色"
-
-msgid "Old key"
-msgstr "旧的设定键"
-
-msgid "Old value"
-msgstr "旧的数值"
-
-msgid "New key"
-msgstr "新的设定键"
-
-msgid "New value"
-msgstr "新的数值"
-
msgid "Apply selected changes"
msgstr "应用选定的修改"
@@ -4123,6 +4117,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "角色验证问题"
@@ -4769,6 +4766,12 @@ msgstr "启用详细调试级别(跟踪)"
msgid "Initializing"
msgstr "初始化"
+msgid "Setting defaults"
+msgstr "设定默认值"
+
+msgid "Creating main GUI"
+msgstr "建立主窗口中"
+
msgid "Updating plugins"
msgstr "更新插件中"
@@ -4778,12 +4781,6 @@ msgstr "正在安装更新的插件"
msgid "Loading early plugins"
msgstr "加载较早的插件"
-msgid "Setting defaults"
-msgstr "设定默认值"
-
-msgid "Creating main GUI"
-msgstr "建立主窗口中"
-
msgid "Loading plugins"
msgstr "正在加载插件"
@@ -5756,6 +5753,30 @@ msgstr "只显示有冲突的标签"
msgid "Show tags with multiple values only"
msgstr "只显示有多个数值的标签"
+msgid "Apply?"
+msgstr "应用？"
+
+msgid "Relation"
+msgstr "关系"
+
+msgid "Old role"
+msgstr "旧的角色"
+
+msgid "New role"
+msgstr "新的角色"
+
+msgid "Old key"
+msgstr "旧的设定键"
+
+msgid "Old value"
+msgstr "旧的数值"
+
+msgid "New key"
+msgstr "新的设定键"
+
+msgid "New value"
+msgstr "新的数值"
+
msgid "For selected objects only"
msgstr "只用于选定的对象"
@@ -6253,51 +6274,6 @@ msgstr "切换图层的可见度：{0}"
msgid "Open a list of all loaded layers."
msgstr "打开所有加载图层的列表。"
-msgid "Delete the selected layers."
-msgstr "删除选定的图层。"
-
-msgid "Show/hide"
-msgstr "显示/隐藏"
-
-msgid "Toggle visible state of the selected layer."
-msgstr "切换选定图层的可见性状态。"
-
-msgid "Show/hide layer"
-msgstr "显示/隐藏图层"
-
-msgid "Opacity"
-msgstr "不透明度"
-
-msgid "Adjust opacity of the layer."
-msgstr "调整图层的不透明度。"
-
-msgid "Gamma"
-msgstr "Gamma"
-
-msgid "Adjust gamma value of the layer."
-msgstr "调整图层的 gamma 值。"
-
-msgid "Activate"
-msgstr "使用"
-
-msgid "Activate the selected layer"
-msgstr "使用选定的图层"
-
-msgid "Activate layer"
-msgstr "激活图层"
-
-msgid "Merge this layer into another layer"
-msgstr "将这个图层合并至另一个图层"
-
-msgid "Duplicate this layer"
-msgstr "重制这个图层"
-
-msgid "Copy of {0}"
-msgstr "{0} 的副本"
-
-msgid "Copy {1} of {0}"
-msgstr "{0} 的副本 {1}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "图层目前为显示(点击以隐藏图层)"
@@ -6320,12 +6296,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "将选定的图层上移一列。"
-
-msgid "Move the selected layer one row down."
-msgstr "将选定的图层下移一列。"
-
msgid "Information about layer"
msgstr "图层信息"
@@ -6752,15 +6722,6 @@ msgstr "关闭于"
msgid "Discussions"
msgstr "讨论"
-msgid "Downloading changeset content"
-msgstr "下载修改集合内容"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) 正在下载修改集合 {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) 正在下载修改集合 {2} 的内容..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6865,9 +6826,6 @@ msgstr "从OSM服务器更新该修改集合讨论"
msgid "Date"
msgstr "日期"
-msgid "Download changesets"
-msgstr "下载修改集合"
-
msgid "{0} [incomplete]"
msgstr "{0} [不完整]"
@@ -7019,14 +6977,6 @@ msgid "Please enter an integer value > 0"
msgstr "请输入大于 0 的整数值"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr "<html>目前的数值不是有效的用户名。<br>请输入非空的用户名。</html>"
-
-msgid "Please enter an non-empty user name"
-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>"
@@ -7113,15 +7063,6 @@ msgstr "不合法的修改集合查询 URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "关闭此对话框，并放弃修改集合的查询"
-msgid "Querying and downloading changesets"
-msgstr "查询并下载修改集合"
-
-msgid "Determine user id for current user..."
-msgstr "判断目前用户的 id..."
-
-msgid "Query and download changesets ..."
-msgstr "查询并下载修改集合..."
-
msgid "URL: "
msgstr "URL： "
@@ -7139,6 +7080,75 @@ msgstr "请注意修改集合查询目前永远提交到“{0}”，不管下列
msgid "This changeset query URL is invalid"
msgstr "这个修改集合查询 URL 是无效的"
+msgid "Activate"
+msgstr "使用"
+
+msgid "Activate the selected layer"
+msgstr "使用选定的图层"
+
+msgid "Activate layer"
+msgstr "激活图层"
+
+msgid "Delete the selected layers."
+msgstr "删除选定的图层。"
+
+msgid "Duplicate this layer"
+msgstr "重制这个图层"
+
+msgid "Copy of {0}"
+msgstr "{0} 的副本"
+
+msgid "Copy {1} of {0}"
+msgstr "{0} 的副本 {1}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "调整图层的不透明度。"
+
+msgid "Opacity"
+msgstr "不透明度"
+
+msgid "Adjust gamma value of the layer."
+msgstr "调整图层的 gamma 值。"
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "将这个图层合并至另一个图层"
+
+msgid "Move the selected layer one row down."
+msgstr "将选定的图层下移一列。"
+
+msgid "Move the selected layer one row up."
+msgstr "将选定的图层上移一列。"
+
+msgid "Show/hide"
+msgstr "显示/隐藏"
+
+msgid "Toggle visible state of the selected layer."
+msgstr "切换选定图层的可见性状态。"
+
+msgid "Show/hide layer"
+msgstr "显示/隐藏图层"
+
msgid "Discardable key: selection Foreground"
msgstr "可丢弃键：选择前景"
@@ -7444,12 +7454,12 @@ msgstr "父关系"
msgid "Child Relations"
msgstr "子关系"
-msgid "Apply Role:"
-msgstr "应用角色："
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "输入一个角色并将它应用至选定的关系成员"
+msgid "Apply Role:"
+msgstr "应用角色："
+
msgid "New Relation"
msgstr "新关系"
@@ -9126,9 +9136,6 @@ msgstr "图像淡化"
msgid "Unsupported imagery type: {0}"
msgstr "不支持的图像类型：{0}"
-msgid "ERROR"
-msgstr "错误"
-
msgid "Next marker"
msgstr "下一个标记"
@@ -9955,12 +9962,6 @@ msgstr "再次执行自动授权步骤"
msgid "Test Access Token"
msgstr "测试访问令牌"
-msgid "Please enter your OSM user name"
-msgstr "请输入您的 OSM 用户名"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "用户名不能为空白。请输入您的 OSM 用户名"
-
msgid "Please enter your OSM password"
msgstr "请输入您的 OSM 密码"
@@ -12010,6 +12011,12 @@ msgstr "连接设定值"
msgid "Connection Settings for the OSM server."
msgstr "OSM 服务器的连接设定值。"
+msgid "Please enter your OSM user name"
+msgstr "请输入您的 OSM 用户名"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "用户名不能为空白。请输入您的 OSM 用户名"
+
msgid "Action"
msgstr "动作"
@@ -12518,6 +12525,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr "服务器功能中元素“{1}”的属性“{0}”值非法。得到“{2}”"
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "解析服务器返回的日期“{0}”失败。"
@@ -13722,97 +13737,39 @@ msgstr "HTTP请求失败"
msgid "Plugin list download error"
msgstr "插件列表下载错误"
-msgid "JOSM failed to download plugin list:"
-msgstr "JOSM 无法下载插件列表："
-
-msgid "Details:"
-msgstr "详细信息："
-
-msgid ""
-"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
-"plugin site ''{1}''."
-msgstr "创建插件目录\"{0}\"失败。无法从插件网站\"{1}\"缓存插件列表。"
-
-msgid "Writing plugin list to local cache ''{0}''"
-msgstr "正在将插件列表写入本地缓存“{0}”"
-
-msgid "Parsing plugin list from site ''{0}''"
-msgstr "正在分析网站“{0}”的插件列表"
-
-msgid ""
-"Failed to parse plugin list document from site ''{0}''. Skipping site. "
-"Exception was: {1}"
-msgstr "无法解析网站“{0}”的插件列表文件。正在跳过网站。异常为：{1}"
-
-msgid "Processing plugin list from site ''{0}''"
-msgstr "正在处理网站“{0}”的插件列表"
-
-msgid "This is after the end of the recording"
-msgstr "这已在记录的结尾之后"
-
-msgid "unspecified reason"
-msgstr "未指定的原因"
-
-msgid "Error playing sound"
-msgstr "播放音频时出错"
-
-msgid "Do nothing"
-msgstr "不处理"
-
-msgid "Report Bug"
-msgstr "报告程序缺陷"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr "发生异常。<br>这通常是程序码引起的错误。如果您使用的是最新版的<br>JOSM，请考虑不吝回复错误。"
-
-msgid "Update JOSM"
-msgstr "升级 JOSM"
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-"发生异常。这通常是程序码引起的错误。<br><br>然而您运行的是旧版本的 JOSM "
-"({0})，而不是<br>当前的测试版(<b>{1}</b>)。<br><br>在您考虑提交错误报告之前，<b>请更新您的 JOSM</b>。"
-
-msgid "Unexpected Exception"
-msgstr "意想不到的异常"
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM 无法下载插件列表："
-msgid "Suppress further error dialogs for this session."
-msgstr "阻止此会话再显示该错误对话框。"
+msgid "Details:"
+msgstr "详细信息："
msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr "您遇到了 JOSM 的错误。在您发送错误报告之前，请确保您已从这更新到最新版本的 JOSM："
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
+msgstr "创建插件目录\"{0}\"失败。无法从插件网站\"{1}\"缓存插件列表。"
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr "您也应该更新您的插件。如果这些都没有帮助，请在以下链接中的缺陷追踪系统中报告缺陷："
+msgid "Writing plugin list to local cache ''{0}''"
+msgstr "正在将插件列表写入本地缓存“{0}”"
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr "下面提供的错误信息应该已经为您填好。请加上如何重现这个错误的信息，并尽可能详细一些。"
+msgid "Parsing plugin list from site ''{0}''"
+msgstr "正在分析网站“{0}”的插件列表"
msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr "另外，如果这些都不行，您也可以在这个 URL 自行填写信息："
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
+msgstr "无法解析网站“{0}”的插件列表文件。正在跳过网站。异常为：{1}"
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "(该文字已复制到您的剪贴板中。)"
+msgid "Processing plugin list from site ''{0}''"
+msgstr "正在处理网站“{0}”的插件列表"
-msgid "You have encountered a bug in JOSM"
-msgstr "您遇到了 JOSM 程序缺陷"
+msgid "This is after the end of the recording"
+msgstr "这已在记录的结尾之后"
+
+msgid "unspecified reason"
+msgstr "未指定的原因"
+
+msgid "Error playing sound"
+msgstr "播放音频时出错"
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
@@ -14082,9 +14039,6 @@ msgstr "下载重定向到“{0}”"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "检测到下载 URL 重定向过多。正在中止。"
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "找不到地区设定 {0} 的翻译。回复为 {1}。"
@@ -14272,6 +14226,68 @@ msgstr "忽略格式错误的几何形状：{0}"
msgid "Failed to load XML schema."
msgstr "无法加载 XML 架构。"
+msgid "Do nothing"
+msgstr "不处理"
+
+msgid "Report Bug"
+msgstr "报告程序缺陷"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr "发生异常。<br>这通常是程序码引起的错误。如果您使用的是最新版的<br>JOSM，请考虑不吝回复错误。"
+
+msgid "Update JOSM"
+msgstr "升级 JOSM"
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+"发生异常。这通常是程序码引起的错误。<br><br>然而您运行的是旧版本的 JOSM "
+"({0})，而不是<br>当前的测试版(<b>{1}</b>)。<br><br>在您考虑提交错误报告之前，<b>请更新您的 JOSM</b>。"
+
+msgid "Suppress further error dialogs for this session."
+msgstr "阻止此会话再显示该错误对话框。"
+
+msgid "Unexpected Exception"
+msgstr "意想不到的异常"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "您遇到了 JOSM 程序缺陷"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr "您遇到了 JOSM 的错误。在您发送错误报告之前，请确保您已从这更新到最新版本的 JOSM："
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr "您也应该更新您的插件。如果这些都没有帮助，请在以下链接中的缺陷追踪系统中报告缺陷："
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr "下面提供的错误信息应该已经为您填好。请加上如何重现这个错误的信息，并尽可能详细一些。"
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr "另外，如果这些都不行，您也可以在这个 URL 自行填写信息："
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(该文字已复制到您的剪贴板中。)"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14606,13 +14622,13 @@ msgstr "Mapbox 卫星"
msgid "MapQuest Open Aerial"
msgstr "MapQuest 开放航拍图像"
-msgid "OpenStreetMap GPS Traces"
-msgstr "OSM GPS轨迹"
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
-msgid "OpenStreetMap (Standard layer)"
-msgstr "OpenStreetMap (标准图层)"
+msgid "OpenSeaMap"
+msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14621,8 +14637,14 @@ msgstr "OpenStreetMap (Mapnik 黑白)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik，无标签)"
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
+msgstr ""
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (德国样式)"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OSM GPS轨迹"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
@@ -14633,15 +14655,12 @@ msgstr "公共交通(ÖPNV)"
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (德国样式)"
+msgid "skobbler"
+msgstr ""
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr "柬埔寨、老挝、泰国、越南多语言"
-msgid "osmfr"
-msgstr "osmfr"
-
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map （叠加层）"
@@ -14738,6 +14757,9 @@ msgstr "basemap.at"
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14762,13 +14784,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14915,10 +14937,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14971,29 +14993,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -15041,6 +15062,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15101,6 +15125,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15137,10 +15164,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15242,6 +15266,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15251,6 +15278,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15906,6 +15936,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr "当前图层对象的额外信息弹出窗口 - 当前 GPX 的轨迹点的信息"
@@ -17263,6 +17298,12 @@ msgstr "街道"
msgid "Motorway"
msgstr "高速公路(Motorway)"
+msgid "Destination"
+msgstr "目的地"
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17839,9 +17880,6 @@ msgstr "高速公路出口"
msgid "Number"
msgstr "编号"
-msgid "Exit to"
-msgstr "至"
-
msgid "Services"
msgstr "服务区"
@@ -18320,6 +18358,15 @@ msgstr "滩涂"
msgid "mangrove"
msgstr "红树林"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "泥浆地"
@@ -19468,6 +19515,9 @@ msgstr "火塘"
msgid "Fishing"
msgstr "钓鱼"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "夜店"
@@ -20736,6 +20786,10 @@ msgid "transformer_tower"
msgstr "输电塔"
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr "层数"
@@ -22323,8 +22377,8 @@ msgstr "粪袋"
msgid "food"
msgstr "食物"
-msgid "news_papers"
-msgstr "报纸"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
msgstr "停车票"
@@ -22338,8 +22392,8 @@ msgstr "公共交通行程单"
msgid "public_transport_tickets"
msgstr "公共交通票"
-msgid "SIM-cards"
-msgstr "SIM卡"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "邮票"
@@ -23593,6 +23647,21 @@ msgstr "自然"
msgid "Walking Route"
msgstr ""
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
+msgstr ""
+
msgid "Piste Route"
msgstr "滑雪路线"
@@ -23617,9 +23686,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr "目的地"
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23779,7 +23845,13 @@ msgstr "露营"
msgid "Test"
msgstr "测试"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23863,6 +23935,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23961,6 +24038,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23970,6 +24050,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "缩写的街道名称"
@@ -27193,6 +27281,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr "信息模式"
@@ -29512,6 +29660,15 @@ msgstr "公共交通：启用路点"
msgid "Public Transport: Edit waypoint name"
msgstr "公共交通：编辑路点名称"
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "无效的选择范围"
+
msgid "Public transport routes"
msgstr ""
@@ -30300,9 +30457,6 @@ msgstr "将建筑连栋"
msgid "Creates individual buildings from a long building."
msgstr "从一长排建筑中建立个别建筑。"
-msgid "Invalid selection"
-msgstr "无效的选择范围"
-
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 "
@@ -32081,16 +32235,3 @@ msgstr "开始驾驶"
msgid "Drive a race car on this layer"
msgstr "在这个图层驾驶赛车"
-
-#~ msgid "Illegal dash pattern, at least one value must be > 0"
-#~ msgstr "非法的虚线模式，至少有一个值必须 > 0"
-
-#~ msgid "Illegal dash pattern, values must be positive"
-#~ msgstr "非法的虚线模式，值必须为正"
-
-#~ msgid "xml"
-#~ msgstr "xml"
-
-#~ msgid ""
-#~ "Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
-#~ msgstr "从“{0}”解析地图绘画风格失败。错误为：[{1}:{2}] {3}"
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 1d19494..66d2a90 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-12 03:47+0100\n"
-"PO-Revision-Date: 2016-02-25 14:27+0000\n"
-"Last-Translator: Jeff Huang <s8321414 at yahoo.com.tw>\n"
+"POT-Creation-Date: 2016-04-29 03:36+0200\n"
+"PO-Revision-Date: 2016-04-28 14:22+0000\n"
+"Last-Translator: Sean Young <assanges at gmail.com>\n"
"Language-Team: Traditional Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-03-13 05:12+0000\n"
-"X-Generator: Launchpad (build 17939)\n"
+"X-Launchpad-Export-Date: 2016-04-29 05:10+0000\n"
+"X-Generator: Launchpad (build 17995)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -68,7 +68,7 @@ msgid "DEBUG: {0}"
msgstr "偵錯: {0}"
msgid "Cause: "
-msgstr ""
+msgstr "原因： "
msgid "Executing platform startup hook"
msgstr "執行平臺啟動掛鉤"
@@ -98,7 +98,7 @@ msgid "Updating user interface"
msgstr "正在更新使用者介面"
msgid "Failed to save default preferences."
-msgstr ""
+msgstr "預設選項儲存失敗。"
msgid "Ignoring malformed URL: \"{0}\""
msgstr "忽略不正確的 URL: \"{0}\""
@@ -150,9 +150,6 @@ msgstr "上次修改 {0}"
msgid "Homepage"
msgstr "首頁"
-msgid "Bug Reports"
-msgstr "程式臭蟲回報"
-
msgid "Info"
msgstr "資訊"
@@ -174,8 +171,14 @@ msgstr "外掛"
msgid "About JOSM..."
msgstr "關於 JOSM"
+msgid "OK"
+msgstr "確定"
+
+msgid "Report bug"
+msgstr "回報錯誤"
+
msgid "Failed to locate resource ''{0}''."
-msgstr ""
+msgstr "無法定位資源 ''{0}''。"
msgid "Failed to load resource ''{0}'', error is {1}."
msgstr "無法載入資源「{0}」，錯誤為 {1}。"
@@ -186,16 +189,14 @@ msgid ""
msgid_plural ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "你正準備開啟 {0} 個瀏覽視窗。<br>視窗可能會充斥整個屏幕，<br>並需要一些時間方能完成。"
msgid "Continue"
msgstr "繼續"
msgid "Click to continue and to open {0} browser"
msgid_plural "Click to continue and to open {0} browsers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "點撃以繼續並開啟{0}個瀏覽器"
msgid "Cancel"
msgstr "取消"
@@ -279,7 +280,7 @@ msgid "Please select at least four nodes."
msgstr "請選取至少四個節點"
msgid "Cannot determine center of selected nodes."
-msgstr ""
+msgstr "無法判定已選節點之中心。"
msgid ""
"One or more nodes involved in this action is outside of the downloaded area."
@@ -295,10 +296,10 @@ msgid "Please select at least three nodes."
msgstr "請至少選取三個節點"
msgid "Can not align a polygon. Abort."
-msgstr ""
+msgstr "無法將多邊形對齊，中止執行。"
msgid "Intersection of three or more ways can not be solved. Abort."
-msgstr ""
+msgstr "無法解析三個節點或以上的交叉點，中止執行。"
msgid "Two parallels ways found. Abort."
msgstr "找到兩條平行的路線，結束。"
@@ -449,10 +450,10 @@ msgid "Delete selected objects."
msgstr "刪除選擇的物件"
msgid "Delete Layer"
-msgstr ""
+msgstr "刪除圖層"
msgid "Delete the active layer. Does not delete the associated file."
-msgstr ""
+msgstr "刪除目前圖層，但不刪除關連檔案。"
msgid "Toggle dialogs panel"
msgstr "切換對話盒面板"
@@ -461,7 +462,7 @@ msgid "Toggle dialogs panel, maximize mapview"
msgstr "切換對話盒面板，最大化地圖檢視"
msgid "Distribute Nodes"
-msgstr ""
+msgstr "分佈節點"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "依一條直線將選取的節點等距離散佈。"
@@ -474,6 +475,9 @@ msgid ""
"* One no self-crossing way with at most two of its nodes;\n"
"* Three nodes."
msgstr ""
+"請選擇：\n"
+"* 一條不自我交匯、並至少有兩個節點的路徑；\n"
+"* 三個節點。"
msgid "Download from OSM..."
msgstr "從 OSM 下載"
@@ -575,9 +579,6 @@ msgstr "調整圖片圖層的位置"
msgid "Adjust imagery offset"
msgstr "調整圖片偏移"
-msgid "OK"
-msgstr "確定"
-
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
"offset.\n"
@@ -987,7 +988,7 @@ msgid "Download Data"
msgstr "下載資料"
msgid "Which tasks to perform?"
-msgstr ""
+msgstr "執行哪項工作？"
msgid "Ok"
msgstr "確定"
@@ -1057,22 +1058,22 @@ msgid "Download from Overpass API ..."
msgstr "從 Overpass API 下載..."
msgid "Download map data from Overpass API server."
-msgstr ""
+msgstr "自 Overpass API 伺服器下載地圖數據。"
msgid "Builds an Overpass query using the Overpass Turbo query wizard"
-msgstr ""
+msgstr "利用 Overpass Turbo 査詢精靈建立 Overpass 査詢"
msgid "Build query"
-msgstr ""
+msgstr "建立查詢"
msgid "<html>The Overpass wizard could not parse the following query:"
-msgstr ""
+msgstr "<html>Overpass 精靈無法解析下列査詢："
msgid "Parse error"
-msgstr ""
+msgstr "解析錯誤"
msgid "Overpass query: "
-msgstr ""
+msgstr "Overpass檢索 "
msgid "Paste"
msgstr "貼上"
@@ -1170,9 +1171,6 @@ msgstr "同時重新命名該檔案"
msgid "Could not rename file ''{0}''"
msgstr "無法重新命名檔案「{0}」"
-msgid "Report bug"
-msgstr "回報錯誤"
-
msgid "Report a ticket to JOSM bugtracker"
msgstr "回報給JOSM錯誤追蹤"
@@ -1231,7 +1229,7 @@ msgid "Search for notes"
msgstr "搜尋筆記"
msgid "You must enter a search term"
-msgstr ""
+msgstr "你必須輸入一組關鍵字"
msgid "Select All"
msgstr "全選"
@@ -1357,7 +1355,7 @@ msgid "Split a way at the selected node."
msgstr "在選取的節點上切割路徑"
msgid "Cannot split since another split operation is already in progress"
-msgstr ""
+msgstr "無法就正在進行分割作業區塊再作分割"
msgid ""
"The current selection cannot be used for splitting - no node is selected."
@@ -1385,7 +1383,7 @@ msgid " [id: {0}]"
msgstr " [id: {0}]"
msgid "Segment {0}: {1}"
-msgstr ""
+msgstr "區間 {0}: {1}"
msgid "You must select two or more nodes to split a circular way."
msgstr "你必須選擇兩個以上的節點來切割一個環狀路徑"
@@ -1471,19 +1469,19 @@ msgstr ""
"都會被選取。"
msgid "Existing node"
-msgstr ""
+msgstr "既存節點"
msgid "Both nodes"
msgstr ""
msgid "New node"
-msgstr ""
+msgstr "新節點"
msgid "Tags / Memberships"
msgstr "標籤 / 成員"
msgid "Unglue"
-msgstr ""
+msgstr "分離"
msgid "Where should the tags of the node be put?"
msgstr ""
@@ -1496,8 +1494,7 @@ msgstr "取消黏合節點"
msgid "Dupe into {0} node"
msgid_plural "Dupe into {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "複製至 {0} 個節點"
msgid "Dupe {0} node into {1} nodes"
msgid_plural "Dupe {0} nodes into {1} nodes"
@@ -1779,6 +1776,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "慢速快轉"
+msgid "Downloading changeset content"
+msgstr "下載變更組合內容"
+
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) 正在下載變更組合 {2}..."
+
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) 正在下載變更組合 {2} 的內容..."
+
+msgid "Download changesets"
+msgstr "下載變更組合"
+
+msgid "Querying and downloading changesets"
+msgstr "查詢並下載變更組合"
+
+msgid "Determine user id for current user..."
+msgstr "判斷目前使用者的 id..."
+
+msgid "Query and download changesets ..."
+msgstr "查詢並下載變更組合..."
+
+msgid "Errors during download"
+msgstr "下載時發生錯誤"
+
msgid "Download GPS"
msgstr ""
@@ -1925,9 +1946,6 @@ msgstr "已刪除或移動的物件"
msgid "The following errors occurred during mass download: {0}"
msgstr "在大量下載時發生下列錯誤：{0}"
-msgid "Errors during download"
-msgstr "下載時發生錯誤"
-
msgid "Error during download"
msgstr "下載時發生錯誤"
@@ -2242,8 +2260,8 @@ msgid "Add selection to relation"
msgstr ""
msgid ""
-"<html><strong>Add selection to relation</strong>: Control every single "
-"relation to avoid damage!"
+"{0}Add selection to relation{1}: Verify every single relation to avoid "
+"damage!"
msgstr ""
msgid "Add selection to {0} relation"
@@ -3023,9 +3041,6 @@ msgstr "解決路徑 {0} 節點清單中的版本衝突"
msgid "Main dataset does not include node {0}"
msgstr "主要資料組合不包含節點 {0}"
-msgid "Apply?"
-msgstr "是否接受？"
-
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
"of its tag ''{1}'' is defined by its direction.<br/>Do you really want to "
@@ -3045,27 +3060,6 @@ msgid ""
"maintain data consistency."
msgstr ""
-msgid "Relation"
-msgstr "關係"
-
-msgid "Old role"
-msgstr "舊的角色"
-
-msgid "New role"
-msgstr "新的角色"
-
-msgid "Old key"
-msgstr "舊的設定鍵"
-
-msgid "Old value"
-msgstr "舊的數值"
-
-msgid "New key"
-msgstr "新的設定鍵"
-
-msgid "New value"
-msgstr "新的數值"
-
msgid "Apply selected changes"
msgstr "套用選取的變更"
@@ -4122,6 +4116,9 @@ msgstr ""
msgid "Route relation contains a gap"
msgstr ""
+msgid "Stop position not part of route"
+msgstr ""
+
msgid "Role verification problem"
msgstr "角色驗證問題"
@@ -4398,7 +4395,7 @@ msgid "waterway type {0}"
msgstr "水路類型 {0}"
msgid "boundary type {0}"
-msgstr ""
+msgstr "邊界類型 {0}"
msgid "building"
msgstr "建築"
@@ -4768,6 +4765,12 @@ msgstr ""
msgid "Initializing"
msgstr "初始化"
+msgid "Setting defaults"
+msgstr "設定預設值"
+
+msgid "Creating main GUI"
+msgstr "建立主視窗中"
+
msgid "Updating plugins"
msgstr "更新外掛程式"
@@ -4777,12 +4780,6 @@ msgstr "正在安裝更新的外掛程式"
msgid "Loading early plugins"
msgstr "載入較早的外掛程式"
-msgid "Setting defaults"
-msgstr "設定預設值"
-
-msgid "Creating main GUI"
-msgstr "建立主視窗中"
-
msgid "Loading plugins"
msgstr "正在載入外掛程式"
@@ -4851,56 +4848,56 @@ msgstr ""
msgctxt "menu"
msgid "File"
-msgstr ""
+msgstr "檔案"
msgctxt "menu"
msgid "Edit"
-msgstr ""
+msgstr "編輯"
msgctxt "menu"
msgid "View"
-msgstr ""
+msgstr "檢視"
msgctxt "menu"
msgid "Tools"
-msgstr ""
+msgstr "工具"
msgctxt "menu"
msgid "More tools"
-msgstr ""
+msgstr "更多工具"
msgctxt "menu"
msgid "Data"
-msgstr ""
+msgstr "資料"
msgctxt "menu"
msgid "Selection"
-msgstr ""
+msgstr "選擇"
msgctxt "menu"
msgid "Presets"
-msgstr ""
+msgstr "預設組合"
msgid "More..."
-msgstr ""
+msgstr "更多..."
msgctxt "menu"
msgid "GPS"
-msgstr ""
+msgstr "GPS"
msgctxt "menu"
msgid "Windows"
-msgstr ""
+msgstr "視窗"
msgctxt "menu"
msgid "Help"
-msgstr ""
+msgstr "說明"
msgid "Menu: {0}"
msgstr "選單：{0}"
msgid "Main toolbar"
-msgstr ""
+msgstr "說明"
msgid ""
"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
@@ -4926,7 +4923,7 @@ msgstr "點選以開啟偏好設定的圖片分頁"
msgctxt "menu"
msgid "Audio"
-msgstr ""
+msgstr "聲音"
msgid "Do not hide toolbar"
msgstr ""
@@ -5744,6 +5741,30 @@ msgstr "只顯示有衝突的標籤"
msgid "Show tags with multiple values only"
msgstr "只顯示有多個數值的標籤"
+msgid "Apply?"
+msgstr "是否接受？"
+
+msgid "Relation"
+msgstr "關係"
+
+msgid "Old role"
+msgstr "舊的角色"
+
+msgid "New role"
+msgstr "新的角色"
+
+msgid "Old key"
+msgstr "舊的設定鍵"
+
+msgid "Old value"
+msgstr "舊的數值"
+
+msgid "New key"
+msgstr "新的設定鍵"
+
+msgid "New value"
+msgstr "新的數值"
+
msgid "For selected objects only"
msgstr "只用於選取的物件"
@@ -6233,51 +6254,6 @@ msgstr ""
msgid "Open a list of all loaded layers."
msgstr "開啟所有載入圖層的清單。"
-msgid "Delete the selected layers."
-msgstr "刪除選取的圖層。"
-
-msgid "Show/hide"
-msgstr ""
-
-msgid "Toggle visible state of the selected layer."
-msgstr "切換選取的圖層可見性狀態。"
-
-msgid "Show/hide layer"
-msgstr ""
-
-msgid "Opacity"
-msgstr "透明度"
-
-msgid "Adjust opacity of the layer."
-msgstr "調整圖層的透明度。"
-
-msgid "Gamma"
-msgstr ""
-
-msgid "Adjust gamma value of the layer."
-msgstr ""
-
-msgid "Activate"
-msgstr "使用"
-
-msgid "Activate the selected layer"
-msgstr "使用選取的圖層"
-
-msgid "Activate layer"
-msgstr ""
-
-msgid "Merge this layer into another layer"
-msgstr "將這個圖層合併至另一個圖層"
-
-msgid "Duplicate this layer"
-msgstr "重製這個圖層"
-
-msgid "Copy of {0}"
-msgstr "{0} 的複本"
-
-msgid "Copy {1} of {0}"
-msgstr "{0} 的複本 {1}"
-
msgid "layer is currently visible (click to hide layer)"
msgstr "圖層目前為顯示（點選以隱藏圖層）"
@@ -6300,12 +6276,6 @@ msgstr ""
msgid "this layer has no native resolution"
msgstr ""
-msgid "Move the selected layer one row up."
-msgstr "將選取的圖層上移一列。"
-
-msgid "Move the selected layer one row down."
-msgstr "將選取的圖層下移一列。"
-
msgid "Information about layer"
msgstr "關於圖層的資訊"
@@ -6729,15 +6699,6 @@ msgstr "關閉於"
msgid "Discussions"
msgstr ""
-msgid "Downloading changeset content"
-msgstr "下載變更組合內容"
-
-msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) 正在下載變更組合 {2}..."
-
-msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) 正在下載變更組合 {2} 的內容..."
-
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
"''{0}''.</html>"
@@ -6842,9 +6803,6 @@ msgstr ""
msgid "Date"
msgstr "日期"
-msgid "Download changesets"
-msgstr "下載變更組合"
-
msgid "{0} [incomplete]"
msgstr "{0} [未完成]"
@@ -6996,14 +6954,6 @@ msgid "Please enter an integer value > 0"
msgstr "請輸入大於 0 的整數值"
msgid ""
-"<html>The current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
-msgstr "<html>目前的數值不是有效的使用者名稱。<br>請輸入非空白的使用者名稱。</html>"
-
-msgid "Please enter an non-empty user name"
-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>"
@@ -7090,31 +7040,91 @@ msgstr "不合法的變更組合查詢 URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "關閉此對話盒並放棄變更組合的查詢"
-msgid "Querying and downloading changesets"
-msgstr "查詢並下載變更組合"
+msgid "URL: "
+msgstr "URL: "
-msgid "Determine user id for current user..."
-msgstr "判斷目前使用者的 id..."
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr "請輸入或貼上從 OSM API 取回變更組合的 URL。"
-msgid "Query and download changesets ..."
-msgstr "查詢並下載變更組合..."
+msgid "Examples"
+msgstr "範例"
-msgid "URL: "
-msgstr "URL: "
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr "請注意變更組合查詢目前永遠送出到「{0}」，不管下列輸入的 URL 路徑、主機和連接埠。"
+
+msgid "This changeset query URL is invalid"
+msgstr "這個變更組合查詢 URL 是無效的"
+
+msgid "Activate"
+msgstr "使用"
+
+msgid "Activate the selected layer"
+msgstr "使用選取的圖層"
+
+msgid "Activate layer"
+msgstr ""
+
+msgid "Delete the selected layers."
+msgstr "刪除選取的圖層。"
+
+msgid "Duplicate this layer"
+msgstr "重製這個圖層"
+
+msgid "Copy of {0}"
+msgstr "{0} 的複本"
+
+msgid "Copy {1} of {0}"
+msgstr "{0} 的複本 {1}"
+
+msgid "Change visibility of the selected layer."
+msgstr ""
+
+msgid "Show layer"
+msgstr ""
+
+msgid "Adjust opacity of the layer."
+msgstr "調整圖層的透明度。"
+
+msgid "Opacity"
+msgstr "透明度"
+
+msgid "Adjust gamma value of the layer."
+msgstr ""
+
+msgid "Gamma"
+msgstr ""
+
+msgid "Adjust sharpness/blur value of the layer."
+msgstr ""
+
+msgid "Sharpness"
+msgstr ""
+
+msgid "Adjust colorfulness of the layer."
+msgstr ""
+
+msgid "Colorfulness"
+msgstr ""
+
+msgid "Merge this layer into another layer"
+msgstr "將這個圖層合併至另一個圖層"
+
+msgid "Move the selected layer one row down."
+msgstr "將選取的圖層下移一列。"
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
-msgstr "請輸入或貼上從 OSM API 取回變更組合的 URL。"
+msgid "Move the selected layer one row up."
+msgstr "將選取的圖層上移一列。"
-msgid "Examples"
-msgstr "範例"
+msgid "Show/hide"
+msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
-msgstr "請注意變更組合查詢目前永遠送出到「{0}」，不管下列輸入的 URL 路徑、主機和連接埠。"
+msgid "Toggle visible state of the selected layer."
+msgstr "切換選取的圖層可見性狀態。"
-msgid "This changeset query URL is invalid"
-msgstr "這個變更組合查詢 URL 是無效的"
+msgid "Show/hide layer"
+msgstr ""
msgid "Discardable key: selection Foreground"
msgstr ""
@@ -7423,12 +7433,12 @@ msgstr "上層關係"
msgid "Child Relations"
msgstr "子關係"
-msgid "Apply Role:"
-msgstr "套用角色："
-
msgid "Enter a role and apply it to the selected relation members"
msgstr "輸入一個角色並將它套用至選取的關係成員"
+msgid "Apply Role:"
+msgstr "套用角色："
+
msgid "New Relation"
msgstr "新關係"
@@ -9097,9 +9107,6 @@ msgstr "圖片淡出"
msgid "Unsupported imagery type: {0}"
msgstr ""
-msgid "ERROR"
-msgstr "錯誤"
-
msgid "Next marker"
msgstr "下個標記"
@@ -9913,12 +9920,6 @@ msgstr "再次執行自動授權步驟"
msgid "Test Access Token"
msgstr "測試存取記號"
-msgid "Please enter your OSM user name"
-msgstr "請輸入您的 OSM 使用者名稱"
-
-msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "使用者名稱不能為空白。請輸入您的 OSM 使用者名稱"
-
msgid "Please enter your OSM password"
msgstr "請輸入您的 OSM 密碼"
@@ -11353,7 +11354,7 @@ msgstr ""
"width=600>錯誤為：{1}</table></html>"
msgid "Sort presets menu alphabetically"
-msgstr ""
+msgstr "依字母順序排序預設組合選單"
msgid "Tagging Presets"
msgstr "加上預先組合標籤"
@@ -11963,6 +11964,12 @@ msgstr "連線設定值"
msgid "Connection Settings for the OSM server."
msgstr "OSM 伺服器的連線設定值。"
+msgid "Please enter your OSM user name"
+msgstr "請輸入您的 OSM 使用者名稱"
+
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "使用者名稱不能為空白。請輸入您的 OSM 使用者名稱"
+
msgid "Action"
msgstr "動作"
@@ -12230,7 +12237,7 @@ msgid "Presets"
msgstr "預設組合"
msgid "Search for objects by preset..."
-msgstr ""
+msgstr "依預設組合搜尋物件..."
msgid "Search for objects by preset"
msgstr "依預設組合搜尋物件"
@@ -12473,6 +12480,14 @@ msgid ""
"capabilities. Got ''{2}''"
msgstr ""
+msgid ""
+"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
+"{1}, was {2}"
+msgstr ""
+
+msgid "Adding certificate for TLS connections: {0}"
+msgstr ""
+
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "解析伺服器回覆的日期「{0}」。"
@@ -13714,62 +13729,6 @@ msgstr "未指定的原因"
msgid "Error playing sound"
msgstr "播放音效時發生錯誤"
-msgid "Do nothing"
-msgstr "不做任何事"
-
-msgid "Report Bug"
-msgstr "回報程式錯誤"
-
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr "發生未預期的例外。<br>這通常是程式碼的錯誤。如果您使用的是最新版的<br>JOSM，請考慮不吝回報錯誤。"
-
-msgid "Update JOSM"
-msgstr ""
-
-msgid ""
-"An unexpected exception occurred. This is always a coding "
-"error.<br><br>However, you are running an old version of JOSM "
-"({0}),<br>instead of using the current tested version "
-"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
-"bug report."
-msgstr ""
-
-msgid "Unexpected Exception"
-msgstr "未預期的例外"
-
-msgid "Suppress further error dialogs for this session."
-msgstr ""
-
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
-msgstr "您遇到了 JOSM 的錯誤。在您回報錯誤之前請確定您已更新到在這裡最新版的 JOSM："
-
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
-msgstr "您也應該更新您的外掛程式。如果這些都沒有幫助，請在以下連結的錯誤追蹤程式回報錯誤："
-
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
-msgstr "下面提供了錯誤訊息已為您填好。請加上關於如何重現這個錯誤的資訊，並儘可能詳細一些。"
-
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
-msgstr "另外，如果這些都不行您也可以在這個 URL 自行填寫資訊："
-
-msgid "(The text has already been copied to your clipboard.)"
-msgstr "（該文字已複製到您的剪貼簿中。）"
-
-msgid "You have encountered a bug in JOSM"
-msgstr "您遇到了 JOSM 的程式錯誤"
-
msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
@@ -14034,9 +13993,6 @@ msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
-msgid "Fetching content..."
-msgstr ""
-
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "找不到地區設定 {0} 的翻譯檔。回復為 {1}。"
@@ -14221,6 +14177,66 @@ msgstr ""
msgid "Failed to load XML schema."
msgstr "無法載入 XML schema。"
+msgid "Do nothing"
+msgstr "不做任何事"
+
+msgid "Report Bug"
+msgstr "回報程式錯誤"
+
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr "發生未預期的例外。<br>這通常是程式碼的錯誤。如果您使用的是最新版的<br>JOSM，請考慮不吝回報錯誤。"
+
+msgid "Update JOSM"
+msgstr ""
+
+msgid ""
+"An unexpected exception occurred. This is always a coding "
+"error.<br><br>However, you are running an old version of JOSM "
+"({0}),<br>instead of using the current tested version "
+"(<b>{1}</b>).<br><br><b>Please update JOSM</b> before considering to file a "
+"bug report."
+msgstr ""
+
+msgid "Suppress further error dialogs for this session."
+msgstr ""
+
+msgid "Unexpected Exception"
+msgstr "未預期的例外"
+
+msgid "You have encountered a bug in JOSM"
+msgstr "您遇到了 JOSM 的程式錯誤"
+
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr "您遇到了 JOSM 的錯誤。在您回報錯誤之前請確定您已更新到在這裡最新版的 JOSM："
+
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr "您也應該更新您的外掛程式。如果這些都沒有幫助，請在以下連結的錯誤追蹤程式回報錯誤："
+
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr "下面提供了錯誤訊息已為您填好。請加上關於如何重現這個錯誤的資訊，並儘可能詳細一些。"
+
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr "另外，如果這些都不行您也可以在這個 URL 自行填寫資訊："
+
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "（該文字已複製到您的剪貼簿中。）"
+
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
@@ -14547,7 +14563,7 @@ msgid "Bing aerial imagery"
msgstr "Bing 航空圖片"
msgid "HDM (Humanitarian OpenStreetMap Team)"
-msgstr ""
+msgstr "人道救援開放街圖小組"
msgid "Mapbox Satellite"
msgstr "Mapbox 衛星圖"
@@ -14555,13 +14571,13 @@ msgstr "Mapbox 衛星圖"
msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OpenStreetMap GPS Traces"
+msgid "OpenCycleMap"
msgstr ""
-msgid "OpenStreetMap (Standard layer)"
+msgid "OpenSeaMap"
msgstr ""
-msgid "skobbler"
+msgid "OpenStreetMap Carto (Standard layer)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
@@ -14570,35 +14586,38 @@ msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr ""
-msgid "OpenCycleMap"
+msgid "OpenStreetMap (French Style)"
msgstr ""
-msgid "MapQuest OSM"
+msgid "OpenStreetMap (German Style)"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
+msgid "MapQuest OSM"
+msgstr "MapQuest OSM"
+
msgid "Public Transport (ÖPNV)"
msgstr "大眾運輸 (ÖPNV)"
msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (German Style)"
-msgstr ""
+msgid "skobbler"
+msgstr "skobbler"
msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "osmfr"
-msgstr ""
-
msgid "OpenPT Map (overlay)"
-msgstr ""
+msgstr "OpenPT Map (重疊)"
msgid "Strava cycling heatmap"
-msgstr ""
+msgstr "Strava單車熱力圖"
msgid "Strava running heatmap"
-msgstr ""
+msgstr "Strava跑步熱力圖"
msgid "Locator Overlay"
msgstr ""
@@ -14687,6 +14706,9 @@ msgstr ""
msgid "basemap.at Orthofoto"
msgstr ""
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14711,13 +14733,13 @@ msgstr ""
msgid "VoGIS: Echtfarbenbild Winter 2015 (20cm)"
msgstr ""
-msgid "VoGIS: Flächenwidmungsplan"
+msgid "VoGIS: Echtfarbenbild 2015 (10cm)"
msgstr ""
-msgid "VoGIS: DGM (Terrain model)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "VoGIS: DOM (Surface model)"
+msgid "VoGIS: Höhen und Gelände"
msgstr ""
msgid "AGIV(laanderen) aerial imagery (covers Brussels region as well)"
@@ -14864,10 +14886,10 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Lyon - Orthophoto 2012 10cm"
+msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
msgstr ""
-msgid "Lyon - Orthophoto 2015 16cm - EPSG:3946"
+msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
msgstr ""
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
@@ -14920,29 +14942,28 @@ msgstr ""
msgid "Bavaria (2 m)"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
+msgid "Berlin aerial photograph 2011"
msgstr ""
-msgid "Erlangen aerial imagery (2013 6.25 cm)"
+msgid "Berlin aerial photograph 2014"
msgstr ""
-msgid "Erlangen 2011 aerial imagery (5.0 cm)"
+msgid "Berlin aerial photograph 2015"
msgstr ""
-msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgid "Stuttgart (aerial imagery)"
msgstr ""
-msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr ""
-msgid "Physical DE - Physical map (natural regions)"
+msgid "Erlangen 2011 aerial imagery (5.0 cm)"
msgstr ""
-msgid "Physical DE:Harz - Physical map (natural regions)"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid ""
-"Physical DE:Harz - Overlay for Bing (e.g. use opacity between 20% and 50%)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
@@ -14990,6 +15011,9 @@ msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
+msgid "Törökbálint ortophoto 2015"
+msgstr ""
+
msgid "Danube flood ortophoto 2013"
msgstr ""
@@ -15050,6 +15074,9 @@ msgstr ""
msgid "Lodi - Italy"
msgstr ""
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
msgid "Lombardia - Italy (CTR DBT)"
msgstr ""
@@ -15086,10 +15113,7 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "Luxembourg Inspire Ortho 2010"
-msgstr ""
-
-msgid "Luxembourg Inspire Ortho 2013"
+msgid "geoportail.lu"
msgstr ""
msgid "Luxembourg Inspire Railway"
@@ -15191,6 +15215,9 @@ msgstr ""
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr ""
+msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgstr ""
+
msgid "Powiat rzeszowski: Budynki (buildings)"
msgstr ""
@@ -15200,6 +15227,9 @@ msgstr ""
msgid "Powiat stalowowolski: Budynki (buildings)"
msgstr ""
+msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgstr ""
+
msgid "Przemyśl: Budynki (buildings)"
msgstr ""
@@ -15366,19 +15396,19 @@ msgid "Fiez Orthophoto 2013"
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 ""
+msgstr "國土測繪中心開放資料版WMTS"
msgid "MSR Maps Topo"
msgstr ""
@@ -15684,7 +15714,7 @@ msgid "OS Town Plans, Wigtown 1894 (NLS)"
msgstr ""
msgid "Landsat 233055"
-msgstr ""
+msgstr "Landsat 233055"
msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -15857,6 +15887,11 @@ msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
msgid ""
+"Gives assistance for the mapping process of indoor OSM building data. "
+"Includes a validator and a mappaint style for indoor-data."
+msgstr ""
+
+msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr "關於目前圖層物件的彈出選項額外資訊 - 目前的 GPX 軌跡點資訊"
@@ -16231,7 +16266,7 @@ msgstr ""
msgctxt "riding"
msgid "pitch"
-msgstr ""
+msgstr "球場"
msgctxt "riding"
msgid "sports_centre"
@@ -16374,7 +16409,7 @@ msgstr "16.7"
msgctxt "railway"
msgid "Tracks"
-msgstr ""
+msgstr "跑道"
msgid "Gauge (mm)"
msgstr "軌距 (mm)"
@@ -16398,7 +16433,7 @@ msgid "Operator"
msgstr "經營者"
msgid "Service Times"
-msgstr ""
+msgstr "服務時間"
msgid "Opening Hours"
msgstr "開放時間"
@@ -16407,7 +16442,7 @@ msgid "Wheelchairs"
msgstr "輪椅"
msgid "limited"
-msgstr ""
+msgstr "限制"
msgid "Brand"
msgstr "品牌"
@@ -16464,52 +16499,52 @@ msgid "sandwich"
msgstr "三明治"
msgid "coffee_shop"
-msgstr ""
+msgstr "咖啡店"
msgid "sushi"
msgstr "壽司"
msgid "steak_house"
-msgstr ""
+msgstr "牛排館"
msgid "fish_and_chips"
-msgstr ""
+msgstr "魚和炸物"
msgid "chicken"
-msgstr ""
+msgstr "雞內"
msgid "american"
-msgstr ""
+msgstr "美式"
msgid "ice_cream"
msgstr "冰淇淋"
msgid "international"
-msgstr ""
+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 ""
+msgstr "素食"
msgid "korean"
-msgstr ""
+msgstr "韓式"
msgid "Internet access"
msgstr "附設網際網路"
@@ -16539,7 +16574,7 @@ msgid "isolated"
msgstr "分離"
msgid "outside"
-msgstr ""
+msgstr "室外"
msgid "Height (meters)"
msgstr "高度（米）"
@@ -16551,7 +16586,7 @@ msgid "Max. height (meters)"
msgstr "最大高度 (公尺)"
msgid "pitch"
-msgstr ""
+msgstr "球場"
msgid "sports_centre"
msgstr "運動中心"
@@ -16564,55 +16599,55 @@ 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"
-msgstr ""
+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"
-msgstr ""
+msgstr "滾球"
msgctxt "sport"
msgid "bowls"
-msgstr ""
+msgstr "保齡球"
msgctxt "sport"
msgid "canadian_football"
-msgstr ""
+msgstr "加拿大式足球"
msgctxt "sport"
msgid "canoe"
-msgstr ""
+msgstr "泛舟"
msgctxt "sport"
msgid "climbing"
@@ -16620,55 +16655,55 @@ msgstr "攀岩"
msgctxt "sport"
msgid "cricket"
-msgstr ""
+msgstr "板球"
msgctxt "sport"
msgid "croquet"
-msgstr ""
+msgstr "槌球"
msgctxt "sport"
msgid "cycling"
-msgstr ""
+msgstr "競速單車"
msgctxt "sport"
msgid "dog_racing"
-msgstr ""
+msgstr "賽狗"
msgctxt "sport"
msgid "equestrian"
-msgstr ""
+msgstr "馬術"
msgctxt "sport"
msgid "field_hockey"
-msgstr ""
+msgstr "曲棍球"
msgctxt "sport"
msgid "gaelic_games"
-msgstr ""
+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"
@@ -16692,7 +16727,7 @@ msgstr ""
msgctxt "sport"
msgid "rc_car"
-msgstr ""
+msgstr "賽車"
msgctxt "sport"
msgid "rugby_league"
@@ -16704,7 +16739,7 @@ msgstr ""
msgctxt "sport"
msgid "running"
-msgstr ""
+msgstr "跑步"
msgctxt "sport"
msgid "safety_training"
@@ -16728,7 +16763,7 @@ msgstr ""
msgctxt "sport"
msgid "soccer"
-msgstr ""
+msgstr "足球"
msgctxt "sport"
msgid "swimming"
@@ -16736,35 +16771,35 @@ msgstr ""
msgctxt "sport"
msgid "table_tennis"
-msgstr ""
+msgstr "桌球"
msgctxt "sport"
msgid "tennis"
-msgstr ""
+msgstr "網球"
msgctxt "sport"
msgid "volleyball"
-msgstr ""
+msgstr "排球"
msgctxt "sport"
msgid "9pin"
-msgstr ""
+msgstr "9號球"
msgctxt "sport"
msgid "10pin"
-msgstr ""
+msgstr "10號球"
msgid "Fee"
msgstr "費用"
msgid "06:00-20:00"
-msgstr ""
+msgstr "06:00-20:00"
msgid "Mo-Fr 09:00-18:00,Sa 08:00-14:00"
-msgstr ""
+msgstr "週一-週五 09:00-18:00,週六 08:00-14:00"
msgid "May-Sep 09:30-12:30,14:15-19:30"
-msgstr ""
+msgstr "五月-九月 09:30-12:30,14:15-19:30"
msgctxt "parking"
msgid "multi-storey"
@@ -16810,7 +16845,7 @@ msgid "destination"
msgstr "目的地"
msgid "delivery"
-msgstr ""
+msgstr "送貨通道"
msgid "agricultural"
msgstr "農業的"
@@ -16819,7 +16854,7 @@ msgid "forestry"
msgstr "林業"
msgid "Population"
-msgstr ""
+msgstr "人口"
msgid "Post code"
msgstr "郵遞區號"
@@ -16828,7 +16863,7 @@ msgid "Website"
msgstr "網站"
msgid "Distance (km)"
-msgstr ""
+msgstr "距離 (km)"
msgid "Ascent (m)"
msgstr ""
@@ -17214,6 +17249,12 @@ msgstr "街道"
msgid "Motorway"
msgstr "高速公路(Motorway)"
+msgid "Destination"
+msgstr ""
+
+msgid "Destination reference"
+msgstr ""
+
msgid "Placement"
msgstr ""
@@ -17790,9 +17831,6 @@ msgstr "高速公路交流道"
msgid "Number"
msgstr "編號"
-msgid "Exit to"
-msgstr ""
-
msgid "Services"
msgstr "休息站"
@@ -18271,6 +18309,15 @@ msgstr ""
msgid "mangrove"
msgstr "紅樹林"
+msgid "wet_meadow"
+msgstr ""
+
+msgid "string_bog"
+msgstr ""
+
+msgid "saltern"
+msgstr ""
+
msgid "Mud"
msgstr "泥地"
@@ -19419,6 +19466,9 @@ msgstr ""
msgid "Fishing"
msgstr "釣魚"
+msgid "Bird Hide"
+msgstr ""
+
msgid "Night Club"
msgstr "夜店"
@@ -19644,7 +19694,7 @@ msgid "Public Building"
msgstr "公共建築"
msgid "Town Hall"
-msgstr ""
+msgstr "城鎮大樓"
msgid "Community Centre"
msgstr "活動中心"
@@ -19662,7 +19712,7 @@ msgid "Police"
msgstr "警察局"
msgid "Ranger Station"
-msgstr ""
+msgstr "護林員工作站"
msgid "Fire Station"
msgstr "消防隊"
@@ -19692,10 +19742,10 @@ msgid "License Classes"
msgstr "駕照類別"
msgid "A;A1;B;BE;C"
-msgstr ""
+msgstr "A;A1;B;BE;C"
msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
-msgstr ""
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
msgid "Health"
msgstr "健康"
@@ -19707,7 +19757,7 @@ msgid "Clinic"
msgstr "診所"
msgid "Doctor''s Office"
-msgstr ""
+msgstr "醫師辦公室"
msgid "Dentist"
msgstr "牙醫"
@@ -19719,7 +19769,7 @@ msgid "Dispensing"
msgstr "配藥"
msgid "Baby Hatch/Safe Haven"
-msgstr ""
+msgstr "棄嬰保護艙/安全天堂"
msgid "Emergency Access Point"
msgstr "緊急連絡點"
@@ -19740,16 +19790,16 @@ msgid "Veterinary"
msgstr "獸醫"
msgid "Emergency"
-msgstr ""
+msgstr "急診"
msgid "Ambulance Station"
-msgstr ""
+msgstr "救護站"
msgid "Automated Defibrillator"
-msgstr ""
+msgstr "自動心臟去顫器"
msgid "Located inside a building?"
-msgstr ""
+msgstr "位於建築裡面？"
msgid "Last check date (YYYY-MM-DD)"
msgstr ""
@@ -20164,10 +20214,10 @@ msgid "Regina"
msgstr ""
msgid "Advertising Column"
-msgstr ""
+msgstr "廣告欄位"
msgid "Billboard"
-msgstr ""
+msgstr "公告版"
msgid "Sports"
msgstr "運動用品"
@@ -20182,7 +20232,7 @@ msgid "Sports Centre"
msgstr "運動中心"
msgid "Pitch"
-msgstr ""
+msgstr "球場"
msgid "artificial_turf"
msgstr ""
@@ -20204,53 +20254,53 @@ msgstr "高爾夫路線"
msgctxt "golf"
msgid "Tee"
-msgstr ""
+msgstr "開球球座"
msgctxt "golf"
msgid "Hole"
-msgstr ""
+msgstr "球洞"
msgid "Par"
-msgstr ""
+msgstr "桿"
msgid "Handicap rating"
-msgstr ""
+msgstr "差點等級"
msgctxt "golf"
msgid "Pin"
-msgstr ""
+msgstr "旗桿"
msgctxt "golf"
msgid "Bunker"
-msgstr ""
+msgstr "障礙物"
msgctxt "golf"
msgid "Natural"
-msgstr ""
+msgstr "自然"
msgctxt "golf"
msgid "Frontal Water hazard"
-msgstr ""
+msgstr "正面水障礙"
msgctxt "golf"
msgid "Lateral water hazard"
-msgstr ""
+msgstr "側面水障礙"
msgctxt "golf"
msgid "Green"
-msgstr ""
+msgstr "果嶺"
msgctxt "golf"
msgid "Fairway"
-msgstr ""
+msgstr "球道"
msgctxt "golf"
msgid "Rough"
-msgstr ""
+msgstr "亂草區"
msgctxt "golf"
msgid "Driving range"
-msgstr ""
+msgstr "練習場"
msgid "Miniature Golf"
msgstr "迷你高爾夫"
@@ -20260,56 +20310,56 @@ msgstr "多種"
msgctxt "running"
msgid "pitch"
-msgstr ""
+msgstr "球場"
msgctxt "running"
msgid "sports_centre"
-msgstr ""
+msgstr "運動中心"
msgctxt "running"
msgid "stadium"
-msgstr ""
+msgstr "體育館"
msgctxt "running"
msgid "track"
-msgstr ""
+msgstr "跑道"
msgid "Nine-pin Bowling"
-msgstr ""
+msgstr "9號球撞球"
msgid "Ten-pin Bowling"
-msgstr ""
+msgstr "10號球撞球"
msgid "Archery"
msgstr "射箭"
msgid "Track and Field Athletics"
-msgstr ""
+msgstr "田徑場"
msgid "Running"
-msgstr ""
+msgstr "跑步"
msgid "Climbing"
msgstr "攀岩"
msgid "Canoeing/Kayaking"
-msgstr ""
+msgstr "獨木舟/皮划艇"
msgctxt "racing"
msgid "pitch"
-msgstr ""
+msgstr "球場"
msgctxt "racing"
msgid "sports_centre"
-msgstr ""
+msgstr "運動中心"
msgctxt "racing"
msgid "stadium"
-msgstr ""
+msgstr "體育館"
msgctxt "racing"
msgid "track"
-msgstr ""
+msgstr "跑道"
msgid "Dog Racing"
msgstr "賽狗"
@@ -20324,13 +20374,13 @@ msgid "Gymnastics"
msgstr "體操"
msgid "Ice Skating"
-msgstr ""
+msgstr "溜冰"
msgid "ice_rink"
-msgstr ""
+msgstr "溜冰場"
msgid "Roller Skating"
-msgstr ""
+msgstr "直排輪"
msgid "Skateboard"
msgstr "滑板"
@@ -20339,13 +20389,13 @@ msgid "Swimming"
msgstr "游泳"
msgid "swimming_pool"
-msgstr ""
+msgstr "游泳池"
msgid "water_park"
-msgstr ""
+msgstr "水上樂園"
msgid "Scuba Diving"
-msgstr ""
+msgstr "浮潛"
msgid "Piste type"
msgstr ""
@@ -20441,19 +20491,19 @@ msgid "Canadian Football"
msgstr "加拿大足球"
msgid "Gaelic Games"
-msgstr ""
+msgstr "蓋爾式運動"
msgid "Hurling"
-msgstr ""
+msgstr "投擲"
msgid "Football"
-msgstr ""
+msgstr "足球"
msgid "Camogie"
-msgstr ""
+msgstr "愛爾蘭式曲棍球"
msgid "Rounders"
-msgstr ""
+msgstr "繞圈球"
msgid "Rugby League"
msgstr ""
@@ -20687,6 +20737,10 @@ msgid "transformer_tower"
msgstr ""
msgctxt "building"
+msgid "public"
+msgstr ""
+
+msgctxt "building"
msgid "Levels"
msgstr ""
@@ -21926,13 +21980,13 @@ msgid "Castle"
msgstr "城堡"
msgid "Archaeological Site"
-msgstr "考古學地區"
+msgstr "考古遺址"
msgid "Battlefield"
msgstr "戰場"
msgid "Palaeontological Site"
-msgstr ""
+msgstr "古生物遺址"
msgid "Monument"
msgstr "紀念建築"
@@ -21962,7 +22016,7 @@ msgstr ""
msgctxt "memorial"
msgid "war_memorial"
-msgstr ""
+msgstr "戰爭紀念碑"
msgid "Inscription"
msgstr ""
@@ -21974,7 +22028,7 @@ msgid "Wayside Shrine"
msgstr ""
msgid "Place of worship"
-msgstr ""
+msgstr "宗教崇拜場所"
msgctxt "building"
msgid "wayside_shrine"
@@ -22014,19 +22068,19 @@ msgid "Candy Store"
msgstr ""
msgid "Tea"
-msgstr ""
+msgstr "荼"
msgid "Coffee"
-msgstr ""
+msgstr "咖啡"
msgid "Public Market"
-msgstr ""
+msgstr "公有市場"
msgid "Organic"
msgstr "有機產品"
msgid "Greengrocer"
-msgstr ""
+msgstr "生鮮食品"
msgid "Farm Stand"
msgstr ""
@@ -22086,10 +22140,10 @@ msgid "Video"
msgstr "影片類"
msgid "Video Games"
-msgstr ""
+msgstr "電子遊戲類"
msgid "Music"
-msgstr ""
+msgstr "音樂類"
msgid "Cash"
msgstr "現金"
@@ -22104,7 +22158,7 @@ msgid "Money Exchange"
msgstr "金錢兌換所"
msgid "Pawnbroker"
-msgstr ""
+msgstr "地下錢莊"
msgid "Home decoration"
msgstr ""
@@ -22131,7 +22185,7 @@ msgid "Bed"
msgstr ""
msgid "Interior Decoration"
-msgstr ""
+msgstr "室內設計"
msgid "Antiques"
msgstr ""
@@ -22143,7 +22197,7 @@ msgid "Stationery"
msgstr "文具類"
msgid "Copy Shop"
-msgstr ""
+msgstr "影印"
msgid "Book Store"
msgstr "書店"
@@ -22158,7 +22212,7 @@ msgid "For the body"
msgstr ""
msgid "Chemist"
-msgstr ""
+msgstr "藥妝類"
msgid "Cosmetics"
msgstr ""
@@ -22176,19 +22230,19 @@ msgid "Hairdresser/Barber"
msgstr ""
msgid "Tattoo"
-msgstr ""
+msgstr "刺青"
msgid "Optician"
msgstr "眼鏡類"
msgid "Hearing Aids"
-msgstr ""
+msgstr "助聽器"
msgid "Medical Supply"
-msgstr ""
+msgstr "醫療用品"
msgid "Jewellery"
-msgstr ""
+msgstr "珠寶"
msgid "Erotic"
msgstr "情趣用品"
@@ -22274,11 +22328,11 @@ msgstr ""
msgid "food"
msgstr "食物"
-msgid "news_papers"
-msgstr "報紙"
+msgid "newspapers"
+msgstr ""
msgid "parking_tickets"
-msgstr ""
+msgstr "停車繳費"
msgid "photos"
msgstr "相片"
@@ -22289,8 +22343,8 @@ msgstr ""
msgid "public_transport_tickets"
msgstr ""
-msgid "SIM-cards"
-msgstr "SIM-卡"
+msgid "SIM_cards"
+msgstr ""
msgid "stamps"
msgstr "郵票"
@@ -22332,7 +22386,7 @@ msgid "Maestro"
msgstr ""
msgid "Visa Debit"
-msgstr ""
+msgstr "Visa簽帳卡"
msgid "Visa Electron"
msgstr ""
@@ -22341,7 +22395,7 @@ msgid "Credit cards"
msgstr "信用卡"
msgid "American Express"
-msgstr ""
+msgstr "美國運通卡"
msgid "Diners Club"
msgstr ""
@@ -22350,13 +22404,13 @@ msgid "Discover Card"
msgstr ""
msgid "JCB"
-msgstr ""
+msgstr "JCM"
msgid "Mastercard"
-msgstr ""
+msgstr "Mastercard"
msgid "Visa"
-msgstr ""
+msgstr "Visa"
msgid "Electronic purses and Charge cards"
msgstr "電子錢包或收費卡"
@@ -23057,7 +23111,7 @@ msgid "Military"
msgstr "軍事"
msgid "Construction Area"
-msgstr ""
+msgstr "工地"
msgid "Brownfield"
msgstr ""
@@ -23075,28 +23129,28 @@ msgid "Annotation"
msgstr "註記"
msgid "Alternative name"
-msgstr ""
+msgstr "別名"
msgid "Historical name"
-msgstr ""
+msgstr "歷史名稱"
msgid "Local name"
-msgstr ""
+msgstr "在地名稱"
msgid "Regional name"
-msgstr ""
+msgstr "區域名稱"
msgid "National name"
-msgstr ""
+msgstr "國家名稱"
msgid "International name"
-msgstr ""
+msgstr "國際名稱"
msgid "Official name"
-msgstr ""
+msgstr "官方名稱"
msgid "Common name abbreviation"
-msgstr ""
+msgstr "常見名稱縮寫"
msgid "House number"
msgstr "門牌號碼"
@@ -23105,7 +23159,7 @@ msgid "Street name"
msgstr "街道名稱"
msgid "Place name"
-msgstr ""
+msgstr "地名"
msgid "City name"
msgstr "城市名稱"
@@ -23117,17 +23171,17 @@ msgid "House name"
msgstr "房屋名稱"
msgid "Subdistrict"
-msgstr ""
+msgstr "次分區"
msgid "District"
-msgstr ""
+msgstr "區"
msgid "Province"
-msgstr ""
+msgstr "省"
msgctxt "addr:"
msgid "State"
-msgstr ""
+msgstr "州"
msgid "AL"
msgstr ""
@@ -23500,10 +23554,10 @@ msgid "traffic light or barrier that stops you"
msgstr "會讓您停下的交通號誌或障礙物"
msgid "Routes"
-msgstr ""
+msgstr "路線"
msgid "Bicycle Route"
-msgstr ""
+msgstr "單車路線"
msgid "icn"
msgstr ""
@@ -23518,10 +23572,10 @@ msgid "lcn"
msgstr ""
msgid "Mountain Biking Route"
-msgstr ""
+msgstr "登山車路線"
msgid "Hiking Route"
-msgstr ""
+msgstr "登山路線"
msgid "iwn"
msgstr ""
@@ -23542,6 +23596,21 @@ msgid "natural"
msgstr "自然"
msgid "Walking Route"
+msgstr "健走路線"
+
+msgid "Riding Route"
+msgstr ""
+
+msgid "ihn"
+msgstr ""
+
+msgid "nhn"
+msgstr ""
+
+msgid "rhn"
+msgstr ""
+
+msgid "lhn"
msgstr ""
msgid "Piste Route"
@@ -23568,9 +23637,6 @@ msgstr ""
msgid "Detour Route"
msgstr ""
-msgid "Destination"
-msgstr ""
-
msgid "Ref of the way this is a detour to"
msgstr ""
@@ -23578,22 +23644,22 @@ msgid "fork node for alternative routes"
msgstr ""
msgid "Power Route"
-msgstr ""
+msgstr "輸電路線"
msgid "Railway Route"
msgstr ""
msgid "Road Route"
-msgstr ""
+msgstr "公路路線"
msgid "Route Network"
-msgstr ""
+msgstr "路線網路"
msgid "member"
msgstr "成員"
msgid "Associated Street"
-msgstr ""
+msgstr "關聯街道"
msgid "house"
msgstr ""
@@ -23730,7 +23796,13 @@ msgstr "露營"
msgid "Test"
msgstr "測試"
-msgid "Decreasing house numbers in addresses interpolation"
+msgid "Even housenumber in odd address interpolation."
+msgstr ""
+
+msgid "Odd housenumber in even address interpolation."
+msgstr ""
+
+msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
msgid "{0} without {1}"
@@ -23814,6 +23886,11 @@ msgid ""
"missing even without an additional tag."
msgstr ""
+msgid ""
+"{0} is unspecific. Instead use the key fixme with the information what "
+"exactly should be fixed in the value of fixme."
+msgstr ""
+
msgid "{0} is deprecated. Please use instead a multipolygon."
msgstr ""
@@ -23912,6 +23989,9 @@ msgstr ""
msgid "node connects waterway and bridge"
msgstr ""
+msgid "{0} node connected to a highway"
+msgstr ""
+
msgid "suspicious roundabout direction"
msgstr ""
@@ -23921,6 +24001,14 @@ msgstr ""
msgid "{0} on a small area"
msgstr ""
+msgid "Too large building"
+msgstr ""
+
+msgid ""
+"Node connects a power line or cable with an object which is not related to "
+"the power infrastructure."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -27091,6 +27179,66 @@ msgstr ""
msgid "Offset into background:"
msgstr ""
+msgid "Indoor Mapping Helper"
+msgstr ""
+
+msgid "POWER"
+msgstr ""
+
+msgid "Activates the plug-in"
+msgstr ""
+
+msgid "Working Level"
+msgstr ""
+
+msgid "Selects the working level."
+msgstr ""
+
+msgid "Level Name"
+msgstr ""
+
+msgid "Optional name-tag for a level."
+msgstr ""
+
+msgid "The object preset you want to tag."
+msgstr ""
+
+msgid "Sets the name tag when the room-object is selected."
+msgstr ""
+
+msgid "Sets the ref tag when the room-object is selected."
+msgstr ""
+
+msgid "Apply Tags"
+msgstr ""
+
+msgid "Fitting"
+msgstr ""
+
+msgid ""
+"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
+"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
+"management.</html>"
+msgstr ""
+
+msgid "Level Selection"
+msgstr ""
+
+msgid "Lowest Level"
+msgstr ""
+
+msgid "The lowest level of your building."
+msgstr ""
+
+msgid "Highest Level"
+msgstr ""
+
+msgid "The highest level of your building."
+msgstr ""
+
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -29415,6 +29563,15 @@ msgstr ""
msgid "Public Transport: Edit waypoint name"
msgstr ""
+msgid "Distance between stops"
+msgstr ""
+
+msgid "A valid public_transport:version=2 route is required"
+msgstr ""
+
+msgid "Invalid selection"
+msgstr "無效的選擇範圍"
+
msgid "Public transport routes"
msgstr ""
@@ -29464,7 +29621,7 @@ msgid "Always split ways of neighbouring multipolygons"
msgstr ""
msgid "Change role"
-msgstr ""
+msgstr "變更角色"
msgid "Enter role for selected members"
msgstr ""
@@ -29602,7 +29759,7 @@ msgid "Enter the ID of the changeset that should be reverted"
msgstr ""
msgid "Reverted changeset"
-msgstr ""
+msgstr "回退變更集"
msgid "It is not allowed to revert changeset from {0}"
msgstr ""
@@ -29629,7 +29786,7 @@ msgid "Remote Control has been asked to revert a changeset."
msgstr ""
msgid "Reverting..."
-msgstr ""
+msgstr "回退中..."
msgid ""
"This changeset has objects that are not present in current dataset.\n"
@@ -29637,19 +29794,19 @@ msgid ""
msgstr ""
msgid "Confirm"
-msgstr ""
+msgstr "確認"
msgid "Fetching missing primitives"
msgstr ""
msgid "Downloading changeset"
-msgstr ""
+msgstr "下載變更集中"
msgid "See {0}"
msgstr ""
msgid "Revert changeset #{0}"
-msgstr ""
+msgstr "回退變更集 #{0}"
msgid ""
"Warning: unsupported start element ''{0}'' in changeset content at position "
@@ -29671,7 +29828,7 @@ msgid "Change Properties"
msgstr "改變屬性"
msgid "Country preset:"
-msgstr ""
+msgstr "國家的預設組合"
msgid "Show all signs"
msgstr ""
@@ -30199,9 +30356,6 @@ msgstr "將建築連棟"
msgid "Creates individual buildings from a long building."
msgstr "從一長排建築中建立個別建築。"
-msgid "Invalid selection"
-msgstr "無效的選擇範圍"
-
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 "
@@ -30576,10 +30730,10 @@ msgid "Select as much as you like:"
msgstr "選擇您想要的："
msgid "Survey"
-msgstr ""
+msgstr "探察"
msgid "Aerial Photography"
-msgstr ""
+msgstr "空照圖"
msgid "Web Recherche"
msgstr ""
@@ -31909,25 +32063,25 @@ msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr ""
msgid "Category"
-msgstr ""
+msgstr "分類"
msgid "Fetches a list of all Wikipedia articles of a category"
msgstr ""
msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "輸入維基百科分類"
msgid "Clipboard"
-msgstr ""
+msgstr "剪貼簿"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "從系統剪貼簿貼上維基百科條目"
msgid "clipboard"
-msgstr ""
+msgstr "剪貼簿"
msgid "Open Article"
-msgstr ""
+msgstr "開啟條目"
msgid "Opens the Wikipedia article of the selected item in a browser"
msgstr ""
@@ -31936,7 +32090,7 @@ msgid "Sets the default language for the Wikipedia articles"
msgstr ""
msgid "Enter the Wikipedia language"
-msgstr ""
+msgstr "輸入維基百科語言"
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
@@ -31951,6 +32105,3 @@ msgstr ""
msgid "Drive a race car on this layer"
msgstr ""
-
-#~ msgid "xml"
-#~ msgstr "xml"
diff --git a/images/dialogs/layerlist/colorfulness.png b/images/dialogs/layerlist/colorfulness.png
new file mode 100644
index 0000000..490f35a
Binary files /dev/null and b/images/dialogs/layerlist/colorfulness.png differ
diff --git a/images/dialogs/layerlist/gamma.png b/images/dialogs/layerlist/gamma.png
index f67ada4..3afee11 100644
Binary files a/images/dialogs/layerlist/gamma.png and b/images/dialogs/layerlist/gamma.png differ
diff --git a/images/dialogs/layerlist/sharpness.png b/images/dialogs/layerlist/sharpness.png
new file mode 100644
index 0000000..b381935
Binary files /dev/null and b/images/dialogs/layerlist/sharpness.png differ
diff --git a/images/dialogs/layerlist/transparency.png b/images/dialogs/layerlist/transparency.png
index 3149c9d..0498ca1 100644
Binary files a/images/dialogs/layerlist/transparency.png and b/images/dialogs/layerlist/transparency.png differ
diff --git a/images/dialogs/layerlist/visibility.png b/images/dialogs/layerlist/visibility.png
new file mode 100644
index 0000000..dd019e8
Binary files /dev/null and b/images/dialogs/layerlist/visibility.png differ
diff --git a/images/dialogs/mappaint/josm_small.png b/images/dialogs/mappaint/josm_small.png
deleted file mode 100644
index b113325..0000000
Binary files a/images/dialogs/mappaint/josm_small.png and /dev/null differ
diff --git a/images/misc/showhide.png b/images/misc/showhide.png
deleted file mode 100644
index 3b4a7e6..0000000
Binary files a/images/misc/showhide.png and /dev/null differ
diff --git a/images/presets/bicycle_road.svg b/images/presets/bicycle_road.svg
deleted file mode 100644
index 7ebd3ae..0000000
--- a/images/presets/bicycle_road.svg
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="760"
- height="760"
- id="svg2"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="bicycle_road_sign_icon.svg">
- <title
- id="title3003">bicycle_road_sign_icon</title>
- <metadata
- id="metadata28">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title>bicycle_road_sign_icon</dc:title>
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
- <dc:creator>
- <cc:Agent>
- <dc:title>skyper</dc:title>
- </cc:Agent>
- </dc:creator>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- </cc:License>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1021"
- id="namedview26"
- showgrid="false"
- inkscape:zoom="0.62105263"
- inkscape:cx="-369.68442"
- inkscape:cy="327.45704"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" />
- <defs
- id="defs4" />
- <path
- inkscape:connector-curvature="0"
- id="rect2841"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.01799999999999979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0;opacity:1;stroke-dasharray:none"
- d="m 45.824811,3.3417118 667.440239,0 c 17.26431,0 44.40426,25.3658182 44.40426,44.6040572 l 0,663.062641 c 0,17.56106 -26.23171,45.64977 -47.01218,45.64977 l -662.224403,0 c -16.898243,0 -44.6781525,-25.29652 -44.6781525,-37.91916 l 0,-672.469767 c 0,-19.094699 22.7368545,-42.9275412 42.0702365,-42.9275412 z" />
- <path
- inkscape:connector-curvature="0"
- id="path1934"
- style="fill:none;stroke:#000000;stroke-width:17;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
- d="m 25.443662,52.632534 0,658.329506 c 0,15.81111 15.542175,24.19269 27.474772,24.19269 l 657.360006,-0.25172 c 11.21703,0 24.66493,-13.41694 24.66493,-25.92349 l 0,-654.891497 c 0.17207,-19.416771 -15.69419,-29.40446 -26.88735,-29.40446 l -654.202941,0.25171 c -19.69216,0 -28.409417,14.141544 -28.409417,27.697261 z" />
- <g
- id="g3093"
- transform="translate(-0.29929775,60.174376)">
- <path
- d="m 620.29687,319.82557 a 239.28563,239.28563 0 0 1 -478.57126,0 239.28563,239.28563 0 1 1 478.57126,0 z"
- style="fill:#003399;fill-opacity:1;fill-rule:nonzero;stroke:none"
- id="path1882"
- inkscape:connector-curvature="0" />
- <g
- id="g12681">
- <circle
- cx="215"
- cy="409"
- r="161"
- transform="matrix(0.404263,0,0,0.404263,177.6268,199.8607)"
- style="fill:none;stroke:#ffffff;stroke-width:40px;stroke-opacity:1"
- id="circle11777"
- sodipodi:cx="215"
- sodipodi:cy="409"
- sodipodi:rx="161"
- sodipodi:ry="161"
- d="m 376,409 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
- <circle
- cx="790"
- cy="406"
- r="161"
- transform="matrix(0.404263,0,0,0.404263,177.6268,199.8607)"
- style="fill:none;stroke:#ffffff;stroke-width:40px;stroke-opacity:1"
- id="circle11779"
- sodipodi:cx="790"
- sodipodi:cy="406"
- sodipodi:rx="161"
- sodipodi:ry="161"
- d="m 951,406 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
- <path
- d="m 351.25144,206.11348 c -53.59172,0.52234 -44.50307,-5.53676 -73.33604,87.12573 -23.48869,74.03725 -20.93021,65.96322 -21.05305,71.15653 -0.0861,4.03463 3.17077,7.23353 7.26337,7.50734 8.51119,-0.86058 4.93119,0.9205 34.43938,-90.71243 107.82185,113.74166 67.3698,95.29738 125.39558,97.60727 76.26112,-0.73127 82.45951,3.96976 83.3649,-7.20825 -0.10447,-3.79564 -1.88041,-6.0591 -54.21853,-122.54013 l 5.01443,-13.78968 17.2371,-0.3134 -0.6268,-14.41649 -64.24739,0 c -5.67605,7.7 [...]
- style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1"
- id="path11781"
- inkscape:connector-curvature="0" />
- </g>
- </g>
-</svg>
diff --git a/images/presets/level_crossing.png b/images/presets/level_crossing.png
deleted file mode 100644
index 41f7a54..0000000
Binary files a/images/presets/level_crossing.png and /dev/null differ
diff --git a/linux/latest/usr/share/icons/hicolor/128x128/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/128x128/apps/josm-latest.png
new file mode 100644
index 0000000..e2cb7d4
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/128x128/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/192x192/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/192x192/apps/josm-latest.png
new file mode 100644
index 0000000..4e0ed2e
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/192x192/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/22x22/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/22x22/apps/josm-latest.png
new file mode 100644
index 0000000..d63e7ee
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/22x22/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/24x24/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/24x24/apps/josm-latest.png
new file mode 100644
index 0000000..a87ea84
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/24x24/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/256x256/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/256x256/apps/josm-latest.png
new file mode 100644
index 0000000..8f3329f
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/256x256/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/36x36/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/36x36/apps/josm-latest.png
new file mode 100644
index 0000000..6414cc7
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/36x36/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/40x40/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/40x40/apps/josm-latest.png
new file mode 100644
index 0000000..ab4a9bd
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/40x40/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/42x42/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/42x42/apps/josm-latest.png
new file mode 100644
index 0000000..b104b6d
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/42x42/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/512x512/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/512x512/apps/josm-latest.png
new file mode 100644
index 0000000..4eddb49
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/512x512/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/64x64/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/64x64/apps/josm-latest.png
new file mode 100644
index 0000000..ed5bc62
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/64x64/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/72x72/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/72x72/apps/josm-latest.png
new file mode 100644
index 0000000..3f91498
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/72x72/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/80x80/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/80x80/apps/josm-latest.png
new file mode 100644
index 0000000..8fb7fec
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/80x80/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/8x8/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/8x8/apps/josm-latest.png
new file mode 100644
index 0000000..e1bdb0a
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/8x8/apps/josm-latest.png differ
diff --git a/linux/latest/usr/share/icons/hicolor/96x96/apps/josm-latest.png b/linux/latest/usr/share/icons/hicolor/96x96/apps/josm-latest.png
new file mode 100644
index 0000000..60e4d53
Binary files /dev/null and b/linux/latest/usr/share/icons/hicolor/96x96/apps/josm-latest.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/128x128/apps/josm.png b/linux/tested/usr/share/icons/hicolor/128x128/apps/josm.png
new file mode 100644
index 0000000..8f7c3e1
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/128x128/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/192x192/apps/josm.png b/linux/tested/usr/share/icons/hicolor/192x192/apps/josm.png
new file mode 100644
index 0000000..4803b56
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/192x192/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/22x22/apps/josm.png b/linux/tested/usr/share/icons/hicolor/22x22/apps/josm.png
new file mode 100644
index 0000000..86e0b46
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/22x22/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/24x24/apps/josm.png b/linux/tested/usr/share/icons/hicolor/24x24/apps/josm.png
new file mode 100644
index 0000000..ae96839
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/24x24/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/256x256/apps/josm.png b/linux/tested/usr/share/icons/hicolor/256x256/apps/josm.png
new file mode 100644
index 0000000..683495e
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/256x256/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/36x36/apps/josm.png b/linux/tested/usr/share/icons/hicolor/36x36/apps/josm.png
new file mode 100644
index 0000000..c3a29ea
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/36x36/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/40x40/apps/josm.png b/linux/tested/usr/share/icons/hicolor/40x40/apps/josm.png
new file mode 100644
index 0000000..655b51d
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/40x40/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/42x42/apps/josm.png b/linux/tested/usr/share/icons/hicolor/42x42/apps/josm.png
new file mode 100644
index 0000000..d4ea403
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/42x42/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/512x512/apps/josm.png b/linux/tested/usr/share/icons/hicolor/512x512/apps/josm.png
new file mode 100644
index 0000000..24aa61d
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/512x512/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/64x64/apps/josm.png b/linux/tested/usr/share/icons/hicolor/64x64/apps/josm.png
new file mode 100644
index 0000000..3047ed0
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/64x64/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/72x72/apps/josm.png b/linux/tested/usr/share/icons/hicolor/72x72/apps/josm.png
new file mode 100644
index 0000000..f99ffaf
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/72x72/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/80x80/apps/josm.png b/linux/tested/usr/share/icons/hicolor/80x80/apps/josm.png
new file mode 100644
index 0000000..6c33df1
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/80x80/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/8x8/apps/josm.png b/linux/tested/usr/share/icons/hicolor/8x8/apps/josm.png
new file mode 100644
index 0000000..ac1cb96
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/8x8/apps/josm.png differ
diff --git a/linux/tested/usr/share/icons/hicolor/96x96/apps/josm.png b/linux/tested/usr/share/icons/hicolor/96x96/apps/josm.png
new file mode 100644
index 0000000..dbdc5df
Binary files /dev/null and b/linux/tested/usr/share/icons/hicolor/96x96/apps/josm.png differ
diff --git a/scripts/SyncEditorImageryIndex.groovy b/scripts/SyncEditorImageryIndex.groovy
index d387c9b..200d734 100644
--- a/scripts/SyncEditorImageryIndex.groovy
+++ b/scripts/SyncEditorImageryIndex.groovy
@@ -103,7 +103,6 @@ class SyncEditorImageryIndex {
/* URL style mismatch */
skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://cyberjapandata.gsi.go.jp/xyz/ort/{z}/{x}/{y}.jpg"] = 1
skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://tms.cadastre.openstreetmap.fr/*/tout/{z}/{x}/{y}.png"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://sdi.provincia.bz.it/geoserver/gwc/service/tms/1.0.0/WMTS_TOPOMAP_APB-PAB@GoogleMapsCompatible@png8/{z}/{x}/{-y}.png"] = 1
skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.osm.ch:8080/tiles/AGIS2014/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.osm.ch:8080/tiles/sogis2014/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg"] = 1
@@ -111,6 +110,8 @@ class SyncEditorImageryIndex {
skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.openstreetmap.lu/tiles/ortho2013/EPSG900913/{z}/{x}/{y}.jpeg"] = 1
skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.sosm.ch:8080/tiles/zh_luftbild2011/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg"] = 1
+ skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.osm.ch:8080/tiles/KTZUERICH2015/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
+ skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://geoservices.buergernetz.bz.it/geoserver/gwc/service/wmts/?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=P_BZ_BASEMAP_TOPO&STYLE=default&TILEMATRIXSET=GoogleMapsCompatible&TILEMATRIX=GoogleMapsCompatible%3A{z}&TILEROW={y}&TILECOL={x}&FORMAT=image%2Fjpeg"] = 1
skipEntries["+++ EII-URL is not unique: http://geolittoral.application.equipement.gouv.fr/wms/metropole?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=ortholittorale&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
skipEntries["- Streets NRW Geofabrik.de - http://tools.geofabrik.de/osmi/view/strassennrw/wxs?REQUEST=GetMap&SERVICE=wms&VERSION=1.1.1&FORMAT=image/png&SRS={proj}&STYLES=&LAYERS=unzugeordnete_strassen,kreisstrassen_ast,kreisstrassen,landesstrassen_ast,landesstrassen,bundesstrassen_ast,bundesstrassen,autobahnen_ast,autobahnen,endpunkte&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
@@ -139,6 +140,12 @@ class SyncEditorImageryIndex {
skipEntries[" name differs: http://geoserver.infobex.hu/Budapest2014/IST/{zoom}/{x}/{y}.jpg"] = 3
skipEntries[" name differs: http://mapproxy.openmap.lt/ort10lt/g/{zoom}/{x}/{y}.jpeg"] = 3
skipEntries[" name differs: http://e.tile.openstreetmap.hu/ortofoto2000/{zoom}/{x}/{y}.jpg"] = 3
+ skipEntries[" name differs: http://gis3.stuttgart.de/wss/service/wms_Luftbilder2011_jpg_internet/guest?FORMAT=image/jpeg&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&Layers=0,1,2,3,4,5,6,7,8&STYLES=default,default,default,default,default,default,default,default,default&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
+ skipEntries[" name differs: http://tools.geofabrik.de/osmi/tiles/routing/{zoom}/{x}/{y}.png"] = 3
+ skipEntries[" name differs: http://e.tile.openstreetmap.hu/ortofoto2005/{zoom}/{x}/{y}.jpg"] = 3
+ skipEntries[" name differs: https://secure.erlangen.de/arcgiser/services/Luftbilder2013/MapServer/WmsServer?FORMAT=image/bmp&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=Erlangen_ratio5_6.25cm.jp2&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
+ skipEntries[" name differs: http://tools.geofabrik.de/osmi/tiles/addresses/{zoom}/{x}/{y}.png"] = 3
+ skipEntries[" name differs: http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png"] = 3
skipEntries[" maxzoom differs: [DE] Bavaria (2 m) - http://geodaten.bayern.de/ogc/ogc_dop200_oa.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=adv_dop200c&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries County - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=County&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries NPWS Reserve - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=NPWSReserve&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
@@ -149,7 +156,15 @@ class SyncEditorImageryIndex {
skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries State Forest - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=StateForest&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries LGA - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=LocalGovernmentArea&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
skipEntries[" minzoom differs: [AU] LPI NSW Base Map - http://maps.six.nsw.gov.au/arcgis/rest/services/public/NSW_Base_Map/MapServer/tile/{zoom}/{y}/{x}"] = 3
+ skipEntries[" country code differs: [EU] OSM Inspector: Boundaries (EU) - http://tools.geofabrik.de/osmi/tiles/boundaries/{zoom}/{x}/{y}.png"] = 3
skipEntries[" country code differs: [LT] ORT10LT (Lithuania) - http://mapproxy.openmap.lt/ort10lt/g/{zoom}/{x}/{y}.jpeg"] = 3
+ skipEntries[" country code differs: [TH] Cambodia, Laos, Thailand, Vietnam bilingual - http://{switch:a,b,c,d}.tile.osm-tools.org/osm_then/{zoom}/{x}/{y}.png"] = 3
+ skipEntries[" country code differs: [HU] Szeged ortophoto 2011 - http://e.tile.openstreetmap.hu/szeged-2011-10cm/{zoom}/{x}/{y}.png"] = 3
+ skipEntries[" country code differs: [HU] Danube flood ortophoto 2013 - http://e.tile.openstreetmap.hu/dunai-arviz-2013/{zoom}/{x}/{y}.jpg"] = 3
+ skipEntries[" country code differs: [HU] Budapest district XII ortophoto 2013 - http://turistautak.openstreetmap.hu/kolesar/wms/Budapest-XII/?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=Ortofot%C3%B3%202013&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
+ skipEntries[" country code differs: [HU] Törökbálint ortophoto 2013 - http://terkep.torokbalint.hu/mapproxy/service?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=ORTO_2013_5CM_2013SZEPT_TAKARASSAL_512_512&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
+
+
}
void myprintlnfinal(String s) {
@@ -332,7 +347,7 @@ class SyncEditorImageryIndex {
myprintln " (JOSM): ${getCountryCode(j)}"
}
}
- myprintln "*** Same URL, but different quality: ***"
+ /*myprintln "*** Same URL, but different quality: ***"
for (def url : eiiUrls.keySet()) {
def e = eiiUrls.get(url)
if (!josmUrls.containsKey(url)) {
@@ -348,7 +363,7 @@ class SyncEditorImageryIndex {
myprintln " (IEE): ${getQuality(e)}"
myprintln " (JOSM): ${getQuality(j)}"
}
- }
+ }*/
}
/**
diff --git a/src/org/apache/commons/jcs/access/PartitionedCacheAccess.java b/src/org/apache/commons/jcs/access/PartitionedCacheAccess.java
index cce9adf..e100002 100644
--- a/src/org/apache/commons/jcs/access/PartitionedCacheAccess.java
+++ b/src/org/apache/commons/jcs/access/PartitionedCacheAccess.java
@@ -19,6 +19,12 @@ package org.apache.commons.jcs.access;
* under the License.
*/
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.jcs.JCS;
import org.apache.commons.jcs.access.behavior.ICacheAccess;
import org.apache.commons.jcs.access.exception.CacheException;
@@ -31,13 +37,6 @@ import org.apache.commons.jcs.utils.props.AbstractPropertyContainer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
/**
* TODO: Add new methods that will allow you to provide a partition indicator for all major calls. Add an interface as well.
* <p>
@@ -56,7 +55,7 @@ import java.util.Set;
* <p>
* @author Aaron Smuts
*/
-public class PartitionedCacheAccess<K extends Serializable, V extends Serializable>
+public class PartitionedCacheAccess<K, V>
extends AbstractPropertyContainer
implements ICacheAccess<K, V>
{
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
index 9487e02..0a39f97 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
@@ -118,8 +118,6 @@ public class HSQLDiskCacheFactory
// ""
String password = attributes.getPassword();
- new org.hsqldb.jdbcDriver();
-
try
{
Class.forName( driver ).newInstance();
diff --git a/src/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java b/src/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
index 445b65b..e1e2307 100644
--- a/src/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
+++ b/src/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
@@ -19,18 +19,18 @@ package org.apache.commons.jcs.auxiliary.lateral.socket.tcp;
* under the License.
*/
-import org.apache.commons.jcs.auxiliary.lateral.LateralElementDescriptor;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.behavior.ITCPLateralCacheAttributes;
-import org.apache.commons.jcs.io.ObjectInputStreamClassLoaderAware;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.InetSocketAddress;
import java.net.Socket;
+import org.apache.commons.jcs.auxiliary.lateral.LateralElementDescriptor;
+import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.behavior.ITCPLateralCacheAttributes;
+import org.apache.commons.jcs.io.ObjectInputStreamClassLoaderAware;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* This class is based on the log4j SocketAppender class. I'm using a different repair structure, so
* it is significantly different.
@@ -228,17 +228,19 @@ public class LateralTCPSender
// write object to listener
oos.writeUnshared( led );
oos.flush();
+ ObjectInputStream ois = null;
try
{
socket.setSoTimeout( socketSoTimeOut );
- ObjectInputStream ois = new ObjectInputStreamClassLoaderAware( socket.getInputStream(), null );
+ ois = new ObjectInputStreamClassLoaderAware( socket.getInputStream(), null );
response = ois.readObject();
}
catch ( IOException ioe )
{
- String message = "Could not open ObjectInputStream to " + socket;
- message += " SoTimeout [" + socket.getSoTimeout() + "] Connected [" + socket.isConnected() + "]";
+ String message = "Could not open ObjectInputStream to " + socket +
+ " SoTimeout [" + socket.getSoTimeout() +
+ "] Connected [" + socket.isConnected() + "]";
log.error( message, ioe );
throw ioe;
}
@@ -246,6 +248,13 @@ public class LateralTCPSender
{
log.error( e );
}
+ finally
+ {
+ if (ois != null)
+ {
+ ois.close();
+ }
+ }
}
return response;
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java b/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java
index 221829a..090011d 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java
@@ -20,7 +20,6 @@ package org.apache.commons.jcs.auxiliary.remote;
*/
import java.io.IOException;
-import java.io.Serializable;
import java.net.UnknownHostException;
import org.apache.commons.jcs.access.exception.CacheException;
@@ -31,21 +30,16 @@ import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheElementSerialized;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
-import org.apache.commons.jcs.engine.control.CompositeCache;
import org.apache.commons.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.jcs.utils.net.HostNameUtil;
import org.apache.commons.jcs.utils.serialization.SerializationConversionUtil;
-import org.apache.commons.jcs.utils.serialization.StandardSerializer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** Shared listener base. */
public abstract class AbstractRemoteCacheListener<K, V>
- implements IRemoteCacheListener<K, V>, Serializable
+ implements IRemoteCacheListener<K, V>
{
- /** Don't change */
- private static final long serialVersionUID = 32442324243243L;
-
/** The logger */
private static final Log log = LogFactory.getLog( AbstractRemoteCacheListener.class );
@@ -56,22 +50,16 @@ public abstract class AbstractRemoteCacheListener<K, V>
* The cache manager used to put items in different regions. This is set lazily and should not
* be sent to the remote server.
*/
- private transient ICompositeCacheManager cacheMgr;
+ private ICompositeCacheManager cacheMgr;
/** The remote cache configuration object. */
private final IRemoteCacheAttributes irca;
- /** Number of put requests received. For debugging only. */
- protected int puts = 0;
-
- /** Number of remove requests received. For debugging only. */
- protected int removes = 0;
-
/** This is set by the remote cache server. */
private long listenerId = 0;
- /** Custom serializer. Standard by default. */
- private transient IElementSerializer elementSerializer = new StandardSerializer();
+ /** Custom serializer. */
+ private IElementSerializer elementSerializer;
/**
* Only need one since it does work for all regions, just reference by multiple region names.
@@ -79,13 +67,15 @@ public abstract class AbstractRemoteCacheListener<K, V>
* The constructor exports this object, making it available to receive incoming calls. The
* callback port is anonymous unless a local port value was specified in the configuration.
* <p>
- * @param irca
- * @param cacheMgr
+ * @param irca cache configuration
+ * @param cacheMgr the cache hub
+ * @param elementSerializer a custom serializer
*/
- public AbstractRemoteCacheListener( IRemoteCacheAttributes irca, ICompositeCacheManager cacheMgr )
+ public AbstractRemoteCacheListener( IRemoteCacheAttributes irca, ICompositeCacheManager cacheMgr, IElementSerializer elementSerializer )
{
this.irca = irca;
this.cacheMgr = cacheMgr;
+ this.elementSerializer = elementSerializer;
}
/**
@@ -167,20 +157,12 @@ public abstract class AbstractRemoteCacheListener<K, V>
}
else
{
- puts++;
if ( log.isDebugEnabled() )
{
log.debug( "PUTTING ELEMENT FROM REMOTE, ( updating ) " );
log.debug( "cb = " + cb );
-
- if ( puts % 100 == 0 )
- {
- log.debug( "puts = " + puts );
- }
}
- CompositeCache<K, V> cache = getCacheManager().getCache( cb.getCacheName() );
-
// Eventually the instance of will not be necessary.
if ( cb instanceof ICacheElementSerialized )
{
@@ -207,7 +189,7 @@ public abstract class AbstractRemoteCacheListener<K, V>
}
}
- cache.localUpdate( cb );
+ getCacheManager().<K, V>getCache( cb.getCacheName() ).localUpdate( cb );
}
}
@@ -222,20 +204,12 @@ public abstract class AbstractRemoteCacheListener<K, V>
public void handleRemove( String cacheName, K key )
throws IOException
{
- removes++;
if ( log.isDebugEnabled() )
{
- if ( removes % 100 == 0 )
- {
- log.debug( "removes = " + removes );
- }
-
log.debug( "handleRemove> cacheName=" + cacheName + ", key=" + key );
}
- CompositeCache<K, V> cache = getCacheManager().getCache( cacheName );
-
- cache.localRemove( key );
+ getCacheManager().<K, V>getCache( cacheName ).localRemove( key );
}
/**
@@ -253,8 +227,7 @@ public abstract class AbstractRemoteCacheListener<K, V>
log.debug( "handleRemoveAll> cacheName=" + cacheName );
}
- CompositeCache<K, V> cache = getCacheManager().getCache( cacheName );
- cache.localRemoveAll();
+ getCacheManager().<K, V>getCache( cacheName ).localRemoveAll();
}
/**
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java b/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
index 3e1aec4..b853666 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
@@ -19,11 +19,18 @@ package org.apache.commons.jcs.auxiliary.remote;
* under the License.
*/
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCache;
-import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
-import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
import org.apache.commons.jcs.engine.CacheStatus;
+import org.apache.commons.jcs.engine.behavior.ICache;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
@@ -35,13 +42,6 @@ import org.apache.commons.jcs.engine.stats.behavior.IStats;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
/** An abstract base for the No Wait Facade. Different implementations will failover differently. */
public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
extends AbstractAuxiliaryCache<K, V>
@@ -50,17 +50,11 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
private static final Log log = LogFactory.getLog( AbstractRemoteCacheNoWaitFacade.class );
/** The connection to a remote server, or a zombie. */
- public RemoteCacheNoWait<K, V>[] noWaits; // TODO privatise if possible
-
- /** The cache name */
- private final String cacheName;
+ private List<RemoteCacheNoWait<K, V>> noWaits;
/** holds failover and cluster information */
private IRemoteCacheAttributes remoteCacheAttributes;
- /** A cache manager */
- private ICompositeCacheManager compositeCacheManager;
-
/**
* Constructs with the given remote cache, and fires events to any listeners.
* <p>
@@ -70,7 +64,7 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
* @param cacheEventLogger
* @param elementSerializer
*/
- public AbstractRemoteCacheNoWaitFacade( RemoteCacheNoWait<K, V>[] noWaits, RemoteCacheAttributes rca,
+ public AbstractRemoteCacheNoWaitFacade( List<ICache<K, V>> noWaits, RemoteCacheAttributes rca,
ICompositeCacheManager cacheMgr, ICacheEventLogger cacheEventLogger,
IElementSerializer elementSerializer )
{
@@ -78,10 +72,12 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
{
log.debug( "CONSTRUCTING NO WAIT FACADE" );
}
- this.noWaits = noWaits;
+ this.noWaits = new ArrayList<RemoteCacheNoWait<K,V>>();
+ for (ICache<K, V> nw : noWaits)
+ {
+ this.noWaits.add((RemoteCacheNoWait<K,V>) nw);
+ }
this.remoteCacheAttributes = rca;
- this.cacheName = rca.getCacheName();
- setCompositeCacheManager( cacheMgr );
setCacheEventLogger( cacheEventLogger );
setElementSerializer( elementSerializer );
}
@@ -98,43 +94,42 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
{
if ( log.isDebugEnabled() )
{
- log.debug( "updating through cache facade, noWaits.length = " + noWaits.length );
+ log.debug( "updating through cache facade, noWaits.length = " + noWaits.size() );
}
- int i = 0;
- try
+
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
- for ( ; i < noWaits.length; i++ )
+ try
{
- noWaits[i].update( ce );
+ nw.update( ce );
// an initial move into a zombie will lock this to primary
// recovery. will not discover other servers until primary
// reconnect
// and subsequent error
}
- }
- catch ( Exception ex )
- {
- String message = "Problem updating no wait. Will initiate failover if the noWait is in error.";
- log.error( message, ex );
-
- if ( getCacheEventLogger() != null )
+ catch ( IOException ex )
{
- getCacheEventLogger().logError(
- "RemoteCacheNoWaitFacade",
- ICacheEventLogger.UPDATE_EVENT,
- message + ":" + ex.getMessage() + " REGION: " + ce.getCacheName()
- + " ELEMENT: " + ce );
- }
+ String message = "Problem updating no wait. Will initiate failover if the noWait is in error.";
+ log.error( message, ex );
- // can handle failover here? Is it safe to try the others?
- // check to see it the noWait is now a zombie
- // if it is a zombie, then move to the next in the failover list
- // will need to keep them in order or a count
- failover( i );
- // should start a failover thread
- // should probably only failover if there is only one in the noWait
- // list
- // Should start a background thread to restore the original primary if we are in failover state.
+ if ( getCacheEventLogger() != null )
+ {
+ getCacheEventLogger().logError( "RemoteCacheNoWaitFacade",
+ ICacheEventLogger.UPDATE_EVENT,
+ message + ":" + ex.getMessage() + " REGION: " + ce.getCacheName()
+ + " ELEMENT: " + ce );
+ }
+
+ // can handle failover here? Is it safe to try the others?
+ // check to see it the noWait is now a zombie
+ // if it is a zombie, then move to the next in the failover list
+ // will need to keep them in order or a count
+ failover( nw );
+ // should start a failover thread
+ // should probably only failover if there is only one in the noWait
+ // list
+ // Should start a background thread to restore the original primary if we are in failover state.
+ }
}
}
@@ -147,11 +142,11 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
@Override
public ICacheElement<K, V> get( K key )
{
- for ( int i = 0; i < noWaits.length; i++ )
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
try
{
- ICacheElement<K, V> obj = noWaits[i].get( key );
+ ICacheElement<K, V> obj = nw.get( key );
if ( obj != null )
{
return obj;
@@ -177,11 +172,11 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
public Map<K, ICacheElement<K, V>> getMatching( String pattern )
throws IOException
{
- for ( int i = 0; i < noWaits.length; i++ )
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
try
{
- return noWaits[i].getMatching( pattern );
+ return nw.getMatching( pattern );
}
catch ( IOException ex )
{
@@ -203,11 +198,11 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
{
if ( keys != null && !keys.isEmpty() )
{
- for ( int i = 0; i < noWaits.length; i++ )
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
try
{
- return noWaits[i].getMultiple( keys );
+ return nw.getMultiple( keys );
}
catch ( IOException ex )
{
@@ -228,12 +223,11 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
public Set<K> getKeySet() throws IOException
{
HashSet<K> allKeys = new HashSet<K>();
- for ( int i = 0; i < noWaits.length; i++ )
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
- AuxiliaryCache<K, V> aux = noWaits[i];
- if ( aux != null )
+ if ( nw != null )
{
- Set<K> keys = aux.getKeySet();
+ Set<K> keys = nw.getKeySet();
if(keys != null)
{
allKeys.addAll( keys );
@@ -254,12 +248,12 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
{
try
{
- for ( int i = 0; i < noWaits.length; i++ )
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
- noWaits[i].remove( key );
+ nw.remove( key );
}
}
- catch ( Exception ex )
+ catch ( IOException ex )
{
log.error( ex );
}
@@ -274,12 +268,12 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
{
try
{
- for ( int i = 0; i < noWaits.length; i++ )
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
- noWaits[i].removeAll();
+ nw.removeAll();
}
}
- catch ( Exception ex )
+ catch ( IOException ex )
{
log.error( ex );
}
@@ -289,16 +283,9 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
@Override
public void dispose()
{
- try
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
- for ( int i = 0; i < noWaits.length; i++ )
- {
- noWaits[i].dispose();
- }
- }
- catch ( Exception ex )
- {
- log.error( "Problem in dispose.", ex );
+ nw.dispose();
}
}
@@ -346,9 +333,9 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
@Override
public CacheStatus getStatus()
{
- for ( int i = 0; i < noWaits.length; i++ )
+ for (RemoteCacheNoWait<K, V> nw : noWaits)
{
- if ( noWaits[i].getStatus() == CacheStatus.ALIVE )
+ if ( nw.getStatus() == CacheStatus.ALIVE )
{
return CacheStatus.ALIVE;
}
@@ -365,22 +352,41 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
@Override
public String toString()
{
- return "RemoteCacheNoWaitFacade: " + cacheName + ", rca = " + remoteCacheAttributes;
+ return "RemoteCacheNoWaitFacade: " + remoteCacheAttributes.getCacheName() + ", rca = " + remoteCacheAttributes;
}
/**
* Begin the failover process if this is a local cache. Clustered remote caches do not failover.
* <p>
- * @param i The no wait in error.
+ * @param rcnw The no wait in error.
*/
- abstract void failover( int i );
+ protected abstract void failover( RemoteCacheNoWait<K, V> rcnw );
+ /**
+ * Get the primary server from the list of failovers
+ *
+ * @return a no wait
+ */
+ public RemoteCacheNoWait<K, V> getPrimaryServer()
+ {
+ return noWaits.get(0);
+ }
+
+ /**
+ * restore the primary server in the list of failovers
+ *
+ */
+ public void restorePrimaryServer(RemoteCacheNoWait<K, V> rcnw)
+ {
+ noWaits.clear();
+ noWaits.add(rcnw);
+ }
/**
* @return Returns the AuxiliaryCacheAttributes.
*/
@Override
- public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
+ public IRemoteCacheAttributes getAuxiliaryCacheAttributes()
{
return this.remoteCacheAttributes;
}
@@ -408,7 +414,7 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
if ( noWaits != null )
{
- elems.add(new StatElement<Integer>( "Number of No Waits", Integer.valueOf(noWaits.length) ) );
+ elems.add(new StatElement<Integer>( "Number of No Waits", Integer.valueOf(noWaits.size()) ) );
for ( RemoteCacheNoWait<K, V> rcnw : noWaits )
{
@@ -433,40 +439,4 @@ public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
{
return "Remote Cache No Wait Facade";
}
-
- /**
- * Gets the remoteCacheAttributes attribute of the RemoteCacheNoWaitFacade object
- * <p>
- * @return The remoteCacheAttributes value
- */
- public IRemoteCacheAttributes getRemoteCacheAttributes()
- {
- return remoteCacheAttributes;
- }
-
- /**
- * Sets the remoteCacheAttributes attribute of the RemoteCacheNoWaitFacade object.
- * <p>
- * @param rca The new remoteCacheAttributes value
- */
- public void setRemoteCacheAttributes( IRemoteCacheAttributes rca )
- {
- this.remoteCacheAttributes = rca;
- }
-
- /**
- * @param compositeCacheManager the compositeCacheManager to set
- */
- protected void setCompositeCacheManager( ICompositeCacheManager compositeCacheManager )
- {
- this.compositeCacheManager = compositeCacheManager;
- }
-
- /**
- * @return the compositeCacheManager
- */
- protected ICompositeCacheManager getCompositeCacheManager()
- {
- return compositeCacheManager;
- }
}
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
index 39e971c..b72b337 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
@@ -136,7 +136,7 @@ public class RemoteCache<K, V>
log.debug( "Initiating failover, rcnwf = " + rcnwf );
}
- if ( rcnwf != null && rcnwf.getRemoteCacheAttributes().getRemoteType() == RemoteType.LOCAL )
+ if ( rcnwf != null && rcnwf.getAuxiliaryCacheAttributes().getRemoteType() == RemoteType.LOCAL )
{
if ( log.isDebugEnabled() )
{
@@ -144,7 +144,7 @@ public class RemoteCache<K, V>
}
// may need to remove the noWait index here. It will be 0 if it is
// local since there is only 1 possible listener.
- rcnwf.failover( 0 );
+ rcnwf.failover( rcnwf.getPrimaryServer() );
}
if ( ex instanceof IOException )
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheAttributes.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheAttributes.java
index 67c23c2..7d1fad4 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheAttributes.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheAttributes.java
@@ -19,6 +19,8 @@ package org.apache.commons.jcs.auxiliary.remote;
* under the License.
*/
+import java.util.List;
+
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
/**
@@ -44,8 +46,8 @@ public class RemoteCacheAttributes
/** what failover server we are connected to. */
private int failoverIndex = 0;
- /** Array of failover server addresses */
- private RemoteLocation[] failovers;
+ /** List of failover server addresses */
+ private List<RemoteLocation> failovers;
/** default name is remote_cache_client */
private String threadPoolName = "remote_cache_client";
@@ -96,7 +98,7 @@ public class RemoteCacheAttributes
* @return The failovers value
*/
@Override
- public RemoteLocation[] getFailovers()
+ public List<RemoteLocation> getFailovers()
{
return this.failovers;
}
@@ -104,12 +106,12 @@ public class RemoteCacheAttributes
/**
* Sets the failovers attribute of the RemoteCacheAttributes object.
* <p>
- * @param f The new failovers value
+ * @param failovers The new failovers value
*/
@Override
- public void setFailovers( RemoteLocation[] f )
+ public void setFailovers( List<RemoteLocation> failovers )
{
- this.failovers = f;
+ this.failovers = failovers;
}
/**
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
index 3b6875b..daa9ee2 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
@@ -132,7 +132,7 @@ public class RemoteCacheFactory
}
// end if failoverList != null
- rca.setFailovers( failovers.toArray( new RemoteLocation[0] ) );
+ rca.setFailovers( failovers );
break;
case CLUSTER:
@@ -155,10 +155,8 @@ public class RemoteCacheFactory
break;
}
- @SuppressWarnings("unchecked") // No generic arrays in java
- RemoteCacheNoWait<K, V>[] rcnwArray = noWaits.toArray( new RemoteCacheNoWait[0] );
RemoteCacheNoWaitFacade<K, V> rcnwf =
- new RemoteCacheNoWaitFacade<K, V>(rcnwArray, rca, cacheMgr, cacheEventLogger, elementSerializer );
+ new RemoteCacheNoWaitFacade<K, V>(noWaits, rca, cacheMgr, cacheEventLogger, elementSerializer );
facades.put( rca.getCacheName(), rcnwf );
@@ -184,6 +182,28 @@ public class RemoteCacheFactory
* <p>
* Host and Port uniquely identify a manager instance.
* <p>
+ * @param cattr
+ *
+ * @return The instance value or null if no such manager exists
+ */
+ public static RemoteCacheManager getManager( IRemoteCacheAttributes cattr )
+ {
+ if ( cattr.getRemoteLocation() == null )
+ {
+ cattr.setRemoteLocation("", Registry.REGISTRY_PORT);
+ }
+
+ RemoteLocation loc = cattr.getRemoteLocation();
+ RemoteCacheManager ins = managers.get( loc );
+
+ return ins;
+ }
+
+ /**
+ * Returns an instance of RemoteCacheManager for the given connection parameters.
+ * <p>
+ * Host and Port uniquely identify a manager instance.
+ * <p>
* If the connection cannot be established, zombie objects will be used for future recovery
* purposes.
* <p>
@@ -191,7 +211,7 @@ public class RemoteCacheFactory
* @param cacheMgr
* @param cacheEventLogger
* @param elementSerializer
- * @return The instance value
+ * @return The instance value, never null
*/
public static RemoteCacheManager getManager( IRemoteCacheAttributes cattr, ICompositeCacheManager cacheMgr,
ICacheEventLogger cacheEventLogger,
@@ -257,6 +277,7 @@ public class RemoteCacheFactory
}
managers.clear();
+ facades.clear();
if (monitor != null)
{
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
index 9cd0eff..994adb7 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
@@ -20,11 +20,13 @@ package org.apache.commons.jcs.auxiliary.remote;
*/
import java.io.IOException;
+import java.util.List;
+import java.util.ListIterator;
import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCacheMonitor;
+import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
import org.apache.commons.jcs.engine.CacheStatus;
import org.apache.commons.jcs.engine.behavior.ICache;
-import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
/**
* The RemoteCacheFailoverRunner tries to establish a connection with a failover
@@ -50,22 +52,16 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
/** The facade returned to the composite cache. */
private final RemoteCacheNoWaitFacade<K, V> facade;
- /** The cache manager */
- private final ICompositeCacheManager cacheMgr;
-
/**
* Constructor for the RemoteCacheFailoverRunner object. This allows the
* FailoverRunner to modify the facade that the CompositeCache references.
*
- * @param facade
- * the facade the CompositeCache talks to.
- * @param cacheMgr
+ * @param facade the facade the CompositeCache talks to.
*/
- public RemoteCacheFailoverRunner( RemoteCacheNoWaitFacade<K, V> facade, ICompositeCacheManager cacheMgr )
+ public RemoteCacheFailoverRunner( RemoteCacheNoWaitFacade<K, V> facade )
{
super("JCS-RemoteCacheFailoverRunner");
this.facade = facade;
- this.cacheMgr = cacheMgr;
setIdlePeriod(20000L);
}
@@ -110,14 +106,16 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
if ( log.isInfoEnabled() )
{
- log.info( "Exiting failover runner. Failover index = " + facade.getRemoteCacheAttributes().getFailoverIndex() );
- if ( facade.getRemoteCacheAttributes().getFailoverIndex() <= 0 )
+ int failoverIndex = facade.getAuxiliaryCacheAttributes().getFailoverIndex();
+ log.info( "Exiting failover runner. Failover index = " + failoverIndex);
+
+ if ( failoverIndex <= 0 )
{
- log.info( "Failover index is <= 0, meaning we are not " + "connected to a failover server." );
+ log.info( "Failover index is <= 0, meaning we are not connected to a failover server." );
}
- else if ( facade.getRemoteCacheAttributes().getFailoverIndex() > 0 )
+ else if ( failoverIndex > 0 )
{
- log.info( "Failover index is > 0, meaning we are " + "connected to a failover server." );
+ log.info( "Failover index is > 0, meaning we are connected to a failover server." );
}
// log if we are allright or not.
}
@@ -128,9 +126,10 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
* continue until the primary is re-connected. If no failovers are defined,
* this will exit automatically.
*/
- @SuppressWarnings("unchecked") // No generic arrays in java
private void connectAndRestore()
{
+ IRemoteCacheAttributes rca0 = facade.getAuxiliaryCacheAttributes();
+
do
{
log.info( "Remote cache FAILOVER RUNNING." );
@@ -140,7 +139,7 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
{
// Monitor each RemoteCacheManager instance one after the other.
// Each RemoteCacheManager corresponds to one remote connection.
- RemoteLocation[] failovers = facade.getRemoteCacheAttributes().getFailovers();
+ List<RemoteLocation> failovers = rca0.getFailovers();
// we should probably check to see if there are any failovers,
// even though the caller
// should have already.
@@ -150,48 +149,46 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
log.warn( "Remote is misconfigured, failovers was null." );
return;
}
- else if ( failovers.length == 1 )
+ else if ( failovers.size() == 1 )
{
// if there is only the primary, return out of this
log.info( "No failovers defined, exiting failover runner." );
return;
}
- int fidx = facade.getRemoteCacheAttributes().getFailoverIndex();
- log.debug( "fidx = " + fidx + " failovers.length = " + failovers.length );
+ int fidx = rca0.getFailoverIndex();
+ log.debug( "fidx = " + fidx + " failovers.size = " + failovers.size() );
// shouldn't we see if the primary is backup?
// If we don't check the primary, if it gets connected in the
// background,
// we will disconnect it only to put it right back
- int i = fidx; // + 1; // +1 skips the primary
+ ListIterator<RemoteLocation> i = failovers.listIterator(fidx); // + 1; // +1 skips the primary
if ( log.isDebugEnabled() )
{
- log.debug( "starting at failover i = " + i );
+ log.debug( "starting at failover i = " + i.nextIndex() );
}
// try them one at a time until successful
- for ( ; i < failovers.length && !allright.get(); i++ )
+ for ( ; i.hasNext() && !allright.get();)
{
- RemoteLocation server = failovers[i];
+ RemoteLocation server = i.next();
if ( log.isDebugEnabled() )
{
log.debug( "Trying server [" + server + "] at failover index i = " + i );
}
- RemoteCacheAttributes rca = null;
- try
- {
- rca = (RemoteCacheAttributes) facade.getRemoteCacheAttributes().clone();
- rca.setRemoteLocation(server);
- RemoteCacheManager rcm = RemoteCacheFactory.getManager( rca, cacheMgr,
- facade.getCacheEventLogger(), facade.getElementSerializer() );
+ RemoteCacheAttributes rca = (RemoteCacheAttributes) rca0.clone();
+ rca.setRemoteLocation(server);
+ RemoteCacheManager rcm = RemoteCacheFactory.getManager( rca );
- if ( log.isDebugEnabled() )
- {
- log.debug( "RemoteCacheAttributes for failover = " + rca.toString() );
- }
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "RemoteCacheAttributes for failover = " + rca.toString() );
+ }
+ if (rcm != null)
+ {
// add a listener if there are none, need to tell rca
// what number it is at
ICache<K, V> ic = rcm.getCache( rca );
@@ -199,16 +196,15 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
{
// may need to do this more gracefully
log.debug( "resetting no wait" );
- facade.noWaits = new RemoteCacheNoWait[1];
- facade.noWaits[0] = (RemoteCacheNoWait<K, V>) ic;
- facade.getRemoteCacheAttributes().setFailoverIndex( i );
+ facade.restorePrimaryServer((RemoteCacheNoWait<K, V>) ic);
+ rca0.setFailoverIndex( i.nextIndex() );
if ( log.isDebugEnabled() )
{
log.debug( "setting ALLRIGHT to true" );
- if ( i > 0 )
+ if ( i.hasPrevious() )
{
- log.debug( "Moving to Primary Recovery Mode, failover index = " + i );
+ log.debug( "Moving to Primary Recovery Mode, failover index = " + i.nextIndex() );
}
else
{
@@ -224,22 +220,6 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
}
}
}
- catch ( Exception ex )
- {
- allright.compareAndSet(true, false);
- // Problem encountered in fixing the caches managed by a
- // RemoteCacheManager instance.
- // Soldier on to the next RemoteCacheManager instance.
- RemoteLocation location = (rca == null) ? new RemoteLocation("null", 0) : rca.getRemoteLocation();
- if ( i == 0 )
- {
- log.warn( "FAILED to connect, as expected, to primary " + location, ex );
- }
- else
- {
- log.error( "FAILED to connect to failover " + location, ex );
- }
- }
}
}
// end if !allright
@@ -254,13 +234,13 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
if ( log.isInfoEnabled() )
{
log.info( "Failover runner is in primary recovery mode. Failover index = "
- + facade.getRemoteCacheAttributes().getFailoverIndex() + "\n" + "Will now try to reconnect to primary server." );
+ + rca0.getFailoverIndex() + "\n" + "Will now try to reconnect to primary server." );
}
}
boolean primaryRestoredSuccessfully = false;
// if we are not connected to the primary, try.
- if ( facade.getRemoteCacheAttributes().getFailoverIndex() > 0 )
+ if ( rca0.getFailoverIndex() > 0 )
{
primaryRestoredSuccessfully = restorePrimary();
if ( log.isDebugEnabled() )
@@ -287,7 +267,7 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
// try to bring the listener back to the primary
}
- while ( facade.getRemoteCacheAttributes().getFailoverIndex() > 0 || !allright.get() );
+ while ( rca0.getFailoverIndex() > 0 || !allright.get() );
// continue if the primary is not restored or if things are not allright.
}
@@ -301,122 +281,121 @@ public class RemoteCacheFailoverRunner<K, V> extends AbstractAuxiliaryCacheMonit
*
* @return boolean value indicating whether the restoration was successful
*/
- @SuppressWarnings("unchecked") // No generic arrays in java
private boolean restorePrimary()
{
+ IRemoteCacheAttributes rca0 = facade.getAuxiliaryCacheAttributes();
// try to move back to the primary
- RemoteLocation[] failovers = facade.getRemoteCacheAttributes().getFailovers();
- RemoteLocation server = failovers[0];
+ RemoteLocation server = rca0.getFailovers().get(0);
if ( log.isInfoEnabled() )
{
log.info( "Trying to restore connection to primary remote server [" + server + "]" );
}
- RemoteCacheAttributes rca = (RemoteCacheAttributes) facade.getRemoteCacheAttributes().clone();
+ RemoteCacheAttributes rca = (RemoteCacheAttributes) rca0.clone();
rca.setRemoteLocation(server);
- RemoteCacheManager rcm = RemoteCacheFactory.getManager( rca, cacheMgr,
- facade.getCacheEventLogger(), facade.getElementSerializer() );
-
- // add a listener if there are none, need to tell rca what number it
- // is at
- ICache<K, V> ic = rcm.getCache( rca );
- // by default the listener id should be 0, else it will be the
- // listener
- // Originally associated with the remote cache. either way is fine.
- // We just don't want the listener id from a failover being used.
- // If the remote server was rebooted this could be a problem if new
- // locals were also added.
-
- if ( ic.getStatus() == CacheStatus.ALIVE )
+ RemoteCacheManager rcm = RemoteCacheFactory.getManager( rca );
+
+ if (rcm != null)
{
- try
+ // add a listener if there are none, need to tell rca what number it
+ // is at
+ ICache<K, V> ic = rcm.getCache( rca );
+ // by default the listener id should be 0, else it will be the
+ // listener
+ // Originally associated with the remote cache. either way is fine.
+ // We just don't want the listener id from a failover being used.
+ // If the remote server was rebooted this could be a problem if new
+ // locals were also added.
+
+ if ( ic.getStatus() == CacheStatus.ALIVE )
{
- // we could have more than one listener registered right
- // now.
- // this will not result in a loop, only duplication
- // stop duplicate listening.
- if ( facade.noWaits[0] != null && facade.noWaits[0].getStatus() == CacheStatus.ALIVE )
+ try
{
- int fidx = facade.getRemoteCacheAttributes().getFailoverIndex();
-
- if ( fidx > 0 )
+ // we could have more than one listener registered right
+ // now.
+ // this will not result in a loop, only duplication
+ // stop duplicate listening.
+ if ( facade.getPrimaryServer() != null && facade.getPrimaryServer().getStatus() == CacheStatus.ALIVE )
{
- RemoteLocation serverOld = failovers[fidx];
+ int fidx = rca0.getFailoverIndex();
- if ( log.isDebugEnabled() )
+ if ( fidx > 0 )
{
- log.debug( "Failover Index = " + fidx + " the server at that index is ["
- + serverOld + "]" );
- }
+ RemoteLocation serverOld = rca0.getFailovers().get(fidx);
- if ( serverOld != null )
- {
- // create attributes that reflect the
- // previous failed over configuration.
- RemoteCacheAttributes rcaOld = (RemoteCacheAttributes) facade.getRemoteCacheAttributes().clone();
- rcaOld.setRemoteLocation(serverOld);
- RemoteCacheManager rcmOld = RemoteCacheFactory.getManager( rcaOld, cacheMgr,
- facade.getCacheEventLogger(), facade.getElementSerializer() );
-
- if ( rcmOld != null )
+ if ( log.isDebugEnabled() )
{
- // manager can remove by name if
- // necessary
- rcmOld.removeRemoteCacheListener( rcaOld );
+ log.debug( "Failover Index = " + fidx + " the server at that index is ["
+ + serverOld + "]" );
}
- if ( log.isInfoEnabled() )
+
+ if ( serverOld != null )
{
- log.info( "Successfully deregistered from FAILOVER remote server = "
- + serverOld );
+ // create attributes that reflect the
+ // previous failed over configuration.
+ RemoteCacheAttributes rcaOld = (RemoteCacheAttributes) rca0.clone();
+ rcaOld.setRemoteLocation(serverOld);
+ RemoteCacheManager rcmOld = RemoteCacheFactory.getManager( rcaOld );
+
+ if ( rcmOld != null )
+ {
+ // manager can remove by name if
+ // necessary
+ rcmOld.removeRemoteCacheListener( rcaOld );
+ }
+ if ( log.isInfoEnabled() )
+ {
+ log.info( "Successfully deregistered from FAILOVER remote server = "
+ + serverOld );
+ }
}
}
- }
- else if ( fidx == 0 )
- {
- // this should never happen. If there are no
- // failovers this shouldn't get called.
- if ( log.isDebugEnabled() )
+ else if ( fidx == 0 )
{
- log.debug( "No need to restore primary, it is already restored." );
- return true;
+ // this should never happen. If there are no
+ // failovers this shouldn't get called.
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "No need to restore primary, it is already restored." );
+ return true;
+ }
+ }
+ else if ( fidx < 0 )
+ {
+ // this should never happen
+ log.warn( "Failover index is less than 0, this shouldn't happen" );
}
- }
- else if ( fidx < 0 )
- {
- // this should never happen
- log.warn( "Failover index is less than 0, this shouldn't happen" );
}
}
- }
- catch ( IOException e )
- {
- // TODO, should try again, or somehow stop the listener
- log.error("Trouble trying to deregister old failover listener prior to restoring the primary = "
- + server, e );
- }
-
- // Restore primary
- // may need to do this more gracefully, letting the failover finish in the background
- RemoteCacheNoWait<K, V> failoverNoWait = facade.noWaits[0];
+ catch ( IOException e )
+ {
+ // TODO, should try again, or somehow stop the listener
+ log.error("Trouble trying to deregister old failover listener prior to restoring the primary = "
+ + server, e );
+ }
- // swap in a new one
- facade.noWaits = new RemoteCacheNoWait[1];
- facade.noWaits[0] = (RemoteCacheNoWait<K, V>) ic;
- facade.getRemoteCacheAttributes().setFailoverIndex( 0 );
+ // Restore primary
+ // may need to do this more gracefully, letting the failover finish in the background
+ RemoteCacheNoWait<K, V> failoverNoWait = facade.getPrimaryServer();
- if ( log.isInfoEnabled() )
- {
- String message = "Successfully reconnected to PRIMARY remote server. Substituted primary for failoverNoWait ["
- + failoverNoWait + "]";
- log.info( message );
+ // swap in a new one
+ facade.restorePrimaryServer((RemoteCacheNoWait<K, V>) ic);
+ rca0.setFailoverIndex( 0 );
- if ( facade.getCacheEventLogger() != null )
+ if ( log.isInfoEnabled() )
{
- facade.getCacheEventLogger().logApplicationEvent( "RemoteCacheFailoverRunner", "RestoredPrimary", message );
+ String message = "Successfully reconnected to PRIMARY remote server. Substituted primary for failoverNoWait ["
+ + failoverNoWait + "]";
+ log.info( message );
+
+ if ( facade.getCacheEventLogger() != null )
+ {
+ facade.getCacheEventLogger().logApplicationEvent( "RemoteCacheFailoverRunner", "RestoredPrimary", message );
+ }
}
+ return true;
}
- return true;
}
// else all right
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java
index 7c79711..2d5aa2f 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java
@@ -26,6 +26,7 @@ import java.rmi.server.UnicastRemoteObject;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheConstants;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
+import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -40,9 +41,6 @@ public class RemoteCacheListener<K, V>
extends AbstractRemoteCacheListener<K, V>
implements IRemoteCacheConstants
{
- /** Don't change */
- private static final long serialVersionUID = 25345252345322345L;
-
/** The logger */
private static final Log log = LogFactory.getLog( RemoteCacheListener.class );
@@ -55,12 +53,13 @@ public class RemoteCacheListener<K, V>
* The constructor exports this object, making it available to receive incoming calls. The
* callback port is anonymous unless a local port value was specified in the configuration.
* <p>
- * @param irca
- * @param cacheMgr
+ * @param irca cache configuration
+ * @param cacheMgr the cache hub
+ * @param elementSerializer a custom serializer
*/
- public RemoteCacheListener( IRemoteCacheAttributes irca, ICompositeCacheManager cacheMgr )
+ public RemoteCacheListener( IRemoteCacheAttributes irca, ICompositeCacheManager cacheMgr, IElementSerializer elementSerializer )
{
- super( irca, cacheMgr );
+ super( irca, cacheMgr, elementSerializer );
// Export this remote object to make it available to receive incoming
// calls.
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
index bfde237..c0f9e10 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
@@ -265,7 +265,7 @@ public class RemoteCacheManager
RemoteCacheListener<K, V> listener = null;
try
{
- listener = new RemoteCacheListener<K, V>( cattr, cacheMgr );
+ listener = new RemoteCacheListener<K, V>( cattr, cacheMgr, elementSerializer );
addRemoteCacheListener( cattr, listener );
}
catch ( IOException ioe )
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
index 9c99862..744f468 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
@@ -19,8 +19,11 @@ package org.apache.commons.jcs.auxiliary.remote;
* under the License.
*/
+import java.util.List;
+
import org.apache.commons.jcs.auxiliary.remote.server.behavior.RemoteType;
import org.apache.commons.jcs.engine.CacheStatus;
+import org.apache.commons.jcs.engine.behavior.ICache;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
@@ -50,7 +53,7 @@ public class RemoteCacheNoWaitFacade<K, V>
* @param cacheEventLogger
* @param elementSerializer
*/
- public RemoteCacheNoWaitFacade( RemoteCacheNoWait<K, V>[] noWaits,
+ public RemoteCacheNoWaitFacade( List<ICache<K, V>> noWaits,
RemoteCacheAttributes rca,
ICompositeCacheManager cacheMgr,
ICacheEventLogger cacheEventLogger,
@@ -62,23 +65,22 @@ public class RemoteCacheNoWaitFacade<K, V>
/**
* Begin the failover process if this is a local cache. Clustered remote caches do not failover.
* <p>
- * @param i The no wait in error.
+ * @param rcnw The no wait in error.
*/
@Override
- protected void failover( int i )
+ protected void failover( RemoteCacheNoWait<K, V> rcnw )
{
if ( log.isDebugEnabled() )
{
- log.debug( "in failover for " + i );
+ log.debug( "in failover for " + rcnw );
}
- if ( getRemoteCacheAttributes().getRemoteType() == RemoteType.LOCAL )
+ if ( getAuxiliaryCacheAttributes().getRemoteType() == RemoteType.LOCAL )
{
- if ( noWaits[i].getStatus() == CacheStatus.ERROR )
+ if ( rcnw.getStatus() == CacheStatus.ERROR )
{
// start failover, primary recovery process
- RemoteCacheFailoverRunner<K, V> runner =
- new RemoteCacheFailoverRunner<K, V>( this, getCompositeCacheManager() );
+ RemoteCacheFailoverRunner<K, V> runner = new RemoteCacheFailoverRunner<K, V>( this );
runner.setDaemon( true );
runner.start();
runner.notifyError();
@@ -86,7 +88,7 @@ public class RemoteCacheNoWaitFacade<K, V>
if ( getCacheEventLogger() != null )
{
getCacheEventLogger().logApplicationEvent( "RemoteCacheNoWaitFacade", "InitiatedFailover",
- noWaits[i] + " was in error." );
+ rcnw + " was in error." );
}
}
else
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheAttributes.java b/src/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheAttributes.java
index e67751d..aa528ba 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheAttributes.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheAttributes.java
@@ -1,5 +1,7 @@
package org.apache.commons.jcs.auxiliary.remote.behavior;
+import java.util.List;
+
import org.apache.commons.jcs.auxiliary.remote.RemoteLocation;
/*
@@ -65,14 +67,14 @@ public interface IRemoteCacheAttributes
* <p>
* @return The failovers value
*/
- RemoteLocation[] getFailovers();
+ List<RemoteLocation> getFailovers();
/**
* Sets the failovers attribute of the IRemoteCacheAttributes object
* <p>
- * @param f The new failovers value
+ * @param failovers The new failovers value
*/
- void setFailovers( RemoteLocation[] f );
+ void setFailovers( List<RemoteLocation> failovers );
/**
* Gets the localPort attribute of the IRemoteCacheAttributes object
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
index ecb87ae..6d5a577 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
@@ -19,10 +19,12 @@ package org.apache.commons.jcs.auxiliary.remote.http.client;
* under the License.
*/
+import java.util.ArrayList;
+import java.util.HashMap;
+
import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCacheFactory;
import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheNoWait;
import org.apache.commons.jcs.auxiliary.remote.RemoteCacheNoWaitFacade;
import org.apache.commons.jcs.auxiliary.remote.server.behavior.RemoteType;
import org.apache.commons.jcs.engine.behavior.ICache;
@@ -30,9 +32,6 @@ import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
-import java.util.ArrayList;
-import java.util.HashMap;
-
/**
* The RemoteCacheFactory creates remote caches for the cache hub. It returns a no wait facade which
* is a wrapper around a no wait. The no wait object is either an active connection to a remote
@@ -73,10 +72,8 @@ public class RemoteHttpCacheFactory
ICache<K, V> ic = rcm.getCache( rca );
noWaits.add( ic );
- @SuppressWarnings("unchecked") // No generic arrays in java
- RemoteCacheNoWait<K, V>[] rcnwArray = noWaits.toArray( new RemoteCacheNoWait[0] );
RemoteCacheNoWaitFacade<K, V> rcnwf =
- new RemoteCacheNoWaitFacade<K, V>(rcnwArray, rca, cacheMgr, cacheEventLogger, elementSerializer );
+ new RemoteCacheNoWaitFacade<K, V>(noWaits, rca, cacheMgr, cacheEventLogger, elementSerializer );
getFacades().put( rca.getCacheName(), rcnwf );
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java
index 49b8920..b54b954 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java
@@ -19,6 +19,9 @@ package org.apache.commons.jcs.auxiliary.remote.http.client;
* under the License.
*/
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.commons.jcs.auxiliary.remote.RemoteCacheNoWait;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheClient;
@@ -31,9 +34,6 @@ import org.apache.commons.jcs.utils.config.OptionConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* This is a very crude copy of the RMI remote manager. It needs a lot of work!
*/
@@ -172,7 +172,7 @@ public class RemoteHttpCacheManager
remoteCacheNoWait = remoteCacheNoWait2;
if ( remoteCacheNoWait == null )
{
- RemoteHttpClientListener<K, V> listener = new RemoteHttpClientListener<K, V>( cattr, cacheMgr );
+ RemoteHttpClientListener<K, V> listener = new RemoteHttpClientListener<K, V>( cattr, cacheMgr, elementSerializer );
IRemoteHttpCacheClient<K, V> remoteService = createRemoteHttpCacheClientForAttributes( cattr );
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java
index 28ecd2e..4129724 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java
@@ -22,26 +22,25 @@ package org.apache.commons.jcs.auxiliary.remote.http.client;
import org.apache.commons.jcs.auxiliary.remote.AbstractRemoteCacheListener;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
+import org.apache.commons.jcs.engine.behavior.IElementSerializer;
/** Does nothing */
public class RemoteHttpClientListener<K, V>
extends AbstractRemoteCacheListener<K, V>
{
- /** Serial version */
- private static final long serialVersionUID = -9078366610772128010L;
-
/**
* Only need one since it does work for all regions, just reference by multiple region names.
* <p>
* The constructor exports this object, making it available to receive incoming calls. The
* callback port is anonymous unless a local port value was specified in the configuration.
* <p>
- * @param irca
- * @param cacheMgr
+ * @param irca cache configuration
+ * @param cacheMgr the cache hub
+ * @param elementSerializer a custom serializer
*/
- public RemoteHttpClientListener( IRemoteCacheAttributes irca, ICompositeCacheManager cacheMgr )
+ public RemoteHttpClientListener( IRemoteCacheAttributes irca, ICompositeCacheManager cacheMgr, IElementSerializer elementSerializer )
{
- super( irca, cacheMgr );
+ super( irca, cacheMgr, elementSerializer );
}
/** Nothing */
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java b/src/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java
index f3fc8eb..dca2e37 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java
@@ -19,6 +19,11 @@ package org.apache.commons.jcs.auxiliary.remote.http.server;
* under the License.
*/
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheServiceNonLocal;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
@@ -29,16 +34,11 @@ import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Set;
-
/**
* This class contains common methods for remote cache services. Eventually I hope to extract out
* much of the RMI server to use this as well. I'm starting with the Http service.
*/
-public abstract class AbstractRemoteCacheService<K extends Serializable, V extends Serializable>
+public abstract class AbstractRemoteCacheService<K, V>
implements ICacheServiceNonLocal<K, V>
{
/** An optional event logger */
@@ -511,7 +511,7 @@ public abstract class AbstractRemoteCacheService<K extends Serializable, V exten
* @param eventName
* @return ICacheEvent
*/
- protected <T extends Serializable> ICacheEvent<T> createICacheEvent( String cacheName, T key, long requesterId, String eventName )
+ protected <T> ICacheEvent<T> createICacheEvent( String cacheName, T key, long requesterId, String eventName )
{
if ( cacheEventLogger == null )
{
@@ -541,7 +541,7 @@ public abstract class AbstractRemoteCacheService<K extends Serializable, V exten
* <p>
* @param cacheEvent
*/
- protected <T extends Serializable> void logICacheEvent( ICacheEvent<T> cacheEvent )
+ protected <T> void logICacheEvent( ICacheEvent<T> cacheEvent )
{
if ( cacheEventLogger != null )
{
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptor.java b/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptor.java
deleted file mode 100644
index 31e60b9..0000000
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptor.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.apache.commons.jcs.auxiliary.remote.http.server;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheRequest;
-import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheResponse;
-import org.apache.commons.jcs.engine.behavior.ICacheElement;
-import org.apache.commons.jcs.engine.behavior.ICacheServiceNonLocal;
-import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * The Servlet deserializes the request object. The request object is passed to the processor. The
- * processor then calls the service which does the work of talking to the cache.
- * <p>
- * This is essentially an adaptor on top of the service.
- */
-public class RemoteCacheServiceAdaptor<K extends Serializable, V extends Serializable>
-{
- /** The Logger. */
- private static final Log log = LogFactory.getLog( RemoteCacheServiceAdaptor.class );
-
- /** The service that does the work. */
- private ICacheServiceNonLocal<K, V> remoteCacheService;
-
- /** This is for testing without the factory. */
- protected RemoteCacheServiceAdaptor()
- {
- // for testing.
- }
-
- /**
- * Create a process with a cache manager.
- * <p>
- * @param cacheManager
- */
- public RemoteCacheServiceAdaptor( ICompositeCacheManager cacheManager )
- {
- ICacheServiceNonLocal<K, V> rcs = RemoteHttpCacheSeviceFactory.createRemoteHttpCacheService( cacheManager );
- setRemoteCacheService( rcs );
- }
-
- /**
- * Processes the request. It will call the appropriate method on the service
- * <p>
- * @param request
- * @return RemoteHttpCacheResponse, never null
- */
- @SuppressWarnings( "unchecked" ) // need to cast to correct return type
- public <T> RemoteCacheResponse<T> processRequest( RemoteCacheRequest<K, V> request )
- {
- RemoteCacheResponse<Object> response = new RemoteCacheResponse<Object>();
-
- if ( request == null )
- {
- String message = "The request is null. Cannot process";
- log.warn( message );
- response.setSuccess( false );
- response.setErrorMessage( message );
- }
- else
- {
- try
- {
- switch ( request.getRequestType() )
- {
- case GET:
- ICacheElement<K, V> element = getRemoteCacheService().get( request.getCacheName(), request.getKey(),
- request.getRequesterId() );
- response.setPayload(element);
- break;
- case GET_MULTIPLE:
- Map<K, ICacheElement<K, V>> elementMap = getRemoteCacheService().getMultiple( request.getCacheName(),
- request.getKeySet(),
- request.getRequesterId() );
- if ( elementMap != null )
- {
- Map<K, ICacheElement<K, V>> map = new HashMap<K, ICacheElement<K,V>>();
- map.putAll(elementMap);
- response.setPayload(map);
- }
- break;
- case GET_MATCHING:
- Map<K, ICacheElement<K, V>> elementMapMatching = getRemoteCacheService().getMatching( request.getCacheName(),
- request.getPattern(),
- request.getRequesterId() );
- if ( elementMapMatching != null )
- {
- Map<K, ICacheElement<K, V>> map = new HashMap<K, ICacheElement<K,V>>();
- map.putAll(elementMapMatching);
- response.setPayload(map);
- }
- break;
- case REMOVE:
- getRemoteCacheService().remove( request.getCacheName(), request.getKey(),
- request.getRequesterId() );
- break;
- case REMOVE_ALL:
- getRemoteCacheService().removeAll( request.getCacheName(), request.getRequesterId() );
- break;
- case UPDATE:
- getRemoteCacheService().update( request.getCacheElement(), request.getRequesterId() );
- break;
- case ALIVE_CHECK:
- case DISPOSE:
- response.setSuccess( true );
- // DO NOTHING
- break;
- case GET_KEYSET:
- Set<K> keys = getRemoteCacheService().getKeySet( request.getCacheName() );
- response.setPayload( keys );
- break;
- default:
- String message = "Unknown event type. Cannot process " + request;
- log.warn( message );
- response.setSuccess( false );
- response.setErrorMessage( message );
- break;
- }
- }
- catch ( IOException e )
- {
- String message = "Problem processing request. " + request + " Error: " + e.getMessage();
- log.error( message, e );
- response.setSuccess( false );
- response.setErrorMessage( message );
- }
- }
-
- return (RemoteCacheResponse<T>)response;
- }
-
- /**
- * @param remoteHttpCacheService the remoteHttpCacheService to set
- */
- public void setRemoteCacheService( ICacheServiceNonLocal<K, V> remoteHttpCacheService )
- {
- this.remoteCacheService = remoteHttpCacheService;
- }
-
- /**
- * @return the remoteHttpCacheService
- */
- public ICacheServiceNonLocal<K, V> getRemoteCacheService()
- {
- return remoteCacheService;
- }
-}
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheService.java b/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheService.java
index 5c89014..f250e91 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheService.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheService.java
@@ -19,16 +19,15 @@ package org.apache.commons.jcs.auxiliary.remote.http.server;
* under the License.
*/
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.control.CompositeCache;
import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Set;
-
/**
* This does the work. It's called by the processor. The base class wraps the processing calls in
* event logs, if an event logger is present.
@@ -36,7 +35,7 @@ import java.util.Set;
* For now we assume that all clients are non-cluster clients. And listener notification is not
* supported.
*/
-public class RemoteHttpCacheService<K extends Serializable, V extends Serializable>
+public class RemoteHttpCacheService<K, V>
extends AbstractRemoteCacheService<K, V>
{
/** The name used in the event logs. */
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet.java b/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
index ed7946d..d3708f4 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
@@ -19,26 +19,38 @@ package org.apache.commons.jcs.auxiliary.remote.http.server;
* under the License.
*/
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.jcs.access.exception.CacheException;
+import org.apache.commons.jcs.auxiliary.AuxiliaryCacheConfigurator;
+import org.apache.commons.jcs.auxiliary.remote.http.behavior.IRemoteHttpCacheConstants;
import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheRequest;
import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheResponse;
+import org.apache.commons.jcs.engine.behavior.ICacheElement;
+import org.apache.commons.jcs.engine.behavior.ICacheServiceNonLocal;
+import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.control.CompositeCacheManager;
+import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs.io.ObjectInputStreamClassLoaderAware;
+import org.apache.commons.jcs.utils.config.PropertySetter;
import org.apache.commons.jcs.utils.serialization.StandardSerializer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-
/**
* This servlet simply reads and writes objects. The requests are packaged in a general wrapper. The
* processor works on the wrapper object and returns a response wrapper.
@@ -55,8 +67,8 @@ public class RemoteHttpCacheServlet
/** The cache manager */
private static CompositeCacheManager cacheMgr;
- /** Processes requests */
- private RemoteCacheServiceAdaptor<Serializable, Serializable> remoteHttpCacheServiceAdaptor;
+ /** The service that does the work. */
+ private static ICacheServiceNonLocal<Serializable, Serializable> remoteCacheService;
/** This needs to be standard, since the other side is standard */
private final StandardSerializer serializer = new StandardSerializer();
@@ -81,14 +93,14 @@ public class RemoteHttpCacheServlet
{
try
{
- ensureCacheManager();
+ cacheMgr = CompositeCacheManager.getInstance();
}
catch (CacheException e)
{
throw new ServletException(e);
}
- setRemoteHttpCacheServiceAdaptor( new RemoteCacheServiceAdaptor<Serializable, Serializable>( cacheMgr ) );
+ remoteCacheService = createRemoteHttpCacheService( cacheMgr );
super.init( config );
}
@@ -112,8 +124,7 @@ public class RemoteHttpCacheServlet
}
RemoteCacheRequest<Serializable, Serializable> remoteRequest = readRequest( request );
- RemoteCacheResponse<Serializable> cacheResponse =
- getRemoteHttpCacheServiceAdaptor().processRequest( remoteRequest );
+ RemoteCacheResponse<Object> cacheResponse = processRequest( remoteRequest );
writeResponse( response, cacheResponse );
}
@@ -170,7 +181,7 @@ public class RemoteHttpCacheServlet
* @param response
* @param cacheResponse
*/
- protected void writeResponse( HttpServletResponse response, RemoteCacheResponse<Serializable> cacheResponse )
+ protected void writeResponse( HttpServletResponse response, RemoteCacheResponse<Object> cacheResponse )
{
try
{
@@ -189,38 +200,172 @@ public class RemoteHttpCacheServlet
outputStream.flush();
outputStream.close();
}
- catch ( Exception e )
+ catch ( IOException e )
{
log.error( "Problem writing response. " + cacheResponse, e );
}
}
/**
- * Log some details.
+ * Processes the request. It will call the appropriate method on the service
+ * <p>
+ * @param request
+ * @return RemoteHttpCacheResponse, never null
*/
- private void incrementServiceCallCount()
+ protected RemoteCacheResponse<Object> processRequest( RemoteCacheRequest<Serializable, Serializable> request )
{
- // not thread safe, but it doesn't have to be accurate
- serviceCalls++;
- if ( log.isInfoEnabled() )
+ RemoteCacheResponse<Object> response = new RemoteCacheResponse<Object>();
+
+ if ( request == null )
{
- if ( serviceCalls % logInterval == 0 )
+ String message = "The request is null. Cannot process";
+ log.warn( message );
+ response.setSuccess( false );
+ response.setErrorMessage( message );
+ }
+ else
+ {
+ try
{
- log.info( "serviceCalls = " + serviceCalls );
+ switch ( request.getRequestType() )
+ {
+ case GET:
+ ICacheElement<Serializable, Serializable> element =
+ remoteCacheService.get( request.getCacheName(), request.getKey(), request.getRequesterId() );
+ response.setPayload(element);
+ break;
+ case GET_MULTIPLE:
+ Map<Serializable, ICacheElement<Serializable, Serializable>> elementMap =
+ remoteCacheService.getMultiple( request.getCacheName(), request.getKeySet(), request.getRequesterId() );
+ if ( elementMap != null )
+ {
+ Map<Serializable, ICacheElement<Serializable, Serializable>> map = new HashMap<Serializable, ICacheElement<Serializable, Serializable>>();
+ map.putAll(elementMap);
+ response.setPayload(map);
+ }
+ break;
+ case GET_MATCHING:
+ Map<Serializable, ICacheElement<Serializable, Serializable>> elementMapMatching =
+ remoteCacheService.getMatching( request.getCacheName(), request.getPattern(), request.getRequesterId() );
+ if ( elementMapMatching != null )
+ {
+ Map<Serializable, ICacheElement<Serializable, Serializable>> map = new HashMap<Serializable, ICacheElement<Serializable, Serializable>>();
+ map.putAll(elementMapMatching);
+ response.setPayload(map);
+ }
+ break;
+ case REMOVE:
+ remoteCacheService.remove( request.getCacheName(), request.getKey(), request.getRequesterId() );
+ break;
+ case REMOVE_ALL:
+ remoteCacheService.removeAll( request.getCacheName(), request.getRequesterId() );
+ break;
+ case UPDATE:
+ remoteCacheService.update( request.getCacheElement(), request.getRequesterId() );
+ break;
+ case ALIVE_CHECK:
+ case DISPOSE:
+ response.setSuccess( true );
+ // DO NOTHING
+ break;
+ case GET_KEYSET:
+ Set<Serializable> keys = remoteCacheService.getKeySet( request.getCacheName() );
+ response.setPayload( keys );
+ break;
+ default:
+ String message = "Unknown event type. Cannot process " + request;
+ log.warn( message );
+ response.setSuccess( false );
+ response.setErrorMessage( message );
+ break;
+ }
+ }
+ catch ( IOException e )
+ {
+ String message = "Problem processing request. " + request + " Error: " + e.getMessage();
+ log.error( message, e );
+ response.setSuccess( false );
+ response.setErrorMessage( message );
}
}
+
+ return response;
}
/**
- * Make sure we have a cache manager. This should have happened in the init method.
- *
- * @throws CacheException if the configuration cannot be loaded
+ * Configures the attributes and the event logger and constructs a service.
+ * <p>
+ * @param cacheManager
+ * @return RemoteHttpCacheService
*/
- protected synchronized void ensureCacheManager() throws CacheException
+ protected <K, V> RemoteHttpCacheService<K, V> createRemoteHttpCacheService( ICompositeCacheManager cacheManager )
{
- if ( cacheMgr == null || !cacheMgr.isInitialized() )
+ Properties props = cacheManager.getConfigurationProperties();
+ ICacheEventLogger cacheEventLogger = configureCacheEventLogger( props );
+ RemoteHttpCacheServerAttributes attributes = configureRemoteHttpCacheServerAttributes( props );
+
+ RemoteHttpCacheService<K, V> service = new RemoteHttpCacheService<K, V>( cacheManager, attributes, cacheEventLogger );
+ if ( log.isInfoEnabled() )
{
- cacheMgr = CompositeCacheManager.getInstance();
+ log.info( "Created new RemoteHttpCacheService " + service );
+ }
+ return service;
+ }
+
+ /**
+ * Tries to get the event logger.
+ * <p>
+ * @param props
+ * @return ICacheEventLogger
+ */
+ protected ICacheEventLogger configureCacheEventLogger( Properties props )
+ {
+ ICacheEventLogger cacheEventLogger = AuxiliaryCacheConfigurator
+ .parseCacheEventLogger( props, IRemoteHttpCacheConstants.HTTP_CACHE_SERVER_PREFIX );
+
+ return cacheEventLogger;
+ }
+
+ /**
+ * Configure.
+ * <p>
+ * jcs.remotehttpcache.serverattributes.ATTRIBUTENAME=ATTRIBUTEVALUE
+ * <p>
+ * @param prop
+ * @return RemoteCacheServerAttributesconfigureRemoteCacheServerAttributes
+ */
+ protected RemoteHttpCacheServerAttributes configureRemoteHttpCacheServerAttributes( Properties prop )
+ {
+ RemoteHttpCacheServerAttributes rcsa = new RemoteHttpCacheServerAttributes();
+
+ // configure automatically
+ PropertySetter.setProperties( rcsa, prop,
+ IRemoteHttpCacheConstants.HTTP_CACHE_SERVER_ATTRIBUTES_PROPERTY_PREFIX + "." );
+
+ return rcsa;
+ }
+
+ /**
+ * @param remoteCacheService the remoteCacheService to set
+ */
+ protected void setRemoteCacheService(ICacheServiceNonLocal<Serializable, Serializable> rcs)
+ {
+ remoteCacheService = rcs;
+ }
+
+ /**
+ * Log some details.
+ */
+ private void incrementServiceCallCount()
+ {
+ // not thread safe, but it doesn't have to be accurate
+ serviceCalls++;
+ if ( log.isInfoEnabled() )
+ {
+ if ( serviceCalls % logInterval == 0 )
+ {
+ log.info( "serviceCalls = " + serviceCalls );
+ }
}
}
@@ -232,6 +377,7 @@ public class RemoteHttpCacheServlet
{
log.info( "Servlet Destroyed, shutting down JCS." );
}
+
cacheMgr.shutDown();
}
@@ -245,20 +391,4 @@ public class RemoteHttpCacheServlet
{
return "RemoteHttpCacheServlet";
}
-
- /**
- * @param remoteHttpCacheProcessor the remoteHttpCacheProcessor to set
- */
- public void setRemoteHttpCacheServiceAdaptor( RemoteCacheServiceAdaptor<Serializable, Serializable> remoteHttpCacheProcessor )
- {
- this.remoteHttpCacheServiceAdaptor = remoteHttpCacheProcessor;
- }
-
- /**
- * @return the remoteHttpCacheProcessor
- */
- public RemoteCacheServiceAdaptor<Serializable, Serializable> getRemoteHttpCacheServiceAdaptor()
- {
- return remoteHttpCacheServiceAdaptor;
- }
}
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactory.java b/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactory.java
deleted file mode 100644
index af18ed8..0000000
--- a/src/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.apache.commons.jcs.auxiliary.remote.http.server;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.jcs.auxiliary.AuxiliaryCacheConfigurator;
-import org.apache.commons.jcs.auxiliary.remote.http.behavior.IRemoteHttpCacheConstants;
-import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
-import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
-import org.apache.commons.jcs.utils.config.PropertySetter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-/** Creates the server. */
-public class RemoteHttpCacheSeviceFactory
-{
- /** The logger */
- private static final Log log = LogFactory.getLog( RemoteHttpCacheSeviceFactory.class );
-
- /**
- * Configures the attributes and the event logger and constructs a service.
- * <p>
- * @param cacheManager
- * @return RemoteHttpCacheService
- */
- public static <K extends Serializable, V extends Serializable> RemoteHttpCacheService<K, V> createRemoteHttpCacheService( ICompositeCacheManager cacheManager )
- {
- Properties props = cacheManager.getConfigurationProperties();
- ICacheEventLogger cacheEventLogger = configureCacheEventLogger( props );
- RemoteHttpCacheServerAttributes attributes = configureRemoteHttpCacheServerAttributes( props );
-
- RemoteHttpCacheService<K, V> service = new RemoteHttpCacheService<K, V>( cacheManager, attributes, cacheEventLogger );
- if ( log.isInfoEnabled() )
- {
- log.info( "Created new RemoteHttpCacheService " + service );
- }
- return service;
- }
-
- /**
- * Tries to get the event logger.
- * <p>
- * @param props
- * @return ICacheEventLogger
- */
- protected static ICacheEventLogger configureCacheEventLogger( Properties props )
- {
- ICacheEventLogger cacheEventLogger = AuxiliaryCacheConfigurator
- .parseCacheEventLogger( props, IRemoteHttpCacheConstants.HTTP_CACHE_SERVER_PREFIX );
-
- return cacheEventLogger;
- }
-
- /**
- * Configure.
- * <p>
- * jcs.remotehttpcache.serverattributes.ATTRIBUTENAME=ATTRIBUTEVALUE
- * <p>
- * @param prop
- * @return RemoteCacheServerAttributesconfigureRemoteCacheServerAttributes
- */
- protected static RemoteHttpCacheServerAttributes configureRemoteHttpCacheServerAttributes( Properties prop )
- {
- RemoteHttpCacheServerAttributes rcsa = new RemoteHttpCacheServerAttributes();
-
- // configure automatically
- PropertySetter.setProperties( rcsa, prop,
- IRemoteHttpCacheConstants.HTTP_CACHE_SERVER_ATTRIBUTES_PROPERTY_PREFIX + "." );
-
- return rcsa;
- }
-}
diff --git a/src/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java b/src/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java
index 78c3941..261105a 100644
--- a/src/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java
+++ b/src/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java
@@ -19,14 +19,14 @@ package org.apache.commons.jcs.auxiliary.remote.util;
* under the License.
*/
+import java.util.Set;
+
import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheRequest;
import org.apache.commons.jcs.auxiliary.remote.value.RemoteRequestType;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.Set;
-
/**
* This creates request objects. You could write your own client and use the objects from this
* factory.
@@ -37,20 +37,18 @@ public class RemoteCacheRequestFactory
private static final Log log = LogFactory.getLog( RemoteCacheRequestFactory.class );
/**
- * Creates a get Request.
- * <p>
- * @param cacheName
- * @param key
- * @param requesterId
- * @return RemoteHttpCacheRequest
+ * Create generic request
+ * @param cacheName cache name
+ * @param requestType type of request
+ * @param requesterId id of requester
+ * @return
*/
- public static <K, V> RemoteCacheRequest<K, V> createGetRequest( String cacheName, K key, long requesterId )
+ private static <K, V> RemoteCacheRequest<K, V> createRequest(String cacheName, RemoteRequestType requestType, long requesterId)
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
request.setCacheName( cacheName );
- request.setKey( key );
+ request.setRequestType( requestType );
request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.GET );
if ( log.isDebugEnabled() )
{
@@ -61,6 +59,22 @@ public class RemoteCacheRequestFactory
}
/**
+ * Creates a get Request.
+ * <p>
+ * @param cacheName
+ * @param key
+ * @param requesterId
+ * @return RemoteHttpCacheRequest
+ */
+ public static <K, V> RemoteCacheRequest<K, V> createGetRequest( String cacheName, K key, long requesterId )
+ {
+ RemoteCacheRequest<K, V> request = createRequest(cacheName, RemoteRequestType.GET, requesterId);
+ request.setKey( key );
+
+ return request;
+ }
+
+ /**
* Creates a getMatching Request.
* <p>
* @param cacheName
@@ -70,16 +84,8 @@ public class RemoteCacheRequestFactory
*/
public static <K, V> RemoteCacheRequest<K, V> createGetMatchingRequest( String cacheName, String pattern, long requesterId )
{
- RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
- request.setCacheName( cacheName );
+ RemoteCacheRequest<K, V> request = createRequest(cacheName, RemoteRequestType.GET_MATCHING, requesterId);
request.setPattern( pattern );
- request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.GET_MATCHING );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Created: " + request );
- }
return request;
}
@@ -94,16 +100,8 @@ public class RemoteCacheRequestFactory
*/
public static <K, V> RemoteCacheRequest<K, V> createGetMultipleRequest( String cacheName, Set<K> keys, long requesterId )
{
- RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
- request.setCacheName( cacheName );
- request.setKeySet( keys );
- request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.GET_MULTIPLE );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Created: " + request );
- }
+ RemoteCacheRequest<K, V> request = createRequest(cacheName, RemoteRequestType.GET_MULTIPLE, requesterId);
+ request.setKeySet(keys);
return request;
}
@@ -118,16 +116,8 @@ public class RemoteCacheRequestFactory
*/
public static <K, V> RemoteCacheRequest<K, V> createRemoveRequest( String cacheName, K key, long requesterId )
{
- RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
- request.setCacheName( cacheName );
+ RemoteCacheRequest<K, V> request = createRequest(cacheName, RemoteRequestType.REMOVE, requesterId);
request.setKey( key );
- request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.REMOVE );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Created: " + request );
- }
return request;
}
@@ -141,16 +131,8 @@ public class RemoteCacheRequestFactory
*/
public static RemoteCacheRequest<String, String> createGetKeySetRequest( String cacheName, long requesterId )
{
- RemoteCacheRequest<String, String> request = new RemoteCacheRequest<String, String>();
- request.setCacheName( cacheName );
+ RemoteCacheRequest<String, String> request = createRequest(cacheName, RemoteRequestType.GET_KEYSET, requesterId);
request.setKey( cacheName );
- request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.GET_KEYSET );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Created: " + request );
- }
return request;
}
@@ -164,15 +146,7 @@ public class RemoteCacheRequestFactory
*/
public static <K, V> RemoteCacheRequest<K, V> createRemoveAllRequest( String cacheName, long requesterId )
{
- RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
- request.setCacheName( cacheName );
- request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.REMOVE_ALL );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Created: " + request );
- }
+ RemoteCacheRequest<K, V> request = createRequest(cacheName, RemoteRequestType.REMOVE_ALL, requesterId);
return request;
}
@@ -186,15 +160,7 @@ public class RemoteCacheRequestFactory
*/
public static <K, V> RemoteCacheRequest<K, V> createDisposeRequest( String cacheName, long requesterId )
{
- RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
- request.setCacheName( cacheName );
- request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.DISPOSE );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Created: " + request );
- }
+ RemoteCacheRequest<K, V> request = createRequest(cacheName, RemoteRequestType.DISPOSE, requesterId);
return request;
}
@@ -208,7 +174,7 @@ public class RemoteCacheRequestFactory
*/
public static <K, V> RemoteCacheRequest<K, V> createUpdateRequest( ICacheElement<K, V> cacheElement, long requesterId )
{
- RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
+ RemoteCacheRequest<K, V> request = createRequest(null, RemoteRequestType.UPDATE, requesterId);
if ( cacheElement != null )
{
request.setCacheName( cacheElement.getCacheName() );
@@ -219,13 +185,6 @@ public class RemoteCacheRequestFactory
{
log.error( "Can't create a proper update request for a null cache element." );
}
- request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.UPDATE );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Created: " + request );
- }
return request;
}
@@ -238,17 +197,8 @@ public class RemoteCacheRequestFactory
*/
public static <K, V> RemoteCacheRequest<K, V> createAliveCheckRequest( long requesterId )
{
- RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
- request.setRequesterId( requesterId );
- request.setRequestType( RemoteRequestType.ALIVE_CHECK );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Created: " + request );
- }
+ RemoteCacheRequest<K, V> request = createRequest(null, RemoteRequestType.ALIVE_CHECK, requesterId);
return request;
}
-
-
}
diff --git a/src/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCache.java b/src/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCache.java
index c7e9746..00f48f9 100644
--- a/src/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCache.java
+++ b/src/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCache.java
@@ -19,17 +19,16 @@ package org.apache.commons.jcs.engine.memory.fifo;
* under the License.
*/
+import java.io.IOException;
+
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.memory.AbstractDoubleLinkedListMemoryCache;
import org.apache.commons.jcs.engine.memory.util.MemoryElementDescriptor;
-import java.io.IOException;
-import java.io.Serializable;
-
/**
* The items are spooled in the order they are added. No adjustments to the list are made on get.
*/
-public class FIFOMemoryCache<K extends Serializable, V extends Serializable>
+public class FIFOMemoryCache<K, V>
extends AbstractDoubleLinkedListMemoryCache<K, V>
{
/**
diff --git a/src/org/apache/commons/jcs/utils/access/JCSWorker.java b/src/org/apache/commons/jcs/utils/access/JCSWorker.java
index 6b95203..12395ab 100644
--- a/src/org/apache/commons/jcs/utils/access/JCSWorker.java
+++ b/src/org/apache/commons/jcs/utils/access/JCSWorker.java
@@ -19,7 +19,6 @@ package org.apache.commons.jcs.utils.access;
* under the License.
*/
-import java.io.Serializable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -92,7 +91,7 @@ import org.apache.commons.logging.LogFactory;
* <p>
* @author Travis Savo
*/
-public class JCSWorker<K extends Serializable, V extends Serializable>
+public class JCSWorker<K, V>
{
/** The logger */
private static final Log logger = LogFactory.getLog( JCSWorker.class );
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 052a534..324ea53 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -24,8 +24,8 @@ 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.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -231,7 +231,7 @@ public abstract class Main {
// First lines of last 5 error and warning messages, used for bug reports
private static final List<String> ERRORS_AND_WARNINGS = Collections.<String>synchronizedList(new ArrayList<String>());
- private static final Set<OnlineResource> OFFLINE_RESOURCES = new HashSet<>();
+ private static final Set<OnlineResource> OFFLINE_RESOURCES = EnumSet.noneOf(OnlineResource.class);
/**
* Logging level (5 = trace, 4 = debug, 3 = info, 2 = warn, 1 = error, 0 = none).
@@ -677,10 +677,12 @@ public abstract class Main {
@Override
public void flush() {
+ // Do nothing
}
@Override
public void close() {
+ // Do nothing
}
});
}
@@ -1263,8 +1265,7 @@ public abstract class Main {
}
}
- private static class WindowPositionSizeListener extends WindowAdapter implements
- ComponentListener {
+ private static class WindowPositionSizeListener extends WindowAdapter implements ComponentListener {
@Override
public void windowStateChanged(WindowEvent e) {
Main.windowState = e.getNewState();
@@ -1272,6 +1273,7 @@ public abstract class Main {
@Override
public void componentHidden(ComponentEvent e) {
+ // Do nothing
}
@Override
@@ -1286,6 +1288,7 @@ public abstract class Main {
@Override
public void componentShown(ComponentEvent e) {
+ // Do nothing
}
private static void handleComponentEvent(ComponentEvent e) {
@@ -1341,10 +1344,10 @@ public abstract class Main {
gbc.weightx = 1.0;
panel.add(ho, gbc);
panel.add(link, gbc);
- final String EXIT = tr("Exit JOSM");
- final String CONTINUE = tr("Continue, try anyway");
+ final String exitStr = tr("Exit JOSM");
+ final String continueStr = tr("Continue, try anyway");
int ret = JOptionPane.showOptionDialog(null, panel, tr("Error"), JOptionPane.YES_NO_OPTION,
- JOptionPane.ERROR_MESSAGE, null, new String[] {EXIT, CONTINUE}, EXIT);
+ JOptionPane.ERROR_MESSAGE, null, new String[] {exitStr, continueStr}, exitStr);
if (ret == 0) {
System.exit(0);
}
@@ -1821,6 +1824,6 @@ public abstract class Main {
* @since 7434
*/
public static Set<OnlineResource> getOfflineResources() {
- return new HashSet<>(OFFLINE_RESOURCES);
+ return EnumSet.copyOf(OFFLINE_RESOURCES);
}
}
diff --git a/src/org/openstreetmap/josm/actions/AboutAction.java b/src/org/openstreetmap/josm/actions/AboutAction.java
index d5aaed0..5650ac2 100644
--- a/src/org/openstreetmap/josm/actions/AboutAction.java
+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
@@ -17,7 +17,6 @@ import java.io.InputStreamReader;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
@@ -25,16 +24,15 @@ import javax.swing.JTextArea;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.plugins.PluginHandler;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
/**
* Nice about screen.
@@ -95,9 +93,6 @@ public class AboutAction extends JosmAction {
info.add(new JLabel(tr("Homepage")), GBC.std().insets(10, 0, 10, 0));
info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol().fill(GBC.HORIZONTAL));
info.add(GBC.glue(0, 5), GBC.eol());
- info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10, 0, 10, 0));
- info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())),
- GBC.eol().fill(GBC.HORIZONTAL));
about.addTab(tr("Info"), info);
about.addTab(tr("Readme"), createScrollPane(readme));
@@ -108,12 +103,19 @@ public class AboutAction extends JosmAction {
// Intermediate panel to allow proper optionPane resizing
JPanel panel = new JPanel(new GridBagLayout());
- panel.setPreferredSize(new Dimension(600, 300));
+ panel.setPreferredSize(new Dimension(890, 300));
+ panel.add(new JLabel("", new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(256, 258, Image.SCALE_SMOOTH)),
+ JLabel.CENTER), GBC.std().insets(0, 5, 0, 0));
panel.add(about, GBC.std().fill());
GuiHelper.prepareResizeableOptionPane(panel, panel.getPreferredSize());
- JOptionPane.showMessageDialog(Main.parent, panel, tr("About JOSM..."), JOptionPane.INFORMATION_MESSAGE,
- new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(256, 258, Image.SCALE_SMOOTH)));
+ int ret = new ExtendedDialog(Main.parent, tr("About JOSM..."), new String[] {tr("OK"), tr("Report bug")})
+ .setButtonIcons(new String[] {"ok", "bug"})
+ .setContent(panel, false)
+ .showDialog().getValue();
+ if (2 == ret) {
+ Main.main.menu.reportbug.actionPerformed(null);
+ }
}
/**
diff --git a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
index 98acfe3..290465d 100644
--- a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
+++ b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
+import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
import java.util.List;
@@ -56,25 +57,44 @@ public abstract class AbstractMergeAction extends JosmAction {
super(name, iconName, tooltip, shortcut, register, toolbar, installAdapters);
}
- protected Layer askTargetLayer(List<Layer> targetLayers) {
- JosmComboBox<Layer> layerList = new JosmComboBox<>(targetLayers.toArray(new Layer[0]));
+ protected static Layer askTargetLayer(List<Layer> targetLayers) {
+ return askTargetLayer(targetLayers.toArray(new Layer[0]),
+ tr("Please select the target layer."),
+ tr("Select target layer"),
+ tr("Merge"), "dialogs/mergedown");
+ }
+
+ /**
+ * Asks a target layer.
+ * @param <T> type of layer
+ * @param targetLayers array of proposed target layers
+ * @param label label displayed in dialog
+ * @param title title of dialog
+ * @param buttonText text of button used to select target layer
+ * @param buttonIcon icon name of button used to select target layer
+ * @return choosen target layer
+ */
+ @SuppressWarnings("unchecked")
+ public static <T extends Layer> T askTargetLayer(T[] targetLayers, String label, String title, String buttonText, String buttonIcon) {
+ JosmComboBox<T> layerList = new JosmComboBox<>(targetLayers);
layerList.setRenderer(new LayerListCellRenderer());
layerList.setSelectedIndex(0);
JPanel pnl = new JPanel(new GridBagLayout());
- pnl.add(new JLabel(tr("Please select the target layer.")), GBC.eol());
+ pnl.add(new JLabel(label), GBC.eol());
pnl.add(layerList, GBC.eol());
-
- ExtendedDialog ed = new ExtendedDialog(Main.parent,
- tr("Select target layer"),
- new String[] {tr("Merge"), tr("Cancel")});
- ed.setButtonIcons(new String[] {"dialogs/mergedown", "cancel"});
+ if (GraphicsEnvironment.isHeadless()) {
+ // return first layer in headless mode, for unit tests
+ return targetLayers[0];
+ }
+ ExtendedDialog ed = new ExtendedDialog(Main.parent, title, new String[] {buttonText, tr("Cancel")});
+ ed.setButtonIcons(new String[] {buttonIcon, "cancel"});
ed.setContent(pnl);
ed.showDialog();
- if (ed.getValue() != 1)
+ if (ed.getValue() != 1) {
return null;
-
- return (Layer) layerList.getSelectedItem();
+ }
+ return (T) layerList.getSelectedItem();
}
protected void warnNoTargetLayersForSourceLayer(Layer sourceLayer) {
diff --git a/src/org/openstreetmap/josm/actions/AutoScaleAction.java b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
index bd5307a..4e9c739 100644
--- a/src/org/openstreetmap/josm/actions/AutoScaleAction.java
+++ b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
@@ -7,6 +7,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.awt.geom.Area;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -301,7 +302,10 @@ public class AutoScaleAction extends JosmAction {
v.visit(dataSources.get(lastZoomArea).bounds);
} else {
lastZoomArea = -1;
- v.visit(new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D()));
+ Area sourceArea = Main.main.getCurrentDataSet().getDataSourceArea();
+ if (sourceArea != null) {
+ v.visit(new Bounds(sourceArea.getBounds2D()));
+ }
}
lastZoomTime = System.currentTimeMillis();
} else {
diff --git a/src/org/openstreetmap/josm/actions/CombineWayAction.java b/src/org/openstreetmap/josm/actions/CombineWayAction.java
index db65613..76bed08 100644
--- a/src/org/openstreetmap/josm/actions/CombineWayAction.java
+++ b/src/org/openstreetmap/josm/actions/CombineWayAction.java
@@ -286,14 +286,6 @@ public class CombineWayAction extends JosmAction {
}
/**
- * Constructs a new {@code NodePair}.
- * @param other An existing {@code NodePair}
- */
- public NodePair(NodePair other) {
- this(other.a, other.b);
- }
-
- /**
* Replies the first node.
* @return The first node
*/
@@ -309,14 +301,6 @@ public class CombineWayAction extends JosmAction {
return b;
}
- public boolean isAdjacentToA(NodePair other) {
- return other.getA() == a || other.getB() == a;
- }
-
- public boolean isAdjacentToB(NodePair other) {
- return other.getA() == b || other.getB() == b;
- }
-
public boolean isSuccessorOf(NodePair other) {
return other.getB() == a;
}
diff --git a/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java b/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
index ede14dc..0656f5b 100644
--- a/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
+++ b/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
@@ -46,7 +46,7 @@ public class CopyCoordinatesAction extends JosmAction {
updateEnabledState();
}
- private Collection<Node> getSelectedNodes() {
+ private static Collection<Node> getSelectedNodes() {
if (getCurrentDataSet() == null || getCurrentDataSet().getSelected() == null) {
return Collections.emptyList();
} else {
diff --git a/src/org/openstreetmap/josm/actions/CreateCircleAction.java b/src/org/openstreetmap/josm/actions/CreateCircleAction.java
index 0797e41..490c598 100644
--- a/src/org/openstreetmap/josm/actions/CreateCircleAction.java
+++ b/src/org/openstreetmap/josm/actions/CreateCircleAction.java
@@ -68,7 +68,7 @@ public final class CreateCircleAction extends JosmAction {
* @param nodesCount Number of nodes to be distributed
* @return Array of number of nodes to put in each arc
*/
- private int[] distributeNodes(PolarNode[] angles, int nodesCount) {
+ private static int[] distributeNodes(PolarNode[] angles, int nodesCount) {
int[] count = new int[angles.length];
double[] width = new double[angles.length];
double[] remainder = new double[angles.length];
diff --git a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
index 9d2ca14..b7694e8 100644
--- a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
+++ b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
@@ -37,6 +37,7 @@ import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.dialogs.relation.sort.RelationSorter;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Shortcut;
@@ -327,6 +328,11 @@ public class CreateMultipolygonAction extends JosmAction {
for (JoinedPolygon jway:pol.innerWays) {
addMembers(jway, rel, "inner");
}
+
+ if (clone == null) {
+ rel.setMembers(RelationSorter.sortMembersByConnectivity(rel.getMembers()));
+ }
+
return rel;
}
diff --git a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
index 9067c42..ca61584 100644
--- a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
@@ -42,15 +42,6 @@ public class DialogsToggleAction extends ToggleAction {
setMode();
}
- /**
- * To call if this action must be initially run at JOSM startup.
- */
- public void initial() {
- if (isSelected()) {
- setMode();
- }
- }
-
protected void setMode() {
if (Main.isDisplayingMapView()) {
boolean selected = isSelected();
diff --git a/src/org/openstreetmap/josm/actions/DownloadAlongAction.java b/src/org/openstreetmap/josm/actions/DownloadAlongAction.java
index 5df11fa..b29f0c5 100644
--- a/src/org/openstreetmap/josm/actions/DownloadAlongAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadAlongAction.java
@@ -116,17 +116,6 @@ public abstract class DownloadAlongAction extends JosmAction {
}
final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
final Future<?> future = new DownloadTaskList().download(false, toDownload, osmDownload, gpxDownload, monitor);
- Main.worker.submit(new Runnable() {
- @Override
- public void run() {
- try {
- future.get();
- } catch (Exception e) {
- Main.error(e);
- return;
- }
- monitor.close();
- }
- });
+ waitFuture(future, monitor);
}
}
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index 422ba8a..5af6f74 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -14,8 +14,6 @@ import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.Formatter;
@@ -39,7 +37,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* Adjust the position of an imagery layer.
* @since 3715
*/
-public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener {
+public class ImageryAdjustAction extends MapMode implements AWTEventListener {
private static volatile ImageryOffsetDialog offsetDialog;
private static Cursor cursor = ImageProvider.getCursor("normal", "move");
@@ -294,15 +292,19 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
- if (visible) return;
+ if (visible)
+ return;
offsetDialog = null;
- if (getValue() != 1) {
- layer.setOffset(oldDx, oldDy);
- } else if (tBookmarkName.getText() != null && !tBookmarkName.getText().isEmpty()) {
- OffsetBookmark.bookmarkOffset(tBookmarkName.getText(), layer);
+ if (layer != null) {
+ if (getValue() != 1) {
+ layer.setOffset(oldDx, oldDy);
+ } else if (tBookmarkName.getText() != null && !tBookmarkName.getText().isEmpty()) {
+ OffsetBookmark.bookmarkOffset(tBookmarkName.getText(), layer);
+ }
}
Main.main.menu.imageryMenu.refreshOffsetMenu();
- if (Main.map == null) return;
+ if (Main.map == null)
+ return;
if (oldMapMode != null) {
Main.map.selectMapMode(oldMapMode);
oldMapMode = null;
diff --git a/src/org/openstreetmap/josm/actions/JoinAreasAction.java b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
index e027a03..f96f42e 100644
--- a/src/org/openstreetmap/josm/actions/JoinAreasAction.java
+++ b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
@@ -266,15 +266,15 @@ public class JoinAreasAction extends JosmAction {
/**
* Returns oriented angle (N1N2, N1N3) in range [0; 2*Math.PI[
- * @param N1 first node
- * @param N2 second node
- * @param N3 third node
+ * @param n1 first node
+ * @param n2 second node
+ * @param n3 third node
* @return oriented angle (N1N2, N1N3) in range [0; 2*Math.PI[
*/
- private static double getAngle(Node N1, Node N2, Node N3) {
- EastNorth en1 = N1.getEastNorth();
- EastNorth en2 = N2.getEastNorth();
- EastNorth en3 = N3.getEastNorth();
+ private static double getAngle(Node n1, Node n2, Node n3) {
+ EastNorth en1 = n1.getEastNorth();
+ EastNorth en2 = n2.getEastNorth();
+ EastNorth en3 = n3.getEastNorth();
double angle = Math.atan2(en3.getY() - en1.getY(), en3.getX() - en1.getX()) -
Math.atan2(en2.getY() - en1.getY(), en2.getX() - en1.getX());
while (angle >= 2*Math.PI) {
@@ -776,7 +776,7 @@ public class JoinAreasAction extends JosmAction {
* @return list of parts, marked with the inside orientation.
* @throws IllegalArgumentException if parts is empty
*/
- private List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
+ private static List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
//prepare next map
Map<Way, Way> nextWayMap = new HashMap<>();
@@ -1025,7 +1025,7 @@ public class JoinAreasAction extends JosmAction {
* @param boundaryWays list of joined boundaries to search in
* @return the outermost Way.
*/
- private List<PolygonLevel> findOuterWaysImpl(int level, Collection<AssembledPolygon> boundaryWays) {
+ private static List<PolygonLevel> findOuterWaysImpl(int level, Collection<AssembledPolygon> boundaryWays) {
//TODO: bad performance for deep nestings...
List<PolygonLevel> result = new ArrayList<>();
@@ -1292,7 +1292,7 @@ public class JoinAreasAction extends JosmAction {
* @param selectedWays the selected ways
* @return list of polygons, or null if too complex relation encountered.
*/
- private List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
+ private static List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
List<Multipolygon> result = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/actions/JosmAction.java b/src/org/openstreetmap/josm/actions/JosmAction.java
index a325f22..477b3a7 100644
--- a/src/org/openstreetmap/josm/actions/JosmAction.java
+++ b/src/org/openstreetmap/josm/actions/JosmAction.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.KeyEvent;
import java.util.Collection;
+import java.util.concurrent.Future;
import javax.swing.AbstractAction;
@@ -16,6 +17,7 @@ import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -70,7 +72,6 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
* @param registerInToolbar register this action for the toolbar preferences?
* @param toolbarId 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
- * TODO: do not pass Icon, pass ImageProvider instead
*/
public JosmAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar,
String toolbarId, boolean installAdapters) {
@@ -230,6 +231,23 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
initEnabledState();
}
+ protected static void waitFuture(final Future<?> future, final PleaseWaitProgressMonitor monitor) {
+ Main.worker.submit(
+ new Runnable() {
+ @Override
+ public void run() {
+ try {
+ future.get();
+ } catch (Exception e) {
+ Main.error(e);
+ return;
+ }
+ monitor.close();
+ }
+ }
+ );
+ }
+
/**
* Override in subclasses to init the enabled state of an action when it is
* created. Default behaviour is to call {@link #updateEnabledState()}
diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index 2f1b5c6..708dd72 100644
--- a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
+++ b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
@@ -304,9 +304,7 @@ public final class OrthogonalizeAction extends JosmAction {
// put the nodes of all ways in a set
final Set<Node> allNodes = new HashSet<>();
for (WayData w : wayDataList) {
- for (Node n : w.wayNodes) {
- allNodes.add(n);
- }
+ allNodes.addAll(w.wayNodes);
}
// the new x and y value for each node
@@ -329,20 +327,20 @@ public final class OrthogonalizeAction extends JosmAction {
}
// orthogonalize
- final Direction[] HORIZONTAL = {Direction.RIGHT, Direction.LEFT};
- final Direction[] VERTICAL = {Direction.UP, Direction.DOWN};
- final Direction[][] ORIENTATIONS = {HORIZONTAL, VERTICAL};
- for (Direction[] orientation : ORIENTATIONS) {
+ final Direction[] horizontal = {Direction.RIGHT, Direction.LEFT};
+ final Direction[] vertical = {Direction.UP, Direction.DOWN};
+ final Direction[][] orientations = {horizontal, vertical};
+ for (Direction[] orientation : orientations) {
final Set<Node> s = new HashSet<>(allNodes);
- int s_size = s.size();
- for (int dummy = 0; dummy < s_size; ++dummy) {
+ int size = s.size();
+ for (int dummy = 0; dummy < size; ++dummy) {
if (s.isEmpty()) {
break;
}
- final Node dummy_n = s.iterator().next(); // pick arbitrary element of s
+ final Node dummyN = s.iterator().next(); // pick arbitrary element of s
- final Set<Node> cs = new HashSet<>(); // will contain each node that can be reached from dummy_n
- cs.add(dummy_n); // walking only on horizontal / vertical segments
+ final Set<Node> cs = new HashSet<>(); // will contain each node that can be reached from dummyN
+ cs.add(dummyN); // walking only on horizontal / vertical segments
boolean somethingHappened = true;
while (somethingHappened) {
@@ -365,7 +363,7 @@ public final class OrthogonalizeAction extends JosmAction {
}
}
- final Map<Node, Double> nC = (orientation == HORIZONTAL) ? nY : nX;
+ final Map<Node, Double> nC = (orientation == horizontal) ? nY : nX;
double average = 0;
for (Node n : cs) {
@@ -386,7 +384,7 @@ public final class OrthogonalizeAction extends JosmAction {
// of segments. This can still happen in some pathological cases (see #7889). To avoid
// both heading nodes collapsing to one point, we simply skip this segment string and
// don't touch the node coordinates.
- if (orientation == VERTICAL && headingNodes.size() == 2 && cs.containsAll(headingNodes)) {
+ if (orientation == vertical && headingNodes.size() == 2 && cs.containsAll(headingNodes)) {
continue;
}
@@ -405,9 +403,9 @@ public final class OrthogonalizeAction extends JosmAction {
final double dx = tmp.east() - n.getEastNorth().east();
final double dy = tmp.north() - n.getEastNorth().north();
if (headingNodes.contains(n)) { // The heading nodes should not have changed
- final double EPSILON = 1E-6;
- if (Math.abs(dx) > Math.abs(EPSILON * tmp.east()) ||
- Math.abs(dy) > Math.abs(EPSILON * tmp.east()))
+ final double epsilon = 1E-6;
+ if (Math.abs(dx) > Math.abs(epsilon * tmp.east()) ||
+ Math.abs(dy) > Math.abs(epsilon * tmp.east()))
throw new AssertionError();
} else {
OrthogonalizeAction.rememberMovements.put(n, new EastNorth(dx, dy));
@@ -573,15 +571,15 @@ public final class OrthogonalizeAction extends JosmAction {
*/
private static int angleToDirectionChange(double a, double deltaMax) throws RejectedAngleException {
a = standard_angle_mPI_to_PI(a);
- double d0 = Math.abs(a);
- double d90 = Math.abs(a - Math.PI / 2);
- double d_m90 = Math.abs(a + Math.PI / 2);
+ double d0 = Math.abs(a);
+ double d90 = Math.abs(a - Math.PI / 2);
+ double dm90 = Math.abs(a + Math.PI / 2);
int dirChange;
if (d0 < deltaMax) {
dirChange = 0;
} else if (d90 < deltaMax) {
dirChange = 1;
- } else if (d_m90 < deltaMax) {
+ } else if (dm90 < deltaMax) {
dirChange = -1;
} else {
a = standard_angle_0_to_2PI(a);
diff --git a/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java b/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java
index f7da52d..2984525 100644
--- a/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java
+++ b/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java
@@ -105,10 +105,13 @@ public class OverpassDownloadAction extends JosmAction {
}
private void enableActions(boolean enabled) {
- for (Object key : actionMap.allKeys()) {
- Action action = actionMap.get(key);
- if (action != null) {
- action.setEnabled(enabled);
+ Object[] allKeys = actionMap.allKeys();
+ if (allKeys != null) {
+ for (Object key : allKeys) {
+ Action action = actionMap.get(key);
+ if (action != null) {
+ action.setEnabled(enabled);
+ }
}
}
}
@@ -158,6 +161,7 @@ public class OverpassDownloadAction extends JosmAction {
try {
overpassQuery.setText(OverpassTurboQueryWizard.getInstance().constructQuery(overpassWizardText));
} catch (UncheckedParseException ex) {
+ Main.error(ex);
HelpAwareOptionPane.showOptionDialog(
Main.parent,
tr("<html>The Overpass wizard could not parse the following query:"
diff --git a/src/org/openstreetmap/josm/actions/ReportBugAction.java b/src/org/openstreetmap/josm/actions/ReportBugAction.java
index 28ddc37..277011e 100644
--- a/src/org/openstreetmap/josm/actions/ReportBugAction.java
+++ b/src/org/openstreetmap/josm/actions/ReportBugAction.java
@@ -6,10 +6,8 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
-import org.openstreetmap.josm.tools.OpenBrowser;
import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReportSender;
/**
* Reports a ticket to JOSM bugtracker.
@@ -17,33 +15,28 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class ReportBugAction extends JosmAction {
+ private final String text;
+
/**
- * Constructs a new {@code ReportBugAction}.
+ * Constructs a new {@code ReportBugAction} that reports the normal status report.
*/
public ReportBugAction() {
+ this(null);
+ }
+
+ /**
+ * Constructs a new {@link ReportBugAction} for the given debug text.
+ * @param text The text to send
+ */
+ public ReportBugAction(String text) {
super(tr("Report bug"), "bug", tr("Report a ticket to JOSM bugtracker"),
Shortcut.registerShortcut("reportbug", tr("Report a ticket to JOSM bugtracker"),
KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
+ this.text = text;
}
@Override
public void actionPerformed(ActionEvent e) {
- reportBug();
- }
-
- /**
- * Reports a ticket to JOSM bugtracker.
- */
- public static void reportBug() {
- reportBug(ShowStatusReportAction.getReportHeader());
- }
-
- /**
- * Reports a ticket to JOSM bugtracker with given status report.
- * @param report Status report header containing technical, non-personal information
- */
- public static void reportBug(String report) {
- OpenBrowser.displayUrl(BugReportExceptionHandler.getBugReportUrl(
- Utils.strip(report)).toExternalForm());
+ BugReportSender.reportBug(text == null ? ShowStatusReportAction.getReportHeader() : text);
}
}
diff --git a/src/org/openstreetmap/josm/actions/SaveActionBase.java b/src/org/openstreetmap/josm/actions/SaveActionBase.java
index e52138b..e468f07 100644
--- a/src/org/openstreetmap/josm/actions/SaveActionBase.java
+++ b/src/org/openstreetmap/josm/actions/SaveActionBase.java
@@ -27,7 +27,6 @@ import org.openstreetmap.josm.tools.Shortcut;
* @since 290
*/
public abstract class SaveActionBase extends DiskAccessAction {
- private File file;
/**
* Constructs a new {@code SaveActionBase}.
@@ -69,8 +68,7 @@ public abstract class SaveActionBase extends DiskAccessAction {
public boolean doSave(Layer layer) {
if (!layer.checkSaveConditions())
return false;
- file = getFile(layer);
- return doInternalSave(layer, file);
+ return doInternalSave(layer, getFile(layer));
}
/**
diff --git a/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java b/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java
index 4c3c4d3..f63f6d3 100644
--- a/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java
+++ b/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java
@@ -146,10 +146,7 @@ public class SelectNonBranchingWaySequences {
return;
boolean selectionChanged = false;
- Collection<OsmPrimitive> selection = new LinkedList<>();
- for (OsmPrimitive primitive : currentSelection) {
- selection.add(primitive);
- }
+ Collection<OsmPrimitive> selection = new LinkedList<>(currentSelection);
do {
if (!selection.add(way))
diff --git a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
index 1f8f5fb..f5d8d48 100644
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
@@ -18,8 +18,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-
-import javax.swing.JScrollPane;
+import java.util.TreeSet;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
@@ -27,11 +26,17 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
import org.openstreetmap.josm.data.preferences.Setting;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.gui.preferences.SourceEditor;
+import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
+import org.openstreetmap.josm.gui.preferences.SourceEntry;
+import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReportSender;
+import org.openstreetmap.josm.tools.bugreport.DebugTextDisplay;
/**
* @author xeen
@@ -57,9 +62,12 @@ public final class ShowStatusReportAction extends JosmAction {
Main.toolbar.register(this);
}
- private static void shortenParam(ListIterator<String> it, String[] param, String source, String target) {
- if (source != null && target.length() < source.length() && param[1].startsWith(source)) {
- it.set(param[0] + '=' + param[1].replace(source, target));
+ private static boolean isRunningJavaWebStart() {
+ try {
+ // See http://stackoverflow.com/a/16200769/2257172
+ return Class.forName("javax.jnlp.ServiceManager") != null;
+ } catch (ClassNotFoundException e) {
+ return false;
}
}
@@ -91,7 +99,7 @@ public final class ShowStatusReportAction extends JosmAction {
.append('\n');
}
// Add WebStart package details if run from JNLP
- if (Package.getPackage("javax.jnlp") != null) {
+ if (isRunningJavaWebStart()) {
String webStartDetails = ((PlatformHookUnixoid) Main.platform).getWebStartPackageDetails();
if (webStartDetails != null) {
text.append("WebStart package: ")
@@ -101,10 +109,6 @@ public final class ShowStatusReportAction extends JosmAction {
}
}
try {
- final String envJavaHome = System.getenv("JAVA_HOME");
- final String envJavaHomeAlt = Main.isPlatformWindows() ? "%JAVA_HOME%" : "${JAVA_HOME}";
- final String propJavaHome = System.getProperty("java.home");
- final String propJavaHomeAlt = "<java.home>";
// Build a new list of VM parameters to modify it below if needed (default implementation returns an UnmodifiableList instance)
List<String> vmArguments = new ArrayList<>(ManagementFactory.getRuntimeMXBean().getInputArguments());
for (ListIterator<String> it = vmArguments.listIterator(); it.hasNext();) {
@@ -115,9 +119,11 @@ public final class ShowStatusReportAction extends JosmAction {
if (param[0].toLowerCase(Locale.ENGLISH).startsWith("-dproxy")) {
it.set(param[0]+"=xxx");
} else {
- // Shorten some parameters for readability concerns
- shortenParam(it, param, envJavaHome, envJavaHomeAlt);
- shortenParam(it, param, propJavaHome, propJavaHomeAlt);
+ // Replace some paths for readability and privacy concerns
+ String val = paramCleanup(param[1]);
+ if (!val.equals(param[1])) {
+ it.set(param[0] + '=' + val);
+ }
}
} else if (value.startsWith("-X")) {
// Remove arguments like -Xbootclasspath/a, -Xverify:remote, that can be very long and unhelpful
@@ -135,7 +141,7 @@ public final class ShowStatusReportAction extends JosmAction {
}
List<String> commandLineArgs = Main.getCommandLineArgs();
if (!commandLineArgs.isEmpty()) {
- text.append("Program arguments: ").append(Arrays.toString(commandLineArgs.toArray())).append('\n');
+ text.append("Program arguments: ").append(Arrays.toString(paramCleanup(commandLineArgs).toArray())).append('\n');
}
if (Main.main != null) {
DataSet dataset = Main.main.getCurrentDataSet();
@@ -150,16 +156,75 @@ public final class ShowStatusReportAction extends JosmAction {
}
text.append('\n').append(PluginHandler.getBugReportText()).append('\n');
- Collection<String> errorsWarnings = Main.getLastErrorAndWarnings();
- if (!errorsWarnings.isEmpty()) {
- text.append("Last errors/warnings:\n");
- for (String s : errorsWarnings) {
- text.append("- ").append(s).append('\n');
+ appendCollection(text, "Tagging presets", getCustomUrls(TaggingPresetPreference.PresetPrefHelper.INSTANCE));
+ appendCollection(text, "Map paint styles", getCustomUrls(MapPaintPreference.MapPaintPrefHelper.INSTANCE));
+ appendCollection(text, "Validator rules", getCustomUrls(ValidatorTagCheckerRulesPreference.RulePrefHelper.INSTANCE));
+ appendCollection(text, "Last errors/warnings", Main.getLastErrorAndWarnings());
+
+ return text.toString();
+ }
+
+ protected static Collection<String> getCustomUrls(SourceEditor.SourcePrefHelper helper) {
+ Set<String> set = new TreeSet<>();
+ for (SourceEntry entry : helper.get()) {
+ set.add(entry.url);
+ }
+ for (ExtendedSourceEntry def : helper.getDefault()) {
+ set.remove(def.url);
+ }
+ return set;
+ }
+
+ private static List<String> paramCleanup(Collection<String> params) {
+ List<String> result = new ArrayList<>(params.size());
+ for (String param : params) {
+ result.add(paramCleanup(param));
+ }
+ return result;
+ }
+
+ /**
+ * Shortens and removes private informations from a parameter used for status report.
+ * @param param parameter to cleanup
+ * @return shortened/anonymized parameter
+ */
+ private static String paramCleanup(String param) {
+ final String envJavaHome = System.getenv("JAVA_HOME");
+ final String envJavaHomeAlt = Main.isPlatformWindows() ? "%JAVA_HOME%" : "${JAVA_HOME}";
+ final String propJavaHome = System.getProperty("java.home");
+ final String propJavaHomeAlt = "<java.home>";
+ final String prefDir = Main.pref.getPreferencesDirectory().toString();
+ final String prefDirAlt = "<josm.pref>";
+ final String userDataDir = Main.pref.getUserDataDirectory().toString();
+ final String userDataDirAlt = "<josm.userdata>";
+ final String userCacheDir = Main.pref.getCacheDirectory().toString();
+ final String userCacheDirAlt = "<josm.cache>";
+ final String userHomeDir = System.getProperty("user.home");
+ final String userHomeDirAlt = Main.isPlatformWindows() ? "%UserProfile%" : "${HOME}";
+
+ String val = param;
+ val = paramReplace(val, envJavaHome, envJavaHomeAlt);
+ val = paramReplace(val, envJavaHome, envJavaHomeAlt);
+ val = paramReplace(val, propJavaHome, propJavaHomeAlt);
+ val = paramReplace(val, prefDir, prefDirAlt);
+ val = paramReplace(val, userDataDir, userDataDirAlt);
+ val = paramReplace(val, userCacheDir, userCacheDirAlt);
+ val = paramReplace(val, userHomeDir, userHomeDirAlt);
+ return val;
+ }
+
+ private static String paramReplace(String str, String target, String replacement) {
+ return target == null ? str : str.replace(target, replacement);
+ }
+
+ protected static <T> void appendCollection(StringBuilder text, String label, Collection<T> col) {
+ if (!col.isEmpty()) {
+ text.append(label+":\n");
+ for (T o : col) {
+ text.append("- ").append(paramCleanup(o.toString())).append('\n');
}
text.append('\n');
}
-
- return text.toString();
}
@Override
@@ -177,29 +242,27 @@ public final class ShowStatusReportAction extends JosmAction {
}
}
for (Entry<String, Setting<?>> entry : settings.entrySet()) {
- text.append(entry.getKey()).append('=').append(entry.getValue().getValue()).append('\n');
+ text.append(paramCleanup(entry.getKey()))
+ .append('=')
+ .append(paramCleanup(entry.getValue().getValue().toString())).append('\n');
}
} catch (Exception x) {
Main.error(x);
}
- JosmTextArea ta = new JosmTextArea(text.toString());
- ta.setWrapStyleWord(true);
- ta.setLineWrap(true);
- ta.setEditable(false);
- JScrollPane sp = new JScrollPane(ta);
+ DebugTextDisplay ta = new DebugTextDisplay(text.toString());
ExtendedDialog ed = new ExtendedDialog(Main.parent,
tr("Status Report"),
new String[] {tr("Copy to clipboard and close"), tr("Report bug"), tr("Close") });
ed.setButtonIcons(new String[] {"copy", "bug", "cancel" });
- ed.setContent(sp, false);
+ ed.setContent(ta, false);
ed.setMinimumSize(new Dimension(380, 200));
ed.setPreferredSize(new Dimension(700, Main.parent.getHeight()-50));
switch (ed.showDialog().getValue()) {
- case 1: Utils.copyToClipboard(text.toString()); break;
- case 2: ReportBugAction.reportBug(reportHeader); break;
+ case 1: ta.copyToClippboard(); break;
+ case 2: BugReportSender.reportBug(reportHeader); break;
}
}
}
diff --git a/src/org/openstreetmap/josm/actions/SplitWayAction.java b/src/org/openstreetmap/josm/actions/SplitWayAction.java
index 63525fd..05db126 100644
--- a/src/org/openstreetmap/josm/actions/SplitWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SplitWayAction.java
@@ -212,9 +212,11 @@ public class SplitWayAction extends JosmAction {
return; // splitting is performed in SegmentToKeepSelectionDialog.buttonAction()
}
}
- final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, sel);
- Main.main.undoRedo.add(result.getCommand());
- getCurrentDataSet().setSelected(result.getNewSelection());
+ if (wayToKeep != null) {
+ final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, sel);
+ Main.main.undoRedo.add(result.getCommand());
+ getCurrentDataSet().setSelected(result.getNewSelection());
+ }
}
}
@@ -366,12 +368,11 @@ public class SplitWayAction extends JosmAction {
* @param selectedNodes List of user selected nodes.
* @return List of ways to split
*/
- private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+ static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
if (selectedNodes.isEmpty())
return null;
- // Special case - one of the selected ways touches (not cross) way that we
- // want to split
+ // 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> referedWays =
@@ -394,36 +395,7 @@ public class SplitWayAction extends JosmAction {
}
// List of ways shared by all nodes
- List<Way> result =
- new ArrayList<>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(),
- Way.class));
- for (int i = 1; i < selectedNodes.size(); i++) {
- List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
- for (Iterator<Way> it = result.iterator(); it.hasNext();) {
- if (!ref.contains(it.next())) {
- it.remove();
- }
- }
- }
-
- // Remove broken ways
- for (Iterator<Way> it = result.iterator(); it.hasNext();) {
- if (it.next().getNodesCount() <= 2) {
- it.remove();
- }
- }
-
- if (selectedWays.isEmpty())
- return result;
- else {
- // Return only selected ways
- for (Iterator<Way> it = result.iterator(); it.hasNext();) {
- if (!selectedWays.contains(it.next())) {
- it.remove();
- }
- }
- return result;
- }
+ return UnJoinNodeWayAction.getApplicableWays(selectedWays, selectedNodes);
}
/**
@@ -565,7 +537,7 @@ public class SplitWayAction extends JosmAction {
// Determine which part reuses the existing way
final Way wayToKeep = splitStrategy.determineWayToKeep(newWays);
- return doSplitWay(layer, way, wayToKeep, newWays, newSelection);
+ return wayToKeep != null ? doSplitWay(layer, way, wayToKeep, newWays, newSelection) : null;
}
static SplitWayResult doSplitWay(OsmDataLayer layer, Way way, Way wayToKeep, List<Way> newWays,
@@ -585,9 +557,9 @@ public class SplitWayAction extends JosmAction {
final int indexOfWayToKeep = newWays.indexOf(wayToKeep);
newWays.remove(wayToKeep);
+ newSelection.addAll(newWays);
for (Way wayToAdd : newWays) {
commandList.add(new AddCommand(layer, wayToAdd));
- newSelection.add(wayToAdd);
}
boolean warnmerole = false;
@@ -604,7 +576,8 @@ public class SplitWayAction extends JosmAction {
type = "";
}
- int i_c = 0, i_r = 0;
+ int ic = 0;
+ int ir = 0;
List<RelationMember> relationMembers = r.getMembers();
for (RelationMember rm: relationMembers) {
if (rm.isWay() && rm.getMember() == way) {
@@ -665,9 +638,9 @@ public class SplitWayAction extends JosmAction {
Boolean backwards = null;
int k = 1;
- while (i_r - k >= 0 || i_r + k < relationMembers.size()) {
- if ((i_r - k >= 0) && relationMembers.get(i_r - k).isWay()) {
- Way w = relationMembers.get(i_r - k).getWay();
+ while (ir - k >= 0 || ir + k < relationMembers.size()) {
+ if ((ir - k >= 0) && relationMembers.get(ir - k).isWay()) {
+ Way w = relationMembers.get(ir - k).getWay();
if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
backwards = Boolean.FALSE;
} else if ((w.firstNode() == way.lastNode()) || w.lastNode() == way.lastNode()) {
@@ -675,8 +648,8 @@ public class SplitWayAction extends JosmAction {
}
break;
}
- if ((i_r + k < relationMembers.size()) && relationMembers.get(i_r + k).isWay()) {
- Way w = relationMembers.get(i_r + k).getWay();
+ if ((ir + k < relationMembers.size()) && relationMembers.get(ir + k).isWay()) {
+ Way w = relationMembers.get(ir + k).getWay();
if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
backwards = Boolean.TRUE;
} else if ((w.firstNode() == way.lastNode()) || w.lastNode() == way.lastNode()) {
@@ -687,13 +660,13 @@ public class SplitWayAction extends JosmAction {
k++;
}
- int j = i_c;
+ int j = ic;
final List<Way> waysToAddBefore = newWays.subList(0, indexOfWayToKeep);
for (Way wayToAdd : waysToAddBefore) {
RelationMember em = new RelationMember(rm.getRole(), wayToAdd);
j++;
if (Boolean.TRUE.equals(backwards)) {
- c.addMember(i_c + 1, em);
+ c.addMember(ic + 1, em);
} else {
c.addMember(j - 1, em);
}
@@ -703,16 +676,16 @@ public class SplitWayAction extends JosmAction {
RelationMember em = new RelationMember(rm.getRole(), wayToAdd);
j++;
if (Boolean.TRUE.equals(backwards)) {
- c.addMember(i_c, em);
+ c.addMember(ic, em);
} else {
c.addMember(j, em);
}
}
- i_c = j;
+ ic = j;
}
}
- i_c++;
- i_r++;
+ ic++;
+ ir++;
}
if (c != null) {
diff --git a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
index c85297b..71444da 100644
--- a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
+++ b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
@@ -148,7 +148,7 @@ public class UnJoinNodeWayAction extends JosmAction {
* @param selectedNodes List of user selected nodes.
* @return List of relevant ways
*/
- private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+ static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
if (selectedNodes.isEmpty())
return null;
diff --git a/src/org/openstreetmap/josm/actions/UpdateDataAction.java b/src/org/openstreetmap/josm/actions/UpdateDataAction.java
index 183fbcf..f608448 100644
--- a/src/org/openstreetmap/josm/actions/UpdateDataAction.java
+++ b/src/org/openstreetmap/josm/actions/UpdateDataAction.java
@@ -88,20 +88,7 @@ public class UpdateDataAction extends JosmAction {
//
final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
final Future<?> future = new DownloadTaskList().download(false /* no new layer */, areasToDownload, true, false, monitor);
- Main.worker.submit(
- new Runnable() {
- @Override
- public void run() {
- try {
- future.get();
- } catch (Exception e) {
- Main.error(e);
- return;
- }
- monitor.close();
- }
- }
- );
+ waitFuture(future, monitor);
}
}
}
diff --git a/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java b/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java
index 4833adf..54dba0d 100644
--- a/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java
+++ b/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java
@@ -33,8 +33,7 @@ public class UpdateModifiedAction extends UpdateSelectionAction {
}
// FIXME: overrides the behaviour of UpdateSelectionAction. Doesn't update
- // the enabled state based on the current selection because
- // it doesn't depend on it.
+ // the enabled state based on the current selection because it doesn't depend on it.
// The action should be enabled/disabled based on whether there is a least
// one modified object in the current dataset. Unfortunately, there is no
// efficient way to find out here. getDataSet().allModifiedPrimitives() is
@@ -50,6 +49,7 @@ public class UpdateModifiedAction extends UpdateSelectionAction {
@Override
protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+ // Do nothing
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractChangesetDownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractChangesetDownloadTask.java
new file mode 100644
index 0000000..b63c5a0
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractChangesetDownloadTask.java
@@ -0,0 +1,146 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import java.awt.Component;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Future;
+
+import javax.swing.SwingUtilities;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.ChangesetCache;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.OsmServerChangesetReader;
+import org.openstreetmap.josm.tools.ExceptionUtil;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
+
+/**
+ * Common abstract implementation of other changeset download tasks.
+ * @since 10124
+ */
+public abstract class AbstractChangesetDownloadTask extends AbstractDownloadTask<Set<Changeset>> {
+
+ abstract class RunnableDownloadTask extends PleaseWaitRunnable {
+ /** the reader object used to read changesets from the API */
+ protected final OsmServerChangesetReader reader = new OsmServerChangesetReader();
+ /** the set of downloaded changesets */
+ protected final Set<Changeset> downloadedChangesets = new HashSet<>();
+ /** keeps the last exception thrown in the task, if any */
+ protected Exception lastException;
+
+ RunnableDownloadTask(Component parent, String title) {
+ super(parent, title, false /* don't ignore exceptions */);
+ }
+
+ @Override
+ protected void cancel() {
+ setCanceled(true);
+ synchronized (this) {
+ if (reader != null) {
+ reader.cancel();
+ }
+ }
+ }
+
+ protected final void rememberLastException(Exception e) {
+ lastException = e;
+ setFailed(true);
+ }
+
+ protected final void updateChangesets() {
+ // update the global changeset cache with the downloaded changesets.
+ // this will trigger change events which views are listening to. They
+ // will update their views accordingly.
+ //
+ // Run on the EDT because UI updates are triggered.
+ //
+ Runnable r = new Runnable() {
+ @Override public void run() {
+ ChangesetCache.getInstance().update(downloadedChangesets);
+ }
+ };
+ if (SwingUtilities.isEventDispatchThread()) {
+ r.run();
+ } else {
+ try {
+ SwingUtilities.invokeAndWait(r);
+ } catch (InterruptedException e) {
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
+ } catch (InvocationTargetException e) {
+ Throwable t = e.getTargetException();
+ if (t instanceof RuntimeException) {
+ BugReportExceptionHandler.handleException(t);
+ } else if (t instanceof Exception) {
+ ExceptionUtil.explainException(e);
+ } else {
+ BugReportExceptionHandler.handleException(t);
+ }
+ }
+ }
+ }
+ }
+
+ private RunnableDownloadTask downloadTaskRunnable;
+
+ protected final void setDownloadTask(RunnableDownloadTask downloadTask) {
+ this.downloadTaskRunnable = downloadTask;
+ }
+
+ @Override
+ public final Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
+ return download();
+ }
+
+ /**
+ * Asynchronously launches the changeset download task. This is equivalent to {@code download(false, null, null)}.
+ *
+ * You can wait for the asynchronous download task to finish by synchronizing on the returned
+ * {@link Future}, but make sure not to freeze up JOSM. Example:
+ * <pre>
+ * Future<?> future = task.download();
+ * // DON'T run this on the Swing EDT or JOSM will freeze
+ * future.get(); // waits for the dowload task to complete
+ * </pre>
+ *
+ * The following example uses a pattern which is better suited if a task is launched from the Swing EDT:
+ * <pre>
+ * final Future<?> future = task.download();
+ * Runnable runAfterTask = new Runnable() {
+ * public void run() {
+ * // this is not strictly necessary because of the type of executor service
+ * // Main.worker is initialized with, but it doesn't harm either
+ * //
+ * future.get(); // wait for the download task to complete
+ * doSomethingAfterTheTaskCompleted();
+ * }
+ * }
+ * Main.worker.submit(runAfterTask);
+ * </pre>
+ *
+ * @return the future representing the asynchronous task
+ */
+ public final Future<?> download() {
+ return Main.worker.submit(downloadTaskRunnable);
+ }
+
+ @Override
+ public final Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+ return Main.worker.submit(downloadTaskRunnable);
+ }
+
+ @Override
+ public final void cancel() {
+ downloadTaskRunnable.cancel();
+ }
+
+ @Override
+ public String getConfirmationMessage(URL url) {
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
index e9e7280..a65653c 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
@@ -7,7 +7,7 @@ import java.util.List;
import org.openstreetmap.josm.io.XmlWriter;
/**
- * Common abstract implementation of other download tasks
+ * Common abstract implementation of other download tasks.
* @param <T> The downloaded data type
* @since 2322
*/
@@ -17,22 +17,41 @@ public abstract class AbstractDownloadTask<T> implements DownloadTask {
private boolean failed;
protected T downloadedData;
+ /**
+ * Constructs a new {@code AbstractDownloadTask}.
+ */
public AbstractDownloadTask() {
errorMessages = new ArrayList<>();
}
+ /**
+ * Determines if the download task has been canceled.
+ * @return {@code true} if the download task has been canceled
+ */
public boolean isCanceled() {
return canceled;
}
+ /**
+ * Marks this download task as canceled.
+ * @param canceled {@code true} to mark this download task as canceled
+ */
public void setCanceled(boolean canceled) {
this.canceled = canceled;
}
+ /**
+ * Determines if the download task has failed.
+ * @return {@code true} if the download task has failed
+ */
public boolean isFailed() {
return failed;
}
+ /**
+ * Marks this download task as failed.
+ * @param failed {@code true} to mark this download task as failed
+ */
public void setFailed(boolean failed) {
this.failed = failed;
}
@@ -81,9 +100,15 @@ public abstract class AbstractDownloadTask<T> implements DownloadTask {
return buff.toString();
}
- // Can be overridden for more complex checking logic
+ /**
+ * Determines if the given URL is accepted by {@link #getPatterns}.
+ * Can be overridden for more complex checking logic.
+ * @param url URL to donwload
+ * @return {@code true} if this URL is accepted
+ */
public boolean acceptsUrl(String url) {
- if (url == null) return false;
+ if (url == null)
+ return false;
for (String p: getPatterns()) {
if (url.matches(p)) {
return true;
@@ -112,7 +137,8 @@ public abstract class AbstractDownloadTask<T> implements DownloadTask {
@Override
public boolean acceptsUrl(String url, boolean isRemotecontrol) {
- if (isRemotecontrol && !isSafeForRemotecontrolRequests()) return false;
+ if (isRemotecontrol && !isSafeForRemotecontrolRequests())
+ return false;
return acceptsUrl(url);
}
@@ -132,5 +158,4 @@ public abstract class AbstractDownloadTask<T> implements DownloadTask {
public String[] getPatterns() {
return new String[]{};
}
-
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetContentDownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetContentDownloadTask.java
new file mode 100644
index 0000000..6668cd5
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetContentDownloadTask.java
@@ -0,0 +1,159 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.ChangesetCache;
+import org.openstreetmap.josm.data.osm.ChangesetDataSet;
+import org.openstreetmap.josm.gui.ExceptionDialogUtil;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
+import org.openstreetmap.josm.io.OsmTransferException;
+import org.xml.sax.SAXException;
+
+/**
+ * This is an asynchronous task for downloading the changeset content of a collection of changesets.
+ * @since 2689
+ */
+public class ChangesetContentDownloadTask extends AbstractChangesetDownloadTask {
+
+ private final DownloadTask downloadTask;
+
+ class DownloadTask extends RunnableDownloadTask {
+ /** the list of changeset ids to download */
+ private final List<Integer> toDownload = new ArrayList<>();
+
+ DownloadTask(Component parent, Collection<Integer> ids) {
+ super(parent, tr("Downloading changeset content"));
+ for (Integer id: ids != null ? ids : Collections.<Integer>emptyList()) {
+ if (id == null || id <= 0) {
+ continue;
+ }
+ toDownload.add(id);
+ }
+ }
+
+ /**
+ * Downloads the changeset with id <code>changesetId</code> (only "header" information, no content)
+ *
+ * @param changesetId the changeset id
+ * @throws OsmTransferException if something went wrong
+ */
+ protected void downloadChangeset(int changesetId) throws OsmTransferException {
+ Changeset cs = reader.readChangeset(changesetId, false, getProgressMonitor().createSubTaskMonitor(0, false));
+ ChangesetCache.getInstance().update(cs);
+ }
+
+ @Override
+ protected void realRun() throws SAXException, IOException, OsmTransferException {
+ try {
+ getProgressMonitor().setTicksCount(toDownload.size());
+ int i = 0;
+ for (int id: toDownload) {
+ i++;
+ if (!isAvailableLocally(id)) {
+ getProgressMonitor().setCustomText(tr("({0}/{1}) Downloading changeset {2}...", i, toDownload.size(), id));
+ downloadChangeset(id);
+ }
+ if (isCanceled())
+ return;
+ getProgressMonitor().setCustomText(tr("({0}/{1}) Downloading content for changeset {2}...", i, toDownload.size(), id));
+ ChangesetDataSet ds = reader.downloadChangeset(id, getProgressMonitor().createSubTaskMonitor(0, false));
+ Changeset cs = ChangesetCache.getInstance().get(id);
+ cs.setContent(ds);
+ ChangesetCache.getInstance().update(cs);
+ downloadedChangesets.add(cs);
+ getProgressMonitor().worked(1);
+ }
+ } catch (OsmTransferCanceledException e) {
+ // the download was canceled by the user. This exception is caught if the user canceled the authentication dialog.
+ setCanceled(true);
+ return;
+ } catch (OsmTransferException e) {
+ if (isCanceled())
+ return;
+ rememberLastException(e);
+ }
+ }
+
+ @Override
+ protected void finish() {
+ rememberDownloadedData(downloadedChangesets);
+ if (isCanceled())
+ return;
+ if (lastException != null) {
+ ExceptionDialogUtil.explainException(lastException);
+ }
+ }
+ }
+
+ /**
+ * Creates a download task for a single changeset
+ *
+ * @param changesetId the changeset id. > 0 required.
+ * @throws IllegalArgumentException if changesetId <= 0
+ */
+ public ChangesetContentDownloadTask(int changesetId) {
+ this(Main.parent, changesetId);
+ }
+
+ /**
+ * Creates a download task for a collection of changesets. null values and id <=0 in
+ * the collection are silently discarded.
+ *
+ * @param changesetIds the changeset ids. Empty collection assumed, if null.
+ */
+ public ChangesetContentDownloadTask(Collection<Integer> changesetIds) {
+ this(Main.parent, changesetIds);
+ }
+
+ /**
+ * Creates a download task for a single changeset
+ *
+ * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}.
+ * @param changesetId the changeset id. {@code >0} required.
+ * @throws IllegalArgumentException if {@code changesetId <= 0}
+ * @throws IllegalArgumentException if parent is {@code null}
+ */
+ public ChangesetContentDownloadTask(Component parent, int changesetId) {
+ if (changesetId <= 0)
+ throw new IllegalArgumentException(
+ MessageFormat.format("Expected integer value > 0 for parameter ''{0}'', got ''{1}''", "changesetId", changesetId));
+ downloadTask = new DownloadTask(parent, Collections.singleton(changesetId));
+ setDownloadTask(downloadTask);
+ }
+
+ /**
+ * Creates a download task for a collection of changesets. null values and id <=0 in
+ * the collection are sillently discarded.
+ *
+ * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}.
+ * @param changesetIds the changeset ids. Empty collection assumed, if {@code null}.
+ * @throws IllegalArgumentException if parent is {@code null}
+ */
+ public ChangesetContentDownloadTask(Component parent, Collection<Integer> changesetIds) {
+ downloadTask = new DownloadTask(parent, changesetIds);
+ setDownloadTask(downloadTask);
+ }
+
+ /**
+ * Replies true if the local {@link ChangesetCache} already includes the changeset with
+ * id <code>changesetId</code>.
+ *
+ * @param changesetId the changeset id
+ * @return true if the local {@link ChangesetCache} already includes the changeset with
+ * id <code>changesetId</code>
+ */
+ protected static boolean isAvailableLocally(int changesetId) {
+ return ChangesetCache.getInstance().get(changesetId) != null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java
similarity index 52%
rename from src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
rename to src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java
index 4612a88..e387660 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java
@@ -1,102 +1,74 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.changeset;
+package org.openstreetmap.josm.actions.downloadtasks;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import javax.swing.SwingUtilities;
-
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.ChangesetCache;
import org.openstreetmap.josm.gui.ExceptionDialogUtil;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.io.OsmServerChangesetReader;
import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.ExceptionUtil;
import org.xml.sax.SAXException;
/**
- * This is an asynchronous task for downloading a collection of changests from the OSM
- * server.
+ * This is an asynchronous task for downloading a collection of changests from the OSM server.
*
* The task only downloads the changeset properties without the changeset content. It
* updates the global {@link ChangesetCache}.
- *
+ * @since 2613
*/
-public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
-
- /**
- * Builds a download task from for a collection of changesets.
- *
- * Ignores null values and changesets with {@link Changeset#isNew()} == true.
- *
- * @param changesets the collection of changesets. Assumes an empty collection if null.
- * @return the download task
- */
- public static ChangesetHeaderDownloadTask buildTaskForChangesets(Collection<Changeset> changesets) {
- return buildTaskForChangesets(Main.parent, changesets);
- }
-
- /**
- * Builds a download task from for a collection of changesets.
- *
- * Ignores null values and changesets with {@link Changeset#isNew()} == true.
- *
- * @param parent the parent component relative to which the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} is displayed.
- * Must not be null.
- * @param changesets the collection of changesets. Assumes an empty collection if null.
- * @return the download task
- * @throws IllegalArgumentException if parent is null
- */
- public static ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection<Changeset> changesets) {
- CheckParameterUtil.ensureParameterNotNull(parent, "parent");
- if (changesets == null) {
- changesets = Collections.emptyList();
+public class ChangesetHeaderDownloadTask extends AbstractChangesetDownloadTask {
+
+ private final DownloadTask downloadTask;
+
+ class DownloadTask extends RunnableDownloadTask {
+ /** the list of changeset ids to download */
+ private final Set<Integer> toDownload = new HashSet<>();
+ /** whether to include discussions or not */
+ private final boolean includeDiscussion;
+
+ DownloadTask(Component parent, Collection<Integer> ids, boolean includeDiscussion) {
+ super(parent, tr("Download changesets"));
+ this.includeDiscussion = includeDiscussion;
+ for (int id: ids != null ? ids : Collections.<Integer>emptyList()) {
+ if (id <= 0) {
+ continue;
+ }
+ toDownload.add(id);
+ }
}
- Set<Integer> ids = new HashSet<>();
- for (Changeset cs: changesets) {
- if (cs == null || cs.isNew()) {
- continue;
+ @Override
+ protected void realRun() throws SAXException, IOException, OsmTransferException {
+ try {
+ downloadedChangesets.addAll(reader.readChangesets(toDownload, includeDiscussion,
+ getProgressMonitor().createSubTaskMonitor(0, false)));
+ } catch (OsmTransferException e) {
+ if (isCanceled())
+ // ignore exception if canceled
+ return;
+ // remember other exceptions
+ rememberLastException(e);
}
- ids.add(cs.getId());
}
- if (parent == null)
- return new ChangesetHeaderDownloadTask(ids);
- else
- return new ChangesetHeaderDownloadTask(parent, ids);
-
- }
-
- private Set<Integer> idsToDownload;
- private OsmServerChangesetReader reader;
- private boolean canceled;
- private Exception lastException;
- private Set<Changeset> downloadedChangesets;
- private final boolean includeDiscussion;
- protected void init(Collection<Integer> ids) {
- if (ids == null) {
- ids = Collections.emptyList();
- }
- idsToDownload = new HashSet<>();
- if (ids == null || ids.isEmpty())
- return;
- for (int id: ids) {
- if (id <= 0) {
- continue;
+ @Override
+ protected void finish() {
+ rememberDownloadedData(downloadedChangesets);
+ if (isCanceled())
+ return;
+ if (lastException != null) {
+ ExceptionDialogUtil.explainException(lastException);
}
- idsToDownload.add(id);
+ updateChangesets();
}
}
@@ -109,10 +81,7 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
* @param ids the collection of ids. Empty collection assumed if null.
*/
public ChangesetHeaderDownloadTask(Collection<Integer> ids) {
- // parent for dialog is Main.parent
- super(tr("Download changesets"), false /* don't ignore exceptions */);
- init(ids);
- this.includeDiscussion = false;
+ this(Main.parent, ids, false);
}
/**
@@ -142,88 +111,46 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
* @since 7704
*/
public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids, boolean includeDiscussion) {
- super(dialogParent, tr("Download changesets"), false /* don't ignore exceptions */);
- init(ids);
- this.includeDiscussion = includeDiscussion;
+ downloadTask = new DownloadTask(dialogParent, ids, includeDiscussion);
+ setDownloadTask(downloadTask);
}
- @Override
- protected void cancel() {
- canceled = true;
- synchronized (this) {
- if (reader != null) {
- reader.cancel();
- }
- }
+ /**
+ * Builds a download task from for a collection of changesets.
+ *
+ * Ignores null values and changesets with {@link Changeset#isNew()} == true.
+ *
+ * @param changesets the collection of changesets. Assumes an empty collection if null.
+ * @return the download task
+ */
+ public static ChangesetHeaderDownloadTask buildTaskForChangesets(Collection<Changeset> changesets) {
+ return buildTaskForChangesets(Main.parent, changesets);
}
- @Override
- protected void finish() {
- if (canceled)
- return;
- if (lastException != null) {
- ExceptionDialogUtil.explainException(lastException);
- }
- Runnable r = new Runnable() {
- @Override
- public void run() {
- ChangesetCache.getInstance().update(downloadedChangesets);
- }
- };
-
- if (SwingUtilities.isEventDispatchThread()) {
- r.run();
- } else {
- try {
- SwingUtilities.invokeAndWait(r);
- } catch (InterruptedException e) {
- Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
- } catch (InvocationTargetException e) {
- Throwable t = e.getTargetException();
- if (t instanceof RuntimeException) {
- BugReportExceptionHandler.handleException(t);
- } else if (t instanceof Exception) {
- ExceptionUtil.explainException(e);
- } else {
- BugReportExceptionHandler.handleException(t);
- }
- }
- }
- }
+ /**
+ * Builds a download task from for a collection of changesets.
+ *
+ * Ignores null values and changesets with {@link Changeset#isNew()} == true.
+ *
+ * @param parent the parent component relative to which the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} is displayed.
+ * Must not be null.
+ * @param changesets the collection of changesets. Assumes an empty collection if null.
+ * @return the download task
+ * @throws IllegalArgumentException if parent is null
+ */
+ public static ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection<Changeset> changesets) {
+ CheckParameterUtil.ensureParameterNotNull(parent, "parent");
- @Override
- protected void realRun() throws SAXException, IOException, OsmTransferException {
- try {
- synchronized (this) {
- reader = new OsmServerChangesetReader();
+ Set<Integer> ids = new HashSet<>();
+ for (Changeset cs: changesets != null ? changesets : Collections.<Changeset>emptyList()) {
+ if (cs == null || cs.isNew()) {
+ continue;
}
- downloadedChangesets = new HashSet<>();
- downloadedChangesets.addAll(reader.readChangesets(idsToDownload, includeDiscussion,
- getProgressMonitor().createSubTaskMonitor(0, false)));
- } catch (OsmTransferException e) {
- if (canceled)
- // ignore exception if canceled
- return;
- // remember other exceptions
- lastException = e;
+ ids.add(cs.getId());
}
- }
-
- /* ------------------------------------------------------------------------------- */
- /* interface ChangesetDownloadTask */
- /* ------------------------------------------------------------------------------- */
- @Override
- public Set<Changeset> getDownloadedChangesets() {
- return downloadedChangesets;
- }
-
- @Override
- public boolean isCanceled() {
- return canceled;
- }
-
- @Override
- public boolean isFailed() {
- return lastException != null;
+ if (parent == null)
+ return new ChangesetHeaderDownloadTask(ids);
+ else
+ return new ChangesetHeaderDownloadTask(parent, ids);
}
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTask.java
new file mode 100644
index 0000000..202f3ba
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetQueryTask.java
@@ -0,0 +1,139 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.io.IOException;
+
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.UserInfo;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.ChangesetQuery;
+import org.openstreetmap.josm.io.OsmServerUserInfoReader;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
+import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ExceptionUtil;
+import org.xml.sax.SAXException;
+
+/**
+ * Asynchronous task to send a changeset query to the OSM API.
+ * @since 2689
+ */
+public class ChangesetQueryTask extends AbstractChangesetDownloadTask {
+
+ private final DownloadTask downloadTask;
+
+ class DownloadTask extends RunnableDownloadTask {
+ /** the changeset query */
+ private ChangesetQuery query;
+ /** the reader object used to read information about the current user from the API */
+ private final OsmServerUserInfoReader userInfoReader = new OsmServerUserInfoReader();
+
+ DownloadTask(Component parent, ChangesetQuery query) {
+ super(parent, tr("Querying and downloading changesets"));
+ this.query = query;
+ }
+
+ /**
+ * Tries to fully identify the current JOSM user
+ *
+ * @throws OsmTransferException if something went wrong
+ */
+ protected void fullyIdentifyCurrentUser() throws OsmTransferException {
+ getProgressMonitor().indeterminateSubTask(tr("Determine user id for current user..."));
+
+ UserInfo info = userInfoReader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+ im.setFullyIdentified(im.getUserName(), info);
+ }
+
+ @Override
+ protected void realRun() throws SAXException, IOException, OsmTransferException {
+ try {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+ if (query.isRestrictedToPartiallyIdentifiedUser() && im.isCurrentUser(query.getUserName())) {
+ // if we query changesets for the current user, make sure we query against
+ // its user id, not its user name. If necessary, determine the user id first.
+ //
+ if (im.isPartiallyIdentified()) {
+ fullyIdentifyCurrentUser();
+ }
+ query = query.forUser(JosmUserIdentityManager.getInstance().getUserId());
+ }
+ if (isCanceled())
+ return;
+ getProgressMonitor().indeterminateSubTask(tr("Query and download changesets ..."));
+ downloadedChangesets.addAll(reader.queryChangesets(query, getProgressMonitor().createSubTaskMonitor(0, false)));
+ } catch (OsmTransferCanceledException e) {
+ // thrown if user cancel the authentication dialog
+ setCanceled(true);
+ } catch (OsmTransferException e) {
+ if (isCanceled())
+ return;
+ rememberLastException(e);
+ }
+ }
+
+ @Override
+ protected void finish() {
+ rememberDownloadedData(downloadedChangesets);
+ if (isCanceled())
+ return;
+ if (lastException != null) {
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ private final Component parent = progressMonitor != null ? progressMonitor.getWindowParent() : null;
+ @Override
+ public void run() {
+ JOptionPane.showMessageDialog(
+ parent != null ? parent : Main.parent,
+ ExceptionUtil.explainException(lastException),
+ tr("Errors during download"),
+ JOptionPane.ERROR_MESSAGE);
+ }
+ });
+ return;
+ }
+ updateChangesets();
+ }
+
+ @Override
+ protected void cancel() {
+ super.cancel();
+ synchronized (this) {
+ if (userInfoReader != null) {
+ userInfoReader.cancel();
+ }
+ }
+ }
+ }
+
+ /**
+ * Creates the task.
+ *
+ * @param query the query to submit to the OSM server. Must not be null.
+ * @throws IllegalArgumentException if query is null.
+ */
+ public ChangesetQueryTask(ChangesetQuery query) {
+ this(Main.parent, query);
+ }
+
+ /**
+ * Creates the task.
+ *
+ * @param parent the parent component relative to which the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} is displayed.
+ * Must not be null.
+ * @param query the query to submit to the OSM server. Must not be null.
+ * @throws IllegalArgumentException if query is null.
+ * @throws IllegalArgumentException if parent is null
+ */
+ public ChangesetQueryTask(Component parent, ChangesetQuery query) {
+ CheckParameterUtil.ensureParameterNotNull(query, "query");
+ downloadTask = new DownloadTask(parent, query);
+ setDownloadTask(downloadTask);
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
index d4fb9ef..4166b5e 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
@@ -105,11 +105,7 @@ public class DownloadNotesTask extends AbstractDownloadTask<NoteData> {
@Override
protected void finish() {
rememberDownloadedData(new NoteData(notesData));
- if (isCanceled() || isFailed()) {
- return;
- }
-
- if (notesData == null) {
+ if (isCanceled() || isFailed() || notesData == null || notesData.isEmpty()) {
return;
}
if (Main.isDebugEnabled()) {
@@ -120,13 +116,10 @@ public class DownloadNotesTask extends AbstractDownloadTask<NoteData> {
if (Main.map != null) {
noteLayers = Main.map.mapView.getLayersOfType(NoteLayer.class);
}
- NoteLayer layer;
if (noteLayers != null && !noteLayers.isEmpty()) {
- layer = noteLayers.get(0);
- layer.getNoteData().addNotes(notesData);
+ noteLayers.get(0).getNoteData().addNotes(notesData);
} else {
- layer = new NoteLayer(notesData, tr("Notes"));
- Main.main.addLayer(layer);
+ Main.main.addLayer(new NoteLayer(notesData, tr("Notes")));
}
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
index dbb4fd2..8a3df2b 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
@@ -29,13 +29,13 @@ public class DownloadOsmChangeCompressedTask extends DownloadOsmChangeTask {
/**
* Loads a given URL
- * @param new_layer {@code true} if the data should be saved to a new layer
+ * @param newLayer {@code true} if the data should be saved to a new layer
* @param url The URL as String
* @param progressMonitor progress monitor for user interaction
*/
@Override
- public Future<?> loadUrl(boolean new_layer, final String url, ProgressMonitor progressMonitor) {
- downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor) {
+ public Future<?> loadUrl(boolean newLayer, final String url, ProgressMonitor progressMonitor) {
+ downloadTask = new DownloadTask(newLayer, new OsmServerLocationReader(url), progressMonitor) {
@Override
protected DataSet parseDataSet() throws OsmTransferException {
ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
index 2adc733..a1576c0 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
@@ -67,12 +67,12 @@ public class DownloadOsmChangeTask extends DownloadOsmTask {
}
@Override
- public Future<?> loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) {
+ public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
final Matcher matcher = Pattern.compile(OSM_WEBSITE_PATTERN).matcher(url);
if (matcher.matches()) {
url = OsmApi.getOsmApi().getBaseUrl() + "changeset/" + Long.parseLong(matcher.group(2)) + "/download";
}
- downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor);
+ downloadTask = new DownloadTask(newLayer, new OsmServerLocationReader(url), progressMonitor);
// Extract .osc filename from URL to set the new layer name
extractOsmFilename("https?://.*/(.*\\.osc)", url);
return Main.worker.submit(downloadTask);
@@ -211,6 +211,7 @@ public class DownloadOsmChangeTask extends DownloadOsmTask {
@Override
public void historyDataSetCleared(HistoryDataSet source) {
+ // Do nothing
}
}
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
index 3ad0ebf..23f2d3b 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
@@ -38,13 +38,13 @@ public class DownloadOsmCompressedTask extends DownloadOsmTask {
/**
* Loads a given URL
- * @param new_layer {@code true} if the data should be saved to a new layer
+ * @param newLayer {@code true} if the data should be saved to a new layer
* @param url The URL as String
* @param progressMonitor progress monitor for user interaction
*/
@Override
- public Future<?> loadUrl(boolean new_layer, final String url, ProgressMonitor progressMonitor) {
- downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor) {
+ public Future<?> loadUrl(boolean newLayer, final String url, ProgressMonitor progressMonitor) {
+ downloadTask = new DownloadTask(newLayer, new OsmServerLocationReader(url), progressMonitor) {
@Override
protected DataSet parseDataSet() throws OsmTransferException {
ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
index 4b9beff..cafc37d 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
@@ -26,6 +26,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -269,10 +270,14 @@ public class DownloadTaskList {
GuiHelper.runInEDT(new Runnable() {
@Override
public void run() {
- JOptionPane.showMessageDialog(Main.parent, "<html>"
- + tr("The following errors occurred during mass download: {0}",
- Utils.joinAsHtmlUnorderedList(items)) + "</html>",
- tr("Errors during download"), JOptionPane.ERROR_MESSAGE);
+ if (items.size() == 1 && tr("No data found in this area.").equals(items.iterator().next())) {
+ new Notification(items.iterator().next().toString()).setIcon(JOptionPane.WARNING_MESSAGE).show();
+ } else {
+ JOptionPane.showMessageDialog(Main.parent, "<html>"
+ + tr("The following errors occurred during mass download: {0}",
+ Utils.joinAsHtmlUnorderedList(items)) + "</html>",
+ tr("Errors during download"), JOptionPane.ERROR_MESSAGE);
+ }
}
});
diff --git a/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java b/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
index 8025eaa..775c6b6 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
@@ -93,5 +93,6 @@ public class AddNoteAction extends MapMode implements KeyPressReleaseListener {
@Override
public void doKeyReleased(KeyEvent e) {
+ // Do nothing
}
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index bf57b4b..97231d4 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -998,13 +998,13 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
// This computes the intersection between the two segments and adjusts the node position.
Iterator<Pair<Node, Node>> i = segs.iterator();
Pair<Node, Node> seg = i.next();
- EastNorth A = seg.a.getEastNorth();
- EastNorth B = seg.b.getEastNorth();
+ EastNorth pA = seg.a.getEastNorth();
+ EastNorth pB = seg.b.getEastNorth();
seg = i.next();
- EastNorth C = seg.a.getEastNorth();
- EastNorth D = seg.b.getEastNorth();
+ EastNorth pC = seg.a.getEastNorth();
+ EastNorth pD = seg.b.getEastNorth();
- double u = det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north());
+ double u = det(pB.east() - pA.east(), pB.north() - pA.north(), pC.east() - pD.east(), pC.north() - pD.north());
// Check for parallel segments and do nothing if they are
// In practice this will probably only happen when a way has been duplicated
@@ -1016,10 +1016,10 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
// It is the point in the segment where the intersection occurs
// if the segment is scaled to lenght 1
- double q = det(B.north() - C.north(), B.east() - C.east(), D.north() - C.north(), D.east() - C.east()) / u;
+ double q = det(pB.north() - pC.north(), pB.east() - pC.east(), pD.north() - pC.north(), pD.east() - pC.east()) / u;
EastNorth intersection = new EastNorth(
- B.east() + q * (A.east() - B.east()),
- B.north() + q * (A.north() - B.north()));
+ pB.east() + q * (pA.east() - pB.east()),
+ pB.north() + q * (pA.north() - pB.north()));
// only adjust to intersection if within snapToIntersectionThreshold pixel of mouse click; otherwise
@@ -1030,15 +1030,15 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
return;
}
default:
- EastNorth P = n.getEastNorth();
+ EastNorth p = n.getEastNorth();
seg = segs.iterator().next();
- A = seg.a.getEastNorth();
- B = seg.b.getEastNorth();
- double a = P.distanceSq(B);
- double b = P.distanceSq(A);
- double c = A.distanceSq(B);
+ pA = seg.a.getEastNorth();
+ pB = seg.b.getEastNorth();
+ double a = p.distanceSq(pB);
+ double b = p.distanceSq(pA);
+ double c = pA.distanceSq(pB);
q = (a - b + c) / (2*c);
- n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
+ n.setEastNorth(new EastNorth(pB.east() + q * (pA.east() - pB.east()), pB.north() + q * (pA.north() - pB.north())));
}
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index 32c5fd8..5d6dba6 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -349,6 +349,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
@Override
public void doKeyPressed(KeyEvent e) {
+ // Do nothing
}
@Override
@@ -571,9 +572,9 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
WaySegment ws = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive.isSelectablePredicate);
if (ws != null) {
Node n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY()));
- EastNorth A = ws.getFirstNode().getEastNorth();
- EastNorth B = ws.getSecondNode().getEastNorth();
- n.setEastNorth(Geometry.closestPointToSegment(A, B, n.getEastNorth()));
+ EastNorth a = ws.getFirstNode().getEastNorth();
+ EastNorth b = ws.getSecondNode().getEastNorth();
+ n.setEastNorth(Geometry.closestPointToSegment(a, b, n.getEastNorth()));
Way wnew = new Way(ws.way);
wnew.addNode(ws.lowerIndex+1, n);
SequenceCommand cmds = new SequenceCommand(tr("Add a new node to an existing way"),
@@ -761,8 +762,6 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
}
}
return bestMovement;
-
-
}
/***
@@ -1024,15 +1023,17 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
Point p3 = mv.getPoint(newN1en);
Point p4 = mv.getPoint(newN2en);
- Point2D normalUnitVector = getNormalUniVector();
+ Point2D normalUnitVector = activeMoveDirection != null ? getNormalUniVector() : null;
if (mode == Mode.extrude || mode == Mode.create_new) {
g2.setColor(mainColor);
g2.setStroke(mainStroke);
// Draw rectangle around new area.
GeneralPath b = new GeneralPath();
- b.moveTo(p1.x, p1.y); b.lineTo(p3.x, p3.y);
- b.lineTo(p4.x, p4.y); b.lineTo(p2.x, p2.y);
+ b.moveTo(p1.x, p1.y);
+ b.lineTo(p3.x, p3.y);
+ b.lineTo(p4.x, p4.y);
+ b.lineTo(p2.x, p2.y);
b.lineTo(p1.x, p1.y);
g2.draw(b);
@@ -1040,7 +1041,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
// Draw reference ways
drawReferenceSegment(g2, mv, dualAlignSegment1);
drawReferenceSegment(g2, mv, dualAlignSegment2);
- } else if (activeMoveDirection != null) {
+ } else if (activeMoveDirection != null && normalUnitVector != null) {
// Draw reference way
drawReferenceSegment(g2, mv, activeMoveDirection);
@@ -1050,7 +1051,8 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
double headingRefWS = activeMoveDirection.p1.heading(activeMoveDirection.p2);
double headingMoveDir = Math.atan2(normalUnitVector.getY(), normalUnitVector.getX());
double headingDiff = headingRefWS - headingMoveDir;
- if (headingDiff < 0) headingDiff += 2 * Math.PI;
+ if (headingDiff < 0)
+ headingDiff += 2 * Math.PI;
boolean mirrorRA = Math.abs(headingDiff - Math.PI) > 1e-5;
Point pr1 = mv.getPoint(activeMoveDirection.p1);
drawAngleSymbol(g2, pr1, normalUnitVector, mirrorRA);
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index 87599f2..e71bdb5 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -38,8 +38,8 @@ import org.openstreetmap.josm.data.osm.WaySegment;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.MapViewPaintable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.util.ModifierListener;
@@ -50,7 +50,7 @@ import org.openstreetmap.josm.tools.Shortcut;
/**
* @author Alexander Kachkaev <alexander at kachkaev.ru>, 2011
*/
-public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintable,
+public class ImproveWayAccuracyAction extends MapMode implements
SelectionChangedListener, ModifierListener {
enum State {
@@ -90,6 +90,13 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
protected String oldModeHelpText;
+ private final AbstractMapViewPaintable temporaryLayer = new AbstractMapViewPaintable() {
+ @Override
+ public void paint(Graphics2D g, MapView mv, Bounds bbox) {
+ ImproveWayAccuracyAction.this.paint(g, mv, bbox);
+ }
+ };
+
/**
* Constructs a new {@code ImproveWayAccuracyAction}.
* @param mapFrame Map frame
@@ -135,7 +142,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
Main.map.mapView.addMouseListener(this);
Main.map.mapView.addMouseMotionListener(this);
- Main.map.mapView.addTemporaryLayer(this);
+ Main.map.mapView.addTemporaryLayer(temporaryLayer);
DataSet.addSelectionListener(this);
Main.map.keyDetector.addModifierListener(this);
@@ -160,11 +167,11 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
Main.map.mapView.removeMouseListener(this);
Main.map.mapView.removeMouseMotionListener(this);
- Main.map.mapView.removeTemporaryLayer(this);
+ Main.map.mapView.removeTemporaryLayer(temporaryLayer);
DataSet.removeSelectionListener(this);
Main.map.keyDetector.removeModifierListener(this);
- Main.map.mapView.repaint();
+ temporaryLayer.invalidate();
}
@Override
@@ -212,8 +219,10 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
/**
* Redraws temporary layer. Highlights targetWay in select mode. Draws
* preview lines in improve mode and highlights the candidateNode
+ * @param g The graphics
+ * @param mv The map view
+ * @param bbox The bounding box
*/
- @Override
public void paint(Graphics2D g, MapView mv, Bounds bbox) {
if (mousePos == null) {
return;
@@ -356,7 +365,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
updateCursorDependentObjectsIfNeeded();
updateCursor();
updateStatusLine();
- Main.map.mapView.repaint();
+ temporaryLayer.invalidate();
}
@Override
@@ -385,7 +394,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
updateCursorDependentObjectsIfNeeded();
updateCursor();
updateStatusLine();
- Main.map.mapView.repaint();
+ temporaryLayer.invalidate();
}
@Override
@@ -511,7 +520,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
mousePos = null;
updateCursor();
updateStatusLine();
- Main.map.mapView.repaint();
+ temporaryLayer.invalidate();
}
@Override
@@ -523,7 +532,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
if (!dragging) {
mousePos = null;
}
- Main.map.mapView.repaint();
+ temporaryLayer.invalidate();
}
// -------------------------------------------------------------------------
@@ -597,7 +606,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
targetWay = null;
- mv.repaint();
+ temporaryLayer.invalidate();
updateStatusLine();
}
@@ -622,7 +631,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
this.candidateNode = null;
this.candidateSegment = null;
- mv.repaint();
+ temporaryLayer.invalidate();
updateStatusLine();
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
index 2cb90f9..c4e7c5b 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
@@ -21,7 +21,6 @@ import javax.swing.JOptionPane;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.data.SystemOfMeasurement;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.Node;
@@ -80,7 +79,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* @author Ole Jørgen Brønner (olejorgenb)
*/
-public class ParallelWayAction extends MapMode implements ModifierListener, MapViewPaintable, PreferenceChangedListener {
+public class ParallelWayAction extends MapMode implements ModifierListener, MapViewPaintable {
private enum Mode {
dragging, normal
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
index 8301ec3..0d49640 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
@@ -142,23 +142,23 @@ public class ParallelWays {
EastNorth prevA = pts[0].add(normals[0].scale(d));
EastNorth prevB = pts[1].add(normals[0].scale(d));
for (int i = 1; i < nodeCount - 1; i++) {
- EastNorth A = pts[i].add(normals[i].scale(d));
- EastNorth B = pts[i + 1].add(normals[i].scale(d));
- if (Geometry.segmentsParallel(A, B, prevA, prevB)) {
- ppts[i] = A;
+ EastNorth a = pts[i].add(normals[i].scale(d));
+ EastNorth b = pts[i + 1].add(normals[i].scale(d));
+ if (Geometry.segmentsParallel(a, b, prevA, prevB)) {
+ ppts[i] = a;
} else {
- ppts[i] = Geometry.getLineLineIntersection(A, B, prevA, prevB);
+ ppts[i] = Geometry.getLineLineIntersection(a, b, prevA, prevB);
}
- prevA = A;
- prevB = B;
+ prevA = a;
+ prevB = b;
}
if (isClosedPath()) {
- EastNorth A = pts[0].add(normals[0].scale(d));
- EastNorth B = pts[1].add(normals[0].scale(d));
- if (Geometry.segmentsParallel(A, B, prevA, prevB)) {
- ppts[0] = A;
+ EastNorth a = pts[0].add(normals[0].scale(d));
+ EastNorth b = pts[1].add(normals[0].scale(d));
+ if (Geometry.segmentsParallel(a, b, prevA, prevB)) {
+ ppts[0] = a;
} else {
- ppts[0] = Geometry.getLineLineIntersection(A, B, prevA, prevB);
+ ppts[0] = Geometry.getLineLineIntersection(a, b, prevA, prevB);
}
ppts[nodeCount - 1] = ppts[0];
} else {
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index 6c8b0bf..589d4f7 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -666,6 +666,7 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
@Override
public void doKeyReleased(KeyEvent e) {
+ // Do nothing
}
/**
@@ -867,7 +868,7 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
}
}
- private boolean movesHiddenWay() {
+ private static boolean movesHiddenWay() {
final Collection<OsmPrimitive> elementsToTest = new HashSet<>(getCurrentDataSet().getSelected());
for (Way osm : Utils.filteredCollection(getCurrentDataSet().getSelected(), Way.class)) {
elementsToTest.addAll(osm.getNodes());
diff --git a/src/org/openstreetmap/josm/actions/package-info.java b/src/org/openstreetmap/josm/actions/package-info.java
new file mode 100644
index 0000000..6970a7a
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/package-info.java
@@ -0,0 +1,7 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM user actions.
+ * All of them inherit from {@code JosmAction}.
+ */
+package org.openstreetmap.josm.actions;
diff --git a/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java b/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
index b5e5477..ea8176a 100644
--- a/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
+++ b/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
@@ -46,7 +46,9 @@ public class AddSelectionToRelations extends AbstractRelationAction implements S
if (!cmds.isEmpty()) {
Main.main.undoRedo.add(new SequenceCommand(tr("Add selection to relation"), cmds));
new Notification(
- tr("<html><strong>Add selection to relation</strong>: Control every single relation to avoid damage!"))
+ "<html>"+
+ tr("{0}Add selection to relation{1}: Verify every single relation to avoid damage!", "<strong>", "</strong>")+
+ "</html>")
.setIcon(JOptionPane.WARNING_MESSAGE)
.show();
}
diff --git a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
index 6ece250..6c79832 100644
--- a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
@@ -158,7 +158,7 @@ public class RecentRelationsAction implements ActionListener, CommandQueueListen
}
}
- public static void launch(Component parent, KeyStroke keystroke) {
+ protected static void launch(Component parent, KeyStroke keystroke) {
Rectangle r = parent.getBounds();
new RecentRelationsPopupMenu(getRecentRelationsOnActiveLayer(), keystroke).show(parent, r.x, r.y + r.height);
}
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index 6f84675..ad887d4 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -66,7 +66,14 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
private static final String SEARCH_EXPRESSION = "searchExpression";
public enum SearchMode {
- replace('R'), add('A'), remove('D'), in_selection('S');
+ /** replace selection */
+ replace('R'),
+ /** add to selection */
+ add('A'),
+ /** remove from selection */
+ remove('D'),
+ /** find in selection */
+ in_selection('S');
private final char code;
@@ -74,10 +81,19 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
this.code = code;
}
+ /**
+ * Returns the unique character code of this mode.
+ * @return the unique character code of this mode
+ */
public char getCode() {
return code;
}
+ /**
+ * Returns the search mode matching the given character code.
+ * @param code character code
+ * @return search mode matching the given character code
+ */
public static SearchMode fromCode(char code) {
for (SearchMode mode: values()) {
if (mode.getCode() == code)
@@ -243,12 +259,12 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
JRadioButton replace = new JRadioButton(tr("replace selection"), initialValues.mode == SearchMode.replace);
JRadioButton add = new JRadioButton(tr("add to selection"), initialValues.mode == SearchMode.add);
JRadioButton remove = new JRadioButton(tr("remove from selection"), initialValues.mode == SearchMode.remove);
- JRadioButton in_selection = new JRadioButton(tr("find in selection"), initialValues.mode == SearchMode.in_selection);
+ JRadioButton inSelection = new JRadioButton(tr("find in selection"), initialValues.mode == SearchMode.in_selection);
ButtonGroup bg = new ButtonGroup();
bg.add(replace);
bg.add(add);
bg.add(remove);
- bg.add(in_selection);
+ bg.add(inSelection);
final JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive);
JCheckBox allElements = new JCheckBox(tr("all objects"), initialValues.allElements);
@@ -269,7 +285,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
left.add(replace, GBC.eol());
left.add(add, GBC.eol());
left.add(remove, GBC.eol());
- left.add(in_selection, GBC.eop());
+ left.add(inSelection, GBC.eop());
left.add(caseSensitive, GBC.eol());
if (Main.pref.getBoolean("expert", false)) {
left.add(allElements, GBC.eol());
@@ -636,8 +652,8 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
}
public static class SearchSetting {
- public String text = "";
- public SearchMode mode = SearchMode.replace;
+ public String text;
+ public SearchMode mode;
public boolean caseSensitive;
public boolean regexSearch;
public boolean mapCSSSearch;
@@ -647,6 +663,8 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
* Constructs a new {@code SearchSetting}.
*/
public SearchSetting() {
+ text = "";
+ mode = SearchMode.replace;
}
/**
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index 48f6ba4..e4f77cc 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
@@ -322,7 +322,7 @@ public class SearchCompiler {
if (match == null) {
// "operator" (null) should mean the same as "operator()"
// (Always). I.e. match everything
- this.match = new Always();
+ this.match = Always.INSTANCE;
} else {
this.match = match;
}
@@ -371,6 +371,8 @@ public class SearchCompiler {
* Never matches any OsmPrimitive.
*/
public static class Never extends TaggedMatch {
+ /** The unique instance/ */
+ public static final Never INSTANCE = new Never();
@Override
public boolean match(Tagged osm) {
return false;
@@ -1611,7 +1613,7 @@ public class SearchCompiler {
if (!tokenizer.readIfEqual(Token.EOF))
throw new ParseError(tr("Unexpected token: {0}", tokenizer.nextToken()));
if (m == null)
- m = new Always();
+ m = Always.INSTANCE;
Main.debug("Parsed search expression is {0}", m);
return m;
}
diff --git a/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java b/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
index 644f553..5ce841c 100644
--- a/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
+++ b/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
@@ -88,25 +88,25 @@ public class UploadNotesTask {
}
Note newNote;
switch (comment.getNoteAction()) {
- case opened:
+ case OPENED:
if (Main.isDebugEnabled()) {
Main.debug("opening new note");
}
newNote = api.createNote(note.getLatLon(), comment.getText(), monitor);
break;
- case closed:
+ case CLOSED:
if (Main.isDebugEnabled()) {
Main.debug("closing note " + note.getId());
}
newNote = api.closeNote(note, comment.getText(), monitor);
break;
- case commented:
+ case COMMENTED:
if (Main.isDebugEnabled()) {
Main.debug("adding comment to note " + note.getId());
}
newNote = api.addCommentToNote(note, comment.getText(), monitor);
break;
- case reopened:
+ case REOPENED:
if (Main.isDebugEnabled()) {
Main.debug("reopening note " + note.getId());
}
diff --git a/src/org/openstreetmap/josm/command/DeleteCommand.java b/src/org/openstreetmap/josm/command/DeleteCommand.java
index cd18d5a..04a3779 100644
--- a/src/org/openstreetmap/josm/command/DeleteCommand.java
+++ b/src/org/openstreetmap/josm/command/DeleteCommand.java
@@ -153,8 +153,8 @@ public class DeleteCommand extends Command {
}
@Override
- public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
- Collection<OsmPrimitive> added) {
+ public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+ // Do nothing
}
private Set<OsmPrimitiveType> getTypesToDelete() {
diff --git a/src/org/openstreetmap/josm/command/PurgeCommand.java b/src/org/openstreetmap/josm/command/PurgeCommand.java
index cb6113f..8c53cf5 100644
--- a/src/org/openstreetmap/josm/command/PurgeCommand.java
+++ b/src/org/openstreetmap/josm/command/PurgeCommand.java
@@ -275,6 +275,7 @@ public class PurgeCommand extends Command {
@Override
public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+ // Do nothing
}
@Override
diff --git a/src/org/openstreetmap/josm/command/SelectCommand.java b/src/org/openstreetmap/josm/command/SelectCommand.java
index 4075798..df372ad 100644
--- a/src/org/openstreetmap/josm/command/SelectCommand.java
+++ b/src/org/openstreetmap/josm/command/SelectCommand.java
@@ -32,6 +32,7 @@ public class SelectCommand extends Command {
@Override
public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+ // Do nothing
}
@Override
diff --git a/src/org/openstreetmap/josm/command/package-info.java b/src/org/openstreetmap/josm/command/package-info.java
new file mode 100644
index 0000000..333ba66
--- /dev/null
+++ b/src/org/openstreetmap/josm/command/package-info.java
@@ -0,0 +1,7 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM commands allowing to modify an OSM data set.
+ * All of them inherit from {@code Command}.
+ */
+package org.openstreetmap.josm.command;
diff --git a/src/org/openstreetmap/josm/corrector/Correction.java b/src/org/openstreetmap/josm/corrector/Correction.java
deleted file mode 100644
index c12d0f2..0000000
--- a/src/org/openstreetmap/josm/corrector/Correction.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
-
-public interface Correction {
-
-}
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
index 7eb6cd2..367281d 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
@@ -13,6 +13,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.correction.RoleCorrection;
+import org.openstreetmap.josm.data.correction.TagCorrection;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Relation;
diff --git a/src/org/openstreetmap/josm/corrector/RoleCorrection.java b/src/org/openstreetmap/josm/corrector/RoleCorrection.java
deleted file mode 100644
index 5bef9c0..0000000
--- a/src/org/openstreetmap/josm/corrector/RoleCorrection.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
-
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-
-public class RoleCorrection implements Correction {
-
- public final Relation relation;
- public final int position;
- public final RelationMember member;
- public final String newRole;
-
- public RoleCorrection(Relation relation, int position,
- RelationMember member, String newRole) {
- this.relation = relation;
- this.position = position;
- this.member = member;
- this.newRole = newRole;
- }
-}
diff --git a/src/org/openstreetmap/josm/corrector/RoleCorrectionTable.java b/src/org/openstreetmap/josm/corrector/RoleCorrectionTable.java
deleted file mode 100644
index 8f1ea16..0000000
--- a/src/org/openstreetmap/josm/corrector/RoleCorrectionTable.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
-
-import java.util.List;
-
-public class RoleCorrectionTable extends
- CorrectionTable<RoleCorrectionTableModel> {
-
- public RoleCorrectionTable(List<RoleCorrection> roleCorrections) {
- super(new RoleCorrectionTableModel(roleCorrections));
- }
-
-}
diff --git a/src/org/openstreetmap/josm/corrector/TagCorrection.java b/src/org/openstreetmap/josm/corrector/TagCorrection.java
deleted file mode 100644
index af8bf88..0000000
--- a/src/org/openstreetmap/josm/corrector/TagCorrection.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
-
-/**
- * TagCorrection reprepresents a change of a single
- * tag. Both key and value can be subject of this change.
- */
-public class TagCorrection implements Correction {
-
- public final String oldKey;
- public final String newKey;
- public final String oldValue;
- public final String newValue;
-
- public TagCorrection(String oldKey, String oldValue, String newKey,
- String newValue) {
- this.oldKey = oldKey;
- this.oldValue = oldValue;
- this.newKey = newKey;
- this.newValue = newValue;
- }
-
- public boolean isKeyChanged() {
- return !newKey.equals(oldKey);
- }
-
- public boolean isValueChanged() {
- return !newValue.equals(oldValue);
- }
-}
diff --git a/src/org/openstreetmap/josm/corrector/TagCorrectionTable.java b/src/org/openstreetmap/josm/corrector/TagCorrectionTable.java
deleted file mode 100644
index ddd405e..0000000
--- a/src/org/openstreetmap/josm/corrector/TagCorrectionTable.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
-
-import java.util.List;
-
-public class TagCorrectionTable extends
- CorrectionTable<TagCorrectionTableModel> {
-
- public TagCorrectionTable(List<TagCorrection> tagCorrections) {
- super(new TagCorrectionTableModel(tagCorrections));
- }
-
-}
diff --git a/src/org/openstreetmap/josm/corrector/TagCorrector.java b/src/org/openstreetmap/josm/corrector/TagCorrector.java
index 5529ff6..9463072 100644
--- a/src/org/openstreetmap/josm/corrector/TagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/TagCorrector.java
@@ -23,11 +23,15 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.correction.RoleCorrection;
+import org.openstreetmap.josm.data.correction.TagCorrection;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.correction.RoleCorrectionTable;
+import org.openstreetmap.josm.gui.correction.TagCorrectionTable;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
diff --git a/src/org/openstreetmap/josm/data/AutosaveTask.java b/src/org/openstreetmap/josm/data/AutosaveTask.java
index 9de3839..78c34d0 100644
--- a/src/org/openstreetmap/josm/data/AutosaveTask.java
+++ b/src/org/openstreetmap/josm/data/AutosaveTask.java
@@ -323,7 +323,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
return result;
}
- private boolean jvmPerfDataFileExists(final String jvmId) {
+ private static boolean jvmPerfDataFileExists(final String jvmId) {
File jvmDir = new File(System.getProperty("java.io.tmpdir") + File.separator + "hsperfdata_" + System.getProperty("user.name"));
if (jvmDir.exists() && jvmDir.canRead()) {
File[] files = jvmDir.listFiles(new FileFilter() {
diff --git a/src/org/openstreetmap/josm/data/CustomConfigurator.java b/src/org/openstreetmap/josm/data/CustomConfigurator.java
index 8dd1dd4..c570a48 100644
--- a/src/org/openstreetmap/josm/data/CustomConfigurator.java
+++ b/src/org/openstreetmap/josm/data/CustomConfigurator.java
@@ -327,10 +327,6 @@ public final class CustomConfigurator {
}
}
- public static void deleteFileOrDirectory(String path) {
- deleteFileOrDirectory(new File(path));
- }
-
public static void deleteFileOrDirectory(File f) {
if (f.isDirectory()) {
File[] files = f.listFiles();
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index 78c34ef..a2dad2c 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -1459,31 +1459,41 @@ public class Preferences {
}
}
// drop in November 2016
- if (loadedVersion < 9965) {
- Setting<?> setting = settingsMap.get("mappaint.style.entries");
+ removeUrlFromEntries(loadedVersion, 9965,
+ "mappaint.style.entries",
+ "josm.openstreetmap.de/josmfile?page=Styles/LegacyStandard");
+ // drop in December 2016
+ removeUrlFromEntries(loadedVersion, 10063,
+ "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
+ "resource://data/validator/power.mapcss");
+
+ for (String key : OBSOLETE_PREF_KEYS) {
+ if (settingsMap.containsKey(key)) {
+ settingsMap.remove(key);
+ Main.info(tr("Preference setting {0} has been removed since it is no longer used.", key));
+ }
+ }
+ }
+
+ private void removeUrlFromEntries(int loadedVersion, int versionMax, String key, String urlPart) {
+ if (loadedVersion < versionMax) {
+ Setting<?> setting = settingsMap.get(key);
if (setting instanceof MapListSetting) {
List<Map<String, String>> l = new LinkedList<>();
boolean modified = false;
for (Map<String, String> map: ((MapListSetting) setting).getValue()) {
String url = map.get("url");
- if (url != null && url.contains("josm.openstreetmap.de/josmfile?page=Styles/LegacyStandard")) {
+ if (url != null && url.contains(urlPart)) {
modified = true;
} else {
l.add(map);
}
}
if (modified) {
- putListOfStructs("mappaint.style.entries", l);
+ putListOfStructs(key, l);
}
}
}
-
- for (String key : OBSOLETE_PREF_KEYS) {
- if (settingsMap.containsKey(key)) {
- settingsMap.remove(key);
- Main.info(tr("Preference setting {0} has been removed since it is no longer used.", key));
- }
- }
}
/**
diff --git a/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java b/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
index 16afa3f..401138f 100644
--- a/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
@@ -10,7 +10,7 @@ import java.net.URL;
*
* @param <K> cache key type
*/
-public interface ICachedLoaderJob<K> {
+public interface ICachedLoaderJob<K> extends Runnable {
/**
* returns cache entry key
*
@@ -27,11 +27,6 @@ public interface ICachedLoaderJob<K> {
URL getUrl() throws IOException;
/**
- * implements the main algorithm for fetching
- */
- void run();
-
- /**
* fetches object from cache, or returns null when object is not found
*
* @return filled tile with data or null when no cache entry found
diff --git a/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java b/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java
index ef1d9d5..bde426b 100644
--- a/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java
+++ b/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java
@@ -1,6 +1,10 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.cache;
+/**
+ * Cache loader listener.
+ * @since 8168
+ */
public interface ICachedLoaderListener {
/**
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
index 01b4e56..e6c1f86 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
@@ -44,7 +44,7 @@ import org.openstreetmap.josm.tools.Utils;
*
* @since 8168
*/
-public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements ICachedLoaderJob<K>, Runnable {
+public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements ICachedLoaderJob<K> {
private static final Logger log = FeatureAdapter.getLogger(JCSCachedTileLoaderJob.class.getCanonicalName());
protected static final long DEFAULT_EXPIRE_TIME = 1000L * 60 * 60 * 24 * 7; // 7 days
// Limit for the max-age value send by the server.
@@ -141,6 +141,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
}
}
+ @Override
public V get() {
ensureCacheElement();
return cacheData;
diff --git a/src/org/openstreetmap/josm/data/coor/Coordinate.java b/src/org/openstreetmap/josm/data/coor/Coordinate.java
index a8f3c06..7c7b8cc 100644
--- a/src/org/openstreetmap/josm/data/coor/Coordinate.java
+++ b/src/org/openstreetmap/josm/data/coor/Coordinate.java
@@ -92,16 +92,6 @@ abstract class Coordinate implements Serializable {
}
/**
- * Converts to single point BBox.
- *
- * @return single point BBox defined by this coordinate.
- * @since 6203
- */
- public BBox toBBox() {
- return new BBox(x, y);
- }
-
- /**
* Creates bbox around this coordinate. Coordinate defines
* center of bbox, its edge will be 2*r.
*
diff --git a/src/org/openstreetmap/josm/data/coor/LatLon.java b/src/org/openstreetmap/josm/data/coor/LatLon.java
index 0d032f3..0d2471a 100644
--- a/src/org/openstreetmap/josm/data/coor/LatLon.java
+++ b/src/org/openstreetmap/josm/data/coor/LatLon.java
@@ -8,6 +8,7 @@ import static java.lang.Math.cos;
import static java.lang.Math.sin;
import static java.lang.Math.sqrt;
import static java.lang.Math.toRadians;
+import static org.openstreetmap.josm.data.projection.Ellipsoid.WGS84;
import static org.openstreetmap.josm.tools.I18n.trc;
import java.awt.geom.Area;
@@ -47,7 +48,6 @@ public class LatLon extends Coordinate {
*/
public static final double MAX_SERVER_PRECISION = 1e-7;
public static final double MAX_SERVER_INV_PRECISION = 1e7;
- public static final int MAX_SERVER_DIGITS = 7;
/**
* The (0,0) coordinates.
@@ -325,10 +325,9 @@ public class LatLon extends Coordinate {
* @return distance in metres.
*/
public double greatCircleDistance(LatLon other) {
- double R = 6378135;
double sinHalfLat = sin(toRadians(other.lat() - this.lat()) / 2);
double sinHalfLon = sin(toRadians(other.lon() - this.lon()) / 2);
- double d = 2 * R * asin(
+ double d = 2 * WGS84.a * asin(
sqrt(sinHalfLat*sinHalfLat +
cos(toRadians(this.lat()))*cos(toRadians(other.lat()))*sinHalfLon*sinHalfLon));
// For points opposite to each other on the sphere,
@@ -336,7 +335,7 @@ public class LatLon extends Coordinate {
// (This should almost never happen.)
if (java.lang.Double.isNaN(d)) {
Main.error("NaN in greatCircleDistance");
- d = PI * R;
+ d = PI * WGS84.a;
}
return d;
}
@@ -458,7 +457,7 @@ public class LatLon extends Coordinate {
}
/**
- * Returns the value rounded to OSM precisions, i.e. to {@link LatLon#MAX_SERVER_PRECISION}.
+ * Returns the value rounded to OSM precisions, i.e. to {@link #MAX_SERVER_PRECISION}.
* @param value lat/lon value
*
* @return rounded value
@@ -468,21 +467,7 @@ public class LatLon extends Coordinate {
}
/**
- * Returns the value rounded to OSM precision. This function is now the same as
- * {@link #roundToOsmPrecision(double)}, since the rounding error has been fixed.
- * @param value lat/lon value
- *
- * @return rounded value
- * @deprecated Use {@link #roundToOsmPrecision(double)} instead
- */
- @Deprecated
- public static double roundToOsmPrecisionStrict(double value) {
- return roundToOsmPrecision(value);
- }
-
- /**
- * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to
- * MAX_SERVER_PRECISION
+ * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to {@link #MAX_SERVER_PRECISION}
*
* @return a clone of this lat LatLon
*/
@@ -493,18 +478,6 @@ public class LatLon extends Coordinate {
);
}
- /**
- * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to
- * MAX_SERVER_PRECISION
- *
- * @return a clone of this lat LatLon
- * @deprecated Use {@link #getRoundedToOsmPrecision()} instead
- */
- @Deprecated
- public LatLon getRoundedToOsmPrecisionStrict() {
- return getRoundedToOsmPrecision();
- }
-
@Override
public int hashCode() {
return Objects.hash(x, y);
diff --git a/src/org/openstreetmap/josm/data/coor/QuadTiling.java b/src/org/openstreetmap/josm/data/coor/QuadTiling.java
index 3dcf366..739d991 100644
--- a/src/org/openstreetmap/josm/data/coor/QuadTiling.java
+++ b/src/org/openstreetmap/josm/data/coor/QuadTiling.java
@@ -22,11 +22,10 @@ public final class QuadTiling {
public static LatLon tile2LatLon(long quad) {
// The world is divided up into X_PARTS,Y_PARTS.
- // The question is how far we move for each bit
- // being set. In the case of the top level, we
- // move half of the world.
- double x_unit = X_PARTS/2;
- double y_unit = Y_PARTS/2;
+ // The question is how far we move for each bit being set.
+ // In the case of the top level, we move half of the world.
+ double xUnit = X_PARTS/2;
+ double yUnit = Y_PARTS/2;
long shift = (NR_LEVELS*2)-2;
double x = 0;
@@ -35,13 +34,13 @@ public final class QuadTiling {
long bits = (quad >> shift) & 0x3;
// remember x is the MSB
if ((bits & 0x2) != 0) {
- x += x_unit;
+ x += xUnit;
}
if ((bits & 0x1) != 0) {
- y += y_unit;
+ y += yUnit;
}
- x_unit /= 2;
- y_unit /= 2;
+ xUnit /= 2;
+ yUnit /= 2;
shift -= 2;
}
x += X_BIAS;
@@ -62,10 +61,6 @@ public final class QuadTiling {
return tile;
}
- static long coorToTile(LatLon coor) {
- return quadTile(coor);
- }
-
static long lon2x(double lon) {
long ret = (long) ((lon + 180.0) * WORLD_PARTS / 360.0);
if (Utils.equalsEpsilon(ret, WORLD_PARTS)) {
@@ -88,8 +83,8 @@ public final class QuadTiling {
public static int index(int level, long quad) {
long mask = 0x00000003;
- int total_shift = TILES_PER_LEVEL_SHIFT*(NR_LEVELS-level-1);
- return (int) (mask & (quad >> total_shift));
+ int totalShift = TILES_PER_LEVEL_SHIFT*(NR_LEVELS-level-1);
+ return (int) (mask & (quad >> totalShift));
}
/**
diff --git a/src/org/openstreetmap/josm/data/correction/Correction.java b/src/org/openstreetmap/josm/data/correction/Correction.java
new file mode 100644
index 0000000..b312173
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/correction/Correction.java
@@ -0,0 +1,10 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.correction;
+
+/**
+ * Data correction. Represents any change.
+ * @since 1001
+ */
+public interface Correction {
+
+}
diff --git a/src/org/openstreetmap/josm/data/correction/RoleCorrection.java b/src/org/openstreetmap/josm/data/correction/RoleCorrection.java
new file mode 100644
index 0000000..e8aed27
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/correction/RoleCorrection.java
@@ -0,0 +1,35 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.correction;
+
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+
+/**
+ * Represents a change of a single {@link RelationMember} role.
+ * @since 1001
+ */
+public class RoleCorrection implements Correction {
+
+ /** OSM relation */
+ public final Relation relation;
+ /** Relation member index */
+ public final int position;
+ /** Relation member */
+ public final RelationMember member;
+ /** New role */
+ public final String newRole;
+
+ /**
+ * Constructs a new {@code RoleCorrection}.
+ * @param relation OSM relation
+ * @param position relation member index
+ * @param member relation member
+ * @param newRole new role
+ */
+ public RoleCorrection(Relation relation, int position, RelationMember member, String newRole) {
+ this.relation = relation;
+ this.position = position;
+ this.member = member;
+ this.newRole = newRole;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/correction/TagCorrection.java b/src/org/openstreetmap/josm/data/correction/TagCorrection.java
new file mode 100644
index 0000000..bd41bc3
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/correction/TagCorrection.java
@@ -0,0 +1,49 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.correction;
+
+/**
+ * Represents a change of a single tag.
+ * Both key and value can be subject of this change.
+ * @since 729
+ */
+public class TagCorrection implements Correction {
+
+ /** Old key */
+ public final String oldKey;
+ /** New key */
+ public final String newKey;
+ /** Old value */
+ public final String oldValue;
+ /** New value */
+ public final String newValue;
+
+ /**
+ * Constructs a new {@code TagCorrection}.
+ * @param oldKey old key
+ * @param oldValue old value
+ * @param newKey new key
+ * @param newValue new value
+ */
+ public TagCorrection(String oldKey, String oldValue, String newKey, String newValue) {
+ this.oldKey = oldKey;
+ this.oldValue = oldValue;
+ this.newKey = newKey;
+ this.newValue = newValue;
+ }
+
+ /**
+ * Determines if the key has changed.
+ * @return {@code true} if the key has changed
+ */
+ public boolean isKeyChanged() {
+ return !newKey.equals(oldKey);
+ }
+
+ /**
+ * Determines if the value has changed.
+ * @return {@code true} if the value has changed
+ */
+ public boolean isValueChanged() {
+ return !newValue.equals(oldValue);
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/correction/package-info.java b/src/org/openstreetmap/josm/data/correction/package-info.java
new file mode 100644
index 0000000..1c0985e
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/correction/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM data correction.
+ */
+package org.openstreetmap.josm.data.correction;
diff --git a/src/org/openstreetmap/josm/data/gpx/Extensions.java b/src/org/openstreetmap/josm/data/gpx/Extensions.java
index 619d6a7..43fc05b 100644
--- a/src/org/openstreetmap/josm/data/gpx/Extensions.java
+++ b/src/org/openstreetmap/josm/data/gpx/Extensions.java
@@ -2,7 +2,6 @@
package org.openstreetmap.josm.data.gpx;
import java.util.LinkedHashMap;
-import java.util.Map;
/**
* Data class for extensions in a GPX-File.
@@ -11,10 +10,10 @@ public class Extensions extends LinkedHashMap<String, String> {
private static final long serialVersionUID = 1L;
- public Extensions(Map<? extends String, ? extends String> m) {
- super(m);
- }
-
+ /**
+ * Constructs a new {@code Extensions}.
+ */
public Extensions() {
+ super();
}
}
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxData.java b/src/org/openstreetmap/josm/data/gpx/GpxData.java
index bcd8cb9..2d01218 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxData.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxData.java
@@ -239,15 +239,15 @@ public class GpxData extends WithAttributes implements Data {
}
/**
- * Makes a WayPoint at the projection of point P onto the track providing P is less than
+ * Makes a WayPoint at the projection of point p onto the track providing p is less than
* tolerance away from the track
*
- * @param P : the point to determine the projection for
+ * @param p : the point to determine the projection for
* @param tolerance : must be no further than this from the track
- * @return the closest point on the track to P, which may be the first or last point if off the
+ * @return the closest point on the track to p, which may be the first or last point if off the
* end of a segment, or may be null if nothing close enough
*/
- public WayPoint nearestPointOnTrack(EastNorth P, double tolerance) {
+ public WayPoint nearestPointOnTrack(EastNorth p, double tolerance) {
/*
* assume the coordinates of P are xp,yp, and those of a section of track between two
* trackpoints are R=xr,yr and S=xs,ys. Let N be the projected point.
@@ -271,76 +271,76 @@ public class GpxData extends WithAttributes implements Data {
* where RN = sqrt(PR^2 - PN^2)
*/
- double PNminsq = tolerance * tolerance;
+ double pnminsq = tolerance * tolerance;
EastNorth bestEN = null;
double bestTime = 0.0;
- double px = P.east();
- double py = P.north();
+ double px = p.east();
+ double py = p.north();
double rx = 0.0, ry = 0.0, sx, sy, x, y;
if (tracks == null)
return null;
for (GpxTrack track : tracks) {
for (GpxTrackSegment seg : track.getSegments()) {
- WayPoint R = null;
+ WayPoint r = null;
for (WayPoint S : seg.getWayPoints()) {
- EastNorth c = S.getEastNorth();
- if (R == null) {
- R = S;
- rx = c.east();
- ry = c.north();
+ EastNorth en = S.getEastNorth();
+ if (r == null) {
+ r = S;
+ rx = en.east();
+ ry = en.north();
x = px - rx;
y = py - ry;
- double PRsq = x * x + y * y;
- if (PRsq < PNminsq) {
- PNminsq = PRsq;
- bestEN = c;
- bestTime = R.time;
+ double pRsq = x * x + y * y;
+ if (pRsq < pnminsq) {
+ pnminsq = pRsq;
+ bestEN = en;
+ bestTime = r.time;
}
} else {
- sx = c.east();
- sy = c.north();
- double A = sy - ry;
- double B = rx - sx;
- double C = -A * rx - B * ry;
- double RSsq = A * A + B * B;
- if (RSsq == 0) {
+ sx = en.east();
+ sy = en.north();
+ double a = sy - ry;
+ double b = rx - sx;
+ double c = -a * rx - b * ry;
+ double rssq = a * a + b * b;
+ if (rssq == 0) {
continue;
}
- double PNsq = A * px + B * py + C;
- PNsq = PNsq * PNsq / RSsq;
- if (PNsq < PNminsq) {
+ double pnsq = a * px + b * py + c;
+ pnsq = pnsq * pnsq / rssq;
+ if (pnsq < pnminsq) {
x = px - rx;
y = py - ry;
- double PRsq = x * x + y * y;
+ double prsq = x * x + y * y;
x = px - sx;
y = py - sy;
- double PSsq = x * x + y * y;
- if (PRsq - PNsq <= RSsq && PSsq - PNsq <= RSsq) {
- double RNoverRS = Math.sqrt((PRsq - PNsq) / RSsq);
- double nx = rx - RNoverRS * B;
- double ny = ry + RNoverRS * A;
+ double pssq = x * x + y * y;
+ if (prsq - pnsq <= rssq && pssq - pnsq <= rssq) {
+ double rnoverRS = Math.sqrt((prsq - pnsq) / rssq);
+ double nx = rx - rnoverRS * b;
+ double ny = ry + rnoverRS * a;
bestEN = new EastNorth(nx, ny);
- bestTime = R.time + RNoverRS * (S.time - R.time);
- PNminsq = PNsq;
+ bestTime = r.time + rnoverRS * (S.time - r.time);
+ pnminsq = pnsq;
}
}
- R = S;
+ r = S;
rx = sx;
ry = sy;
}
}
- if (R != null) {
- EastNorth c = R.getEastNorth();
+ if (r != null) {
+ EastNorth c = r.getEastNorth();
/* if there is only one point in the seg, it will do this twice, but no matter */
rx = c.east();
ry = c.north();
x = px - rx;
y = py - ry;
- double PRsq = x * x + y * y;
- if (PRsq < PNminsq) {
- PNminsq = PRsq;
+ double prsq = x * x + y * y;
+ if (prsq < pnminsq) {
+ pnminsq = prsq;
bestEN = c;
- bestTime = R.time;
+ bestTime = r.time;
}
}
}
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index 2653294..7b4931f 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -231,6 +231,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
* Constructs a new empty WMS {@code ImageryPreferenceEntry}.
*/
public ImageryPreferenceEntry() {
+ // Do nothing
}
/**
@@ -295,7 +296,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
valid_georeference = i.isGeoreferenceValid();
supports_epsg_4326_to_3857_conversion = i.isEpsg4326To3857Supported();
-
}
@Override
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
index e02d4b4..d52eea8 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
@@ -66,7 +66,7 @@ public class ImageryLayerInfo {
* Loads the custom as well as default imagery entries.
* @param fastFail whether opening HTTP connections should fail fast, see {@link ImageryReader#setFastFail(boolean)}
*/
- public void load(boolean fastFail) {
+ public void load(boolean fastFail) {
clear();
List<ImageryPreferenceEntry> entries = Main.pref.getListOfStructs("imagery.entries", null, ImageryPreferenceEntry.class);
if (entries != null) {
@@ -273,7 +273,7 @@ public class ImageryLayerInfo {
}
}
- private boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
+ private static boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
if (iiA == null)
return false;
if (!iiA.getImageryType().equals(iiB.getImageryType()))
diff --git a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
index 631b5ef..cb4c25e 100644
--- a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
@@ -29,6 +29,7 @@ import org.openstreetmap.josm.data.cache.CacheEntry;
import org.openstreetmap.josm.data.cache.CacheEntryAttributes;
import org.openstreetmap.josm.data.cache.ICachedLoaderListener;
import org.openstreetmap.josm.data.cache.JCSCachedTileLoaderJob;
+import org.openstreetmap.josm.data.preferences.LongProperty;
import org.openstreetmap.josm.tools.HttpClient;
/**
@@ -39,8 +40,10 @@ import org.openstreetmap.josm.tools.HttpClient;
*/
public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, BufferedImageCacheEntry> implements TileJob, ICachedLoaderListener {
private static final Logger LOG = FeatureAdapter.getLogger(TMSCachedTileLoaderJob.class.getCanonicalName());
- private static final long MAXIMUM_EXPIRES = 30 /*days*/ * 24 /*hours*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/;
- private static final long MINIMUM_EXPIRES = 1 /*hour*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/;
+ private static final LongProperty MAXIMUM_EXPIRES = new LongProperty("imagery.generic.maximum_expires",
+ 30 /*days*/ * 24 /*hours*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/);
+ private static final LongProperty MINIMUM_EXPIRES = new LongProperty("imagery.generic.minimum_expires",
+ 1 /*hour*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/);
private final Tile tile;
private volatile URL url;
@@ -243,11 +246,11 @@ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, Buffe
CacheEntryAttributes ret = super.parseHeaders(urlConn);
// keep the expiration time between MINIMUM_EXPIRES and MAXIMUM_EXPIRES, so we will cache the tiles
// at least for some short period of time, but not too long
- if (ret.getExpirationTime() < now + MINIMUM_EXPIRES) {
- ret.setExpirationTime(now + MINIMUM_EXPIRES);
+ if (ret.getExpirationTime() < now + MINIMUM_EXPIRES.get()) {
+ ret.setExpirationTime(now + MINIMUM_EXPIRES.get());
}
- if (ret.getExpirationTime() > now + MAXIMUM_EXPIRES) {
- ret.setExpirationTime(now + MAXIMUM_EXPIRES);
+ if (ret.getExpirationTime() > now + MAXIMUM_EXPIRES.get()) {
+ ret.setExpirationTime(now + MAXIMUM_EXPIRES.get());
}
return ret;
}
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
index 76b48ec..74cf0a1 100644
--- a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
@@ -260,7 +260,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl()));
}
- private Layer userSelectLayer(Collection<Layer> layers) {
+ private static Layer userSelectLayer(Collection<Layer> layers) {
if (layers.size() == 1)
return layers.iterator().next();
Layer ret = null;
@@ -292,9 +292,9 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
private Collection<Layer> getCapabilities() {
XMLInputFactory factory = XMLInputFactory.newFactory();
// do not try to load external entities, nor validate the XML
- factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
- factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
- factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+ factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+ factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
+ factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
try (CachedFile cf = new CachedFile(baseUrl); InputStream in = cf.setHttpHeaders(headers).
setMaxAge(7 * CachedFile.DAYS).
diff --git a/src/org/openstreetmap/josm/data/notes/Note.java b/src/org/openstreetmap/josm/data/notes/Note.java
index 390880f..1692dd3 100644
--- a/src/org/openstreetmap/josm/data/notes/Note.java
+++ b/src/org/openstreetmap/josm/data/notes/Note.java
@@ -11,12 +11,18 @@ import java.util.Objects;
import org.openstreetmap.josm.data.coor.LatLon;
/**
- * A map note. It always has at least one comment since a comment is required
- * to create a note on osm.org
+ * A map note. It always has at least one comment since a comment is required to create a note on osm.org.
+ * @since 7451
*/
public class Note {
- public enum State { open, closed }
+ /** Note state */
+ public enum State {
+ /** Note is open */
+ OPEN,
+ /** Note is closed */
+ CLOSED
+ }
private long id;
private LatLon latLon;
@@ -38,6 +44,10 @@ public class Note {
return id;
}
+ /**
+ * Sets note id.
+ * @param id OSM ID of this note
+ */
public void setId(long id) {
this.id = id;
}
@@ -52,6 +62,10 @@ public class Note {
return createdAt;
}
+ /**
+ * Sets date at which this note has been created.
+ * @param createdAt date at which this note has been created
+ */
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
@@ -61,6 +75,10 @@ public class Note {
return closedAt;
}
+ /**
+ * Sets date at which this note has been closed.
+ * @param closedAt date at which this note has been closed
+ */
public void setClosedAt(Date closedAt) {
this.closedAt = closedAt;
}
@@ -70,6 +88,10 @@ public class Note {
return state;
}
+ /**
+ * Sets the note state.
+ * @param state note state (open or closed)
+ */
public void setState(State state) {
this.state = state;
}
@@ -79,8 +101,12 @@ public class Note {
return comments;
}
+ /**
+ * Adds a comment.
+ * @param comment note comment
+ */
public void addComment(NoteComment comment) {
- this.comments.add(comment);
+ comments.add(comment);
}
/**
@@ -88,7 +114,7 @@ public class Note {
* @return First comment object
*/
public NoteComment getFirstComment() {
- return this.comments.get(0);
+ return comments.isEmpty() ? null : comments.get(0);
}
/**
@@ -111,8 +137,10 @@ public class Note {
@Override
public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
+ if (this == obj)
+ return true;
+ if (obj == null || getClass() != obj.getClass())
+ return false;
Note note = (Note) obj;
return id == note.id;
}
diff --git a/src/org/openstreetmap/josm/data/notes/NoteComment.java b/src/org/openstreetmap/josm/data/notes/NoteComment.java
index 94b6a3d..2eb9d47 100644
--- a/src/org/openstreetmap/josm/data/notes/NoteComment.java
+++ b/src/org/openstreetmap/josm/data/notes/NoteComment.java
@@ -8,6 +8,7 @@ import org.openstreetmap.josm.data.osm.User;
/**
* Represents a comment made on a note. All notes have at least on comment
* which is the comment the note was opened with. Comments are immutable.
+ * @since 7451
*/
public class NoteComment {
@@ -24,11 +25,16 @@ public class NoteComment {
* while others indicate the note being opened, closed or reopened
*/
public enum Action {
- opened,
- closed,
- reopened,
- commented,
- hidden
+ /** note has been opened */
+ OPENED,
+ /** note has been closed */
+ CLOSED,
+ /** note has been reopened */
+ REOPENED,
+ /** note has been commented */
+ COMMENTED,
+ /** note has been hidden */
+ HIDDEN
}
/**
@@ -66,6 +72,10 @@ public class NoteComment {
return action;
}
+ /**
+ * Sets whether this is a new comment/action and needs to be uploaded to the API
+ * @param isNew {@code true} if this is a new comment/action and needs to be uploaded to the API
+ */
public void setNew(boolean isNew) {
this.isNew = isNew;
}
diff --git a/src/org/openstreetmap/josm/data/notes/package-info.java b/src/org/openstreetmap/josm/data/notes/package-info.java
new file mode 100644
index 0000000..6ba4ba0
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/notes/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for OSM notes. See <a href="https://wiki.openstreetmap.org/wiki/Notes">Notes</a>.
+ */
+package org.openstreetmap.josm.data.notes;
diff --git a/src/org/openstreetmap/josm/data/osm/BBox.java b/src/org/openstreetmap/josm/data/osm/BBox.java
index 206e708..7a6bb16 100644
--- a/src/org/openstreetmap/josm/data/osm/BBox.java
+++ b/src/org/openstreetmap/josm/data/osm/BBox.java
@@ -51,22 +51,22 @@ public class BBox {
this.ymax = copy.ymax;
}
- public BBox(double a_x, double a_y, double b_x, double b_y) {
+ public BBox(double ax, double ay, double bx, double by) {
- if (a_x > b_x) {
- xmax = a_x;
- xmin = b_x;
+ if (ax > bx) {
+ xmax = ax;
+ xmin = bx;
} else {
- xmax = b_x;
- xmin = a_x;
+ xmax = bx;
+ xmin = ax;
}
- if (a_y > b_y) {
- ymax = a_y;
- ymin = b_y;
+ if (ay > by) {
+ ymax = ay;
+ ymin = by;
} else {
- ymax = b_y;
- ymin = a_y;
+ ymax = by;
+ ymin = ay;
}
sanity();
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index c046d2b..901e7c2 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -47,6 +47,7 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
import org.openstreetmap.josm.tools.FilteredCollection;
import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Predicates;
import org.openstreetmap.josm.tools.SubclassFilteredCollection;
import org.openstreetmap.josm.tools.Utils;
@@ -263,7 +264,7 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener
*/
private final QuadBuckets<Node> nodes = new QuadBuckets<>();
- private <T extends OsmPrimitive> Collection<T> getPrimitives(Predicate<OsmPrimitive> predicate) {
+ private <T extends OsmPrimitive> Collection<T> getPrimitives(Predicate<? super OsmPrimitive> predicate) {
return new SubclassFilteredCollection<>(allPrimitives, predicate);
}
@@ -401,7 +402,7 @@ public final class DataSet implements Data, Cloneable, ProjectionChangeListener
* @return A collection containing all primitives of the dataset. Data is not ordered
*/
public Collection<OsmPrimitive> allPrimitives() {
- return getPrimitives(OsmPrimitive.allPredicate);
+ return getPrimitives(Predicates.alwaysTrue());
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/Filter.java b/src/org/openstreetmap/josm/data/osm/Filter.java
index 99ee9b5..b5fb131 100644
--- a/src/org/openstreetmap/josm/data/osm/Filter.java
+++ b/src/org/openstreetmap/josm/data/osm/Filter.java
@@ -10,12 +10,29 @@ import org.openstreetmap.josm.data.Preferences.writeExplicitly;
* Data class representing one entry in the filter dialog.
*
* @author Petr_Dlouhý
+ * @since 2125
*/
public class Filter extends SearchSetting {
private static final String version = "1";
+ /**
+ * Enabled status.
+ * @see FilterPreferenceEntry#enable
+ */
public boolean enable = true;
+
+ /**
+ * If this option is activated, the chosen objects are completely hidden.
+ * Otherwise they are disabled and shown in a shade of gray.
+ * @see FilterPreferenceEntry#hiding
+ */
public boolean hiding;
+
+ /**
+ * Normally, the specified objects are hidden and the rest is shown.
+ * If this option is activated, only the specified objects are shown and the rest is hidden.
+ * @see FilterPreferenceEntry#inverted
+ */
public boolean inverted;
/**
@@ -26,6 +43,10 @@ public class Filter extends SearchSetting {
mode = SearchMode.add;
}
+ /**
+ * Constructs a new {@code Filter} from a preference entry.
+ * @param e preference entry
+ */
public Filter(FilterPreferenceEntry e) {
this();
text = e.text;
@@ -47,17 +68,57 @@ public class Filter extends SearchSetting {
}
public static class FilterPreferenceEntry {
- @pref @writeExplicitly public String version = "1";
+ @writeExplicitly
+ @pref public String version = "1";
+
@pref public String text;
- @pref @writeExplicitly public String mode = "add";
+
+ /**
+ * Mode selector which defines how a filter is combined with the previous one:<ul>
+ * <li>replace: replace selection</li>
+ * <li>add: add to selection</li>
+ * <li>remove: remove from selection</li>
+ * <li>in_selection: find in selection</li>
+ * </ul>
+ * @see SearchMode
+ */
+ @writeExplicitly
+ @pref public String mode = "add";
+
@pref public boolean case_sensitive;
+
@pref public boolean regex_search;
+
@pref public boolean mapCSS_search;
- @pref @writeExplicitly public boolean enable = true;
- @pref @writeExplicitly public boolean hiding;
- @pref @writeExplicitly public boolean inverted;
+
+ /**
+ * Enabled status.
+ * @see Filter#enable
+ */
+ @writeExplicitly
+ @pref public boolean enable = true;
+
+ /**
+ * If this option is activated, the chosen objects are completely hidden.
+ * Otherwise they are disabled and shown in a shade of gray.
+ * @see Filter#hiding
+ */
+ @writeExplicitly
+ @pref public boolean hiding;
+
+ /**
+ * Normally, the specified objects are hidden and the rest is shown.
+ * If this option is activated, only the specified objects are shown and the rest is hidden.
+ * @see Filter#inverted
+ */
+ @writeExplicitly
+ @pref public boolean inverted;
}
+ /**
+ * Returns a new preference entry for this filter.
+ * @return preference entry
+ */
public FilterPreferenceEntry getPreferenceEntry() {
FilterPreferenceEntry e = new FilterPreferenceEntry();
e.version = version;
diff --git a/src/org/openstreetmap/josm/data/osm/Node.java b/src/org/openstreetmap/josm/data/osm/Node.java
index 20e7fa2..46c0377 100644
--- a/src/org/openstreetmap/josm/data/osm/Node.java
+++ b/src/org/openstreetmap/josm/data/osm/Node.java
@@ -318,6 +318,7 @@ public final class Node extends OsmPrimitive implements INode {
@Override
public void updatePosition() {
+ // Do nothing
}
@Override
diff --git a/src/org/openstreetmap/josm/data/osm/NoteData.java b/src/org/openstreetmap/josm/data/osm/NoteData.java
index ab996da..e9c6893 100644
--- a/src/org/openstreetmap/josm/data/osm/NoteData.java
+++ b/src/org/openstreetmap/josm/data/osm/NoteData.java
@@ -45,10 +45,10 @@ public class NoteData {
if (n1.getId() > 0 && n2.getId() < 0) {
return -1;
}
- if (n1.getState() == State.closed && n2.getState() == State.open) {
+ if (n1.getState() == State.CLOSED && n2.getState() == State.OPEN) {
return 1;
}
- if (n1.getState() == State.open && n2.getState() == State.closed) {
+ if (n1.getState() == State.OPEN && n2.getState() == State.CLOSED) {
return -1;
}
return Long.compare(Math.abs(n1.getId()), Math.abs(n2.getId()));
@@ -199,9 +199,9 @@ public class NoteData {
}
Note note = new Note(location);
note.setCreatedAt(new Date());
- note.setState(State.open);
+ note.setState(State.OPEN);
note.setId(newNoteId--);
- NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.opened, true);
+ NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.OPENED, true);
note.addComment(comment);
if (Main.isDebugEnabled()) {
Main.debug("Created note {0} with comment: {1}", note.getId(), text);
@@ -219,13 +219,13 @@ public class NoteData {
if (!noteList.contains(note)) {
throw new IllegalArgumentException("Note to modify must be in layer");
}
- if (note.getState() == State.closed) {
+ if (note.getState() == State.CLOSED) {
throw new IllegalStateException("Cannot add a comment to a closed note");
}
if (Main.isDebugEnabled()) {
Main.debug("Adding comment to note {0}: {1}", note.getId(), text);
}
- NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.commented, true);
+ NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.COMMENTED, true);
note.addComment(comment);
dataUpdated();
}
@@ -239,15 +239,15 @@ public class NoteData {
if (!noteList.contains(note)) {
throw new IllegalArgumentException("Note to close must be in layer");
}
- if (note.getState() != State.open) {
+ if (note.getState() != State.OPEN) {
throw new IllegalStateException("Cannot close a note that isn't open");
}
if (Main.isDebugEnabled()) {
Main.debug("closing note {0} with comment: {1}", note.getId(), text);
}
- NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.closed, true);
+ NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.CLOSED, true);
note.addComment(comment);
- note.setState(State.closed);
+ note.setState(State.CLOSED);
note.setClosedAt(new Date());
dataUpdated();
}
@@ -261,15 +261,15 @@ public class NoteData {
if (!noteList.contains(note)) {
throw new IllegalArgumentException("Note to reopen must be in layer");
}
- if (note.getState() != State.closed) {
+ if (note.getState() != State.CLOSED) {
throw new IllegalStateException("Cannot reopen a note that isn't closed");
}
if (Main.isDebugEnabled()) {
Main.debug("reopening note {0} with comment: {1}", note.getId(), text);
}
- NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.reopened, true);
+ NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.REOPENED, true);
note.addComment(comment);
- note.setState(State.open);
+ note.setState(State.OPEN);
dataUpdated();
}
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index e21aeeb..231f5b3 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
@@ -27,6 +27,7 @@ import org.openstreetmap.josm.data.osm.visitor.Visitor;
import org.openstreetmap.josm.gui.mappaint.StyleCache;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Predicates;
import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
@@ -170,7 +171,8 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
}
/**
- * Some predicates, that describe conditions on primitives.
+ * A predicate that filters primitives that are usable.
+ * @see OsmPrimitive#isUsable()
*/
public static final Predicate<OsmPrimitive> isUsablePredicate = new Predicate<OsmPrimitive>() {
@Override
@@ -179,6 +181,9 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
}
};
+ /**
+ * A predicate filtering primitives that are selectable.
+ */
public static final Predicate<OsmPrimitive> isSelectablePredicate = new Predicate<OsmPrimitive>() {
@Override
public boolean evaluate(OsmPrimitive primitive) {
@@ -186,60 +191,71 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
}
};
+ /**
+ * A predicate filtering primitives that are not deleted.
+ */
public static final Predicate<OsmPrimitive> nonDeletedPredicate = new Predicate<OsmPrimitive>() {
@Override public boolean evaluate(OsmPrimitive primitive) {
return !primitive.isDeleted();
}
};
+ /**
+ * A predicate filtering primitives that are not deleted and not incomplete.
+ */
public static final Predicate<OsmPrimitive> nonDeletedCompletePredicate = new Predicate<OsmPrimitive>() {
@Override public boolean evaluate(OsmPrimitive primitive) {
return !primitive.isDeleted() && !primitive.isIncomplete();
}
};
+ /**
+ * A predicate filtering primitives that are not deleted and not incomplete and that are not a relation.
+ */
public static final Predicate<OsmPrimitive> nonDeletedPhysicalPredicate = new Predicate<OsmPrimitive>() {
@Override public boolean evaluate(OsmPrimitive primitive) {
return !primitive.isDeleted() && !primitive.isIncomplete() && !(primitive instanceof Relation);
}
};
+ /**
+ * A predicate filtering primitives that are modified
+ */
public static final Predicate<OsmPrimitive> modifiedPredicate = new Predicate<OsmPrimitive>() {
@Override public boolean evaluate(OsmPrimitive primitive) {
return primitive.isModified();
}
};
- public static final Predicate<OsmPrimitive> nodePredicate = new Predicate<OsmPrimitive>() {
- @Override public boolean evaluate(OsmPrimitive primitive) {
- return primitive.getClass() == Node.class;
- }
- };
+ /**
+ * A predicate filtering nodes.
+ */
+ public static final Predicate<OsmPrimitive> nodePredicate = Predicates.<OsmPrimitive>isOfClass(Node.class);
- public static final Predicate<OsmPrimitive> wayPredicate = new Predicate<OsmPrimitive>() {
- @Override public boolean evaluate(OsmPrimitive primitive) {
- return primitive.getClass() == Way.class;
- }
- };
+ /**
+ * A predicate filtering ways.
+ */
+ public static final Predicate<OsmPrimitive> wayPredicate = Predicates.<OsmPrimitive>isOfClass(Way.class);
- public static final Predicate<OsmPrimitive> relationPredicate = new Predicate<OsmPrimitive>() {
- @Override public boolean evaluate(OsmPrimitive primitive) {
- return primitive.getClass() == Relation.class;
- }
- };
+ /**
+ * A predicate filtering relations.
+ */
+ public static final Predicate<OsmPrimitive> relationPredicate = Predicates.<OsmPrimitive>isOfClass(Relation.class);
+ /**
+ * A predicate filtering multipolygon relations.
+ */
public static final Predicate<OsmPrimitive> multipolygonPredicate = new Predicate<OsmPrimitive>() {
@Override public boolean evaluate(OsmPrimitive primitive) {
return primitive.getClass() == Relation.class && ((Relation) primitive).isMultipolygon();
}
};
- public static final Predicate<OsmPrimitive> allPredicate = new Predicate<OsmPrimitive>() {
- @Override public boolean evaluate(OsmPrimitive primitive) {
- return true;
- }
- };
-
+ /**
+ * This matches all ways that have a direction
+ *
+ * @see #FLAG_HAS_DIRECTIONS
+ */
public static final Predicate<Tag> directionalKeyPredicate = new Predicate<Tag>() {
@Override
public boolean evaluate(Tag tag) {
@@ -676,6 +692,10 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
return false;
}
+ /**
+ * Updates the highlight flag for this primitive.
+ * @param highlighted The new highlight flag.
+ */
public void setHighlighted(boolean highlighted) {
if (isHighlighted() != highlighted) {
updateFlags(FLAG_HIGHLIGHTED, highlighted);
@@ -685,6 +705,10 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
}
}
+ /**
+ * Checks if the highlight flag for this primitive was set
+ * @return The highlight flag.
+ */
public boolean isHighlighted() {
return (flags & FLAG_HIGHLIGHTED) != 0;
}
@@ -819,14 +843,20 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
return result;
}
+ /**
+ * A tagged way that matches this pattern has a direction.
+ * @see #FLAG_HAS_DIRECTIONS
+ */
private static volatile Match directionKeys;
- private static volatile Match reversedDirectionKeys;
/**
- * Contains a list of direction-dependent keys that make an object
- * direction dependent.
- * Initialized by checkDirectionTagged()
+ * A tagged way that matches this pattern has a direction that is reversed.
+ * <p>
+ * This pattern should be a subset of {@link #directionKeys}
+ * @see #FLAG_DIRECTION_REVERSED
*/
+ private static volatile Match reversedDirectionKeys;
+
static {
String reversedDirectionDefault = "oneway=\"-1\"";
@@ -836,27 +866,21 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
"junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
"(highway=motorway_link & -oneway=no & -oneway=reversible)";
- try {
- reversedDirectionKeys = SearchCompiler.compile(Main.pref.get("tags.reversed_direction", reversedDirectionDefault));
- } catch (ParseError e) {
- Main.error("Unable to compile pattern for tags.reversed_direction, trying default pattern: " + e.getMessage());
+ reversedDirectionKeys = compileDirectionKeys("tags.reversed_direction", reversedDirectionDefault);
+ directionKeys = compileDirectionKeys("tags.direction", directionDefault);
+ }
- try {
- reversedDirectionKeys = SearchCompiler.compile(reversedDirectionDefault);
- } catch (ParseError e2) {
- throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage(), e2);
- }
- }
+ private static Match compileDirectionKeys(String prefName, String defaultValue) throws AssertionError {
try {
- directionKeys = SearchCompiler.compile(Main.pref.get("tags.direction", directionDefault));
+ return SearchCompiler.compile(Main.pref.get(prefName, defaultValue));
} catch (ParseError e) {
- Main.error("Unable to compile pattern for tags.direction, trying default pattern: " + e.getMessage());
+ Main.error("Unable to compile pattern for " + prefName + ", trying default pattern: " + e.getMessage());
+ }
- try {
- directionKeys = SearchCompiler.compile(directionDefault);
- } catch (ParseError e2) {
- throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage(), e2);
- }
+ try {
+ return SearchCompiler.compile(defaultValue);
+ } catch (ParseError e2) {
+ throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage(), e2);
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/PrimitiveData.java b/src/org/openstreetmap/josm/data/osm/PrimitiveData.java
index 2ec2423..5664dd3 100644
--- a/src/org/openstreetmap/josm/data/osm/PrimitiveData.java
+++ b/src/org/openstreetmap/josm/data/osm/PrimitiveData.java
@@ -1,6 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
@@ -70,6 +73,24 @@ public abstract class PrimitiveData extends AbstractPrimitive implements Seriali
protected final void keysChangedImpl(Map<String, String> originalKeys) {
}
- @Override
- public abstract OsmPrimitiveType getType();
+ private void writeObject(ObjectOutputStream oos) throws IOException {
+ // since super class is not Serializable
+ oos.writeLong(id);
+ oos.writeLong(user == null ? -1 : user.getId());
+ oos.writeInt(version);
+ oos.writeInt(changesetId);
+ oos.writeInt(timestamp);
+ oos.defaultWriteObject();
+ }
+
+ private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+ // since super class is not Serializable
+ id = ois.readLong();
+ final long userId = ois.readLong();
+ user = userId == -1 ? null : User.getById(userId);
+ version = ois.readInt();
+ changesetId = ois.readInt();
+ timestamp = ois.readInt();
+ ois.defaultReadObject();
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
index 5223d25..16aecd8 100644
--- a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
+++ b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
@@ -97,10 +97,10 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
this.buckets = buckets;
}
- QBLevel(QBLevel<T> parent, int parent_index, final QuadBuckets<T> buckets) {
+ QBLevel(QBLevel<T> parent, int parentIndex, final QuadBuckets<T> buckets) {
this.parent = parent;
this.level = parent.level + 1;
- this.index = parent_index;
+ this.index = parentIndex;
this.buckets = buckets;
int shift = (QuadTiling.NR_LEVELS - level) * 2;
@@ -110,16 +110,16 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
shift -= 30;
mult = 1 << 30;
}
- long this_quadpart = mult * (parent_index << shift);
- this.quad = parent.quad | this_quadpart;
+ long quadpart = mult * (parentIndex << shift);
+ this.quad = parent.quad | quadpart;
this.bbox = calculateBBox(); // calculateBBox reference quad
}
private BBox calculateBBox() {
- LatLon bottom_left = this.coor();
- double lat = bottom_left.lat() + parent.height() / 2;
- double lon = bottom_left.lon() + parent.width() / 2;
- return new BBox(bottom_left.lon(), bottom_left.lat(), lon, lat);
+ LatLon bottomLeft = this.coor();
+ double lat = bottomLeft.lat() + parent.height() / 2;
+ double lon = bottomLeft.lon() + parent.width() / 2;
+ return new BBox(bottomLeft.lon(), bottomLeft.lat(), lon, lat);
}
QBLevel<T> findBucket(BBox bbox) {
@@ -180,16 +180,16 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
return content.add(o);
}
- boolean matches(final T o, final BBox search_bbox) {
+ boolean matches(final T o, final BBox searchBbox) {
if (o instanceof Node) {
final LatLon latLon = ((Node) o).getCoor();
// node without coords -> bbox[0,0,0,0]
- return search_bbox.bounds(latLon != null ? latLon : LatLon.ZERO);
+ return searchBbox.bounds(latLon != null ? latLon : LatLon.ZERO);
}
- return o.getBBox().intersects(search_bbox);
+ return o.getBBox().intersects(searchBbox);
}
- private void search_contents(BBox search_bbox, List<T> result) {
+ private void search_contents(BBox searchBbox, List<T> result) {
/*
* It is possible that this was created in a split
* but never got any content populated.
@@ -198,7 +198,7 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
return;
for (T o : content) {
- if (matches(o, search_bbox)) {
+ if (matches(o, searchBbox)) {
result.add(o);
}
}
@@ -298,30 +298,30 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
findBucket(o.getBBox()).doAdd(o);
}
- private void search(BBox search_bbox, List<T> result) {
- if (!this.bbox().intersects(search_bbox))
+ private void search(BBox searchBbox, List<T> result) {
+ if (!this.bbox().intersects(searchBbox))
return;
- else if (bbox().bounds(search_bbox)) {
+ else if (bbox().bounds(searchBbox)) {
buckets.searchCache = this;
}
if (this.hasContent()) {
- search_contents(search_bbox, result);
+ search_contents(searchBbox, result);
}
//TODO Coincidence vector should be calculated here and only buckets that match search_bbox should be checked
if (nw != null) {
- nw.search(search_bbox, result);
+ nw.search(searchBbox, result);
}
if (ne != null) {
- ne.search(search_bbox, result);
+ ne.search(searchBbox, result);
}
if (se != null) {
- se.search(search_bbox, result);
+ se.search(searchBbox, result);
}
if (sw != null) {
- sw.search(search_bbox, result);
+ sw.search(searchBbox, result);
}
}
@@ -329,10 +329,10 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
return Long.toHexString(quad);
}
- int index_of(QBLevel<T> find_this) {
+ int index_of(QBLevel<T> findThis) {
QBLevel<T>[] children = getChildren();
for (int i = 0; i < QuadTiling.TILES_PER_LEVEL; i++) {
- if (children[i] == find_this)
+ if (children[i] == findThis)
return i;
}
return -1;
diff --git a/src/org/openstreetmap/josm/data/osm/Storage.java b/src/org/openstreetmap/josm/data/osm/Storage.java
index f6bfe09..c677200 100644
--- a/src/org/openstreetmap/josm/data/osm/Storage.java
+++ b/src/org/openstreetmap/josm/data/osm/Storage.java
@@ -143,7 +143,8 @@ public class Storage<T> extends AbstractSet<T> {
public Storage(Hash<? super T, ? super T> ha, int capacity, boolean safeIterator) {
this.hash = ha;
int cap = 1 << (int) (Math.ceil(Math.log(capacity/LOAD_FACTOR) / Math.log(2)));
- @SuppressWarnings("unchecked") T[] newData = (T[]) new Object[cap];
+ @SuppressWarnings("unchecked")
+ T[] newData = (T[]) new Object[cap];
data = newData;
mask = data.length - 1;
this.safeIterator = safeIterator;
@@ -174,7 +175,8 @@ public class Storage<T> extends AbstractSet<T> {
@Override
public synchronized boolean contains(Object o) {
- @SuppressWarnings("unchecked") T t = (T) o;
+ @SuppressWarnings("unchecked")
+ T t = (T) o;
int bucket = getBucket(hash, t);
return bucket >= 0;
}
@@ -187,7 +189,8 @@ public class Storage<T> extends AbstractSet<T> {
@Override
public synchronized boolean remove(Object o) {
- @SuppressWarnings("unchecked") T t = (T) o;
+ @SuppressWarnings("unchecked")
+ T t = (T) o;
T tOrig = removeElem(t);
return tOrig != null;
}
@@ -328,7 +331,8 @@ public class Storage<T> extends AbstractSet<T> {
private void ensureSpace() {
if (size > data.length*LOAD_FACTOR) { // rehash
- @SuppressWarnings("unchecked") T[] big = (T[]) new Object[data.length * 2];
+ @SuppressWarnings("unchecked")
+ T[] big = (T[]) new Object[data.length * 2];
int nMask = big.length - 1;
for (T o : data) {
@@ -386,7 +390,8 @@ public class Storage<T> extends AbstractSet<T> {
@Override
public boolean containsKey(Object o) {
- @SuppressWarnings("unchecked") K key = (K) o;
+ @SuppressWarnings("unchecked")
+ K key = (K) o;
int bucket = getBucket(fHash, key);
return bucket >= 0;
}
@@ -398,7 +403,8 @@ public class Storage<T> extends AbstractSet<T> {
@Override
public T get(Object o) {
- @SuppressWarnings("unchecked") K key = (K) o;
+ @SuppressWarnings("unchecked")
+ K key = (K) o;
int bucket = getBucket(fHash, key);
return bucket < 0 ? null : data[bucket];
}
@@ -413,7 +419,8 @@ public class Storage<T> extends AbstractSet<T> {
public T remove(Object o) {
synchronized (Storage.this) {
modCount++;
- @SuppressWarnings("unchecked") K key = (K) o;
+ @SuppressWarnings("unchecked")
+ K key = (K) o;
int bucket = getBucket(fHash, key);
return bucket < 0 ? null : doRemove(bucket);
diff --git a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
index 9b5d9f5..d291f07 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
@@ -183,7 +183,7 @@ public class DatasetEventManager implements MapView.EditLayerChangeListener, Lis
}
}
- private void fireEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
+ private static void fireEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
for (ListenerInfo listener: listeners) {
if (!listener.consolidate) {
event.fire(listener.listener);
@@ -191,7 +191,7 @@ public class DatasetEventManager implements MapView.EditLayerChangeListener, Lis
}
}
- private void fireConsolidatedEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
+ private static void fireConsolidatedEvents(List<ListenerInfo> listeners, AbstractDatasetChangedEvent event) {
for (ListenerInfo listener: listeners) {
if (listener.consolidate) {
event.fire(listener.listener);
diff --git a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
index 99b6c06..8e238c5 100644
--- a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
@@ -81,7 +81,7 @@ public class SelectionEventManager implements SelectionChangedListener {
SwingUtilities.invokeLater(edtRunnable);
}
- private void fireEvents(List<ListenerInfo> listeners, Collection<? extends OsmPrimitive> newSelection) {
+ private static void fireEvents(List<ListenerInfo> listeners, Collection<? extends OsmPrimitive> newSelection) {
for (ListenerInfo listener: listeners) {
listener.listener.selectionChanged(newSelection);
}
@@ -95,5 +95,4 @@ public class SelectionEventManager implements SelectionChangedListener {
}
}
};
-
}
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
index 258981a..c53ebea 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
@@ -179,10 +179,18 @@ public abstract class HistoryOsmPrimitive implements Comparable<HistoryOsmPrimit
return Collections.unmodifiableMap(tags);
}
+ /**
+ * Returns the changeset for this history primitive.
+ * @return the changeset for this history primitive
+ */
public Changeset getChangeset() {
return changeset;
}
+ /**
+ * Sets the changeset for this history primitive.
+ * @param changeset the changeset for this history primitive
+ */
public void setChangeset(Changeset changeset) {
this.changeset = changeset;
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
index a238255..65943dd 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
@@ -26,9 +26,8 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
* these nodes might not be present explicitly in the original collection. The "hull" also includes
* incomplete {@link OsmPrimitive}s which are referred to by relations in the original collection. And
* it turns {@link OsmPrimitive} referred to by {@link Relation}s in the original collection into
- * incomplete {@link OsmPrimitive}s in the "hull", if they are not themselves present in the
- * original collection.
- *
+ * incomplete {@link OsmPrimitive}s in the "hull", if they are not themselves present in the original collection.
+ * @since 1891
*/
public class MergeSourceBuildingVisitor extends AbstractVisitor {
private final DataSet selectionBase;
@@ -102,8 +101,7 @@ public class MergeSourceBuildingVisitor extends AbstractVisitor {
List<RelationMemberData> newMembers = new ArrayList<>();
for (RelationMember member: r.getMembers()) {
- newMembers.add(
- new RelationMemberData(member.getRole(), mappedPrimitives.get(member.getMember())));
+ newMembers.add(new RelationMemberData(member.getRole(), mappedPrimitives.get(member.getMember())));
}
clone.setMembers(newMembers);
@@ -133,7 +131,6 @@ public class MergeSourceBuildingVisitor extends AbstractVisitor {
@Override
public void visit(Way w) {
// remember all nodes this way refers to ...
- //
for (Node n: w.getNodes()) {
n.accept(this);
}
@@ -143,14 +140,11 @@ public class MergeSourceBuildingVisitor extends AbstractVisitor {
@Override
public void visit(Relation r) {
- // first, remember all primitives members refer to (only if necessary, see
- // below)
- //
+ // first, remember all primitives members refer to (only if necessary, see below)
rememberRelationPartial(r);
for (RelationMember member: r.getMembers()) {
if (isAlreadyRemembered(member.getMember())) {
// referred primitive already remembered
- //
continue;
}
if (isInSelectionBase(member.getMember()) || member.getMember().isNew()) {
@@ -185,6 +179,10 @@ public class MergeSourceBuildingVisitor extends AbstractVisitor {
}
}
+ /**
+ * Builds and returns the "hull".
+ * @return the "hull" data set
+ */
public DataSet build() {
for (OsmPrimitive primitive: selectionBase.getAllSelected()) {
primitive.accept(this);
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 e10f693..579f8e3 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -390,7 +390,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
- private Polygon buildPolygon(Point center, int radius, int sides) {
+ private static Polygon buildPolygon(Point center, int radius, int sides) {
return buildPolygon(center, radius, sides, 0.0);
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
index 9ef1016..5a43d55 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
@@ -188,7 +188,7 @@ public final class MultipolygonCache implements DataSetListener, LayerChangeList
return maps;
}
- private void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+ private static void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
if (event instanceof NodeMovedEvent || event instanceof WayNodesChangedEvent) {
dispatchEvent(event, r, maps);
} else if (event instanceof PrimitivesRemovedEvent) {
diff --git a/src/org/openstreetmap/josm/data/package-info.java b/src/org/openstreetmap/josm/data/package-info.java
new file mode 100644
index 0000000..d1600c0
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM managed data.
+ */
+package org.openstreetmap.josm.data;
diff --git a/src/org/openstreetmap/josm/data/preferences/LongProperty.java b/src/org/openstreetmap/josm/data/preferences/LongProperty.java
new file mode 100644
index 0000000..d480e9e
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/preferences/LongProperty.java
@@ -0,0 +1,35 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.preferences;
+
+import org.openstreetmap.josm.Main;
+
+/**
+ * A property containing an {@code Long} value.
+ * @since 10087
+ *
+ */
+public class LongProperty extends AbstractProperty<Long> {
+
+ /**
+ * Constructs a new {@code LongProperty}
+ * @param key property key
+ * @param defaultValue default value
+ */
+ public LongProperty(String key, long defaultValue) {
+ super(key, defaultValue);
+ if (Main.pref != null) {
+ get();
+ }
+ }
+
+ @Override
+ public Long get() {
+ return Main.pref.getLong(getKey(), getDefaultValue());
+ }
+
+ @Override
+ public boolean put(Long value) {
+ return Main.pref.putLong(getKey(), value);
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/data/projection/AbstractProjection.java b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
index 538fa08..91f17c9 100644
--- a/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
@@ -95,8 +95,8 @@ public abstract class AbstractProjection implements Projection {
@Override
public LatLon eastNorth2latlon(EastNorth en) {
- double[] latlon_rad = proj.invproject((en.east() * toMeter - x0) / ellps.a / k0, (en.north() * toMeter - y0) / ellps.a / k0);
- LatLon ll = new LatLon(Math.toDegrees(latlon_rad[0]), LatLon.normalizeLon(Math.toDegrees(latlon_rad[1]) + lon0 + pm));
+ double[] latlonRad = proj.invproject((en.east() * toMeter - x0) / ellps.a / k0, (en.north() * toMeter - y0) / ellps.a / k0);
+ LatLon ll = new LatLon(Math.toDegrees(latlonRad[0]), LatLon.normalizeLon(Math.toDegrees(latlonRad[1]) + lon0 + pm));
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 8c7ce69..671fb02 100644
--- a/src/org/openstreetmap/josm/data/projection/CustomProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
@@ -570,7 +570,7 @@ public class CustomProjection extends AbstractProjection {
projParams.lon2 = parseAngle(s, Param.lon_2.key);
}
if (parameters.containsKey(Param.no_off.key) || parameters.containsKey(Param.no_uoff.key)) {
- projParams.no_off = true;
+ projParams.no_off = Boolean.TRUE;
}
proj.initialize(projParams);
return proj;
@@ -614,25 +614,25 @@ public class CustomProjection extends AbstractProjection {
neg = true;
s = s.substring(m.end());
}
- final String FLOAT = "(\\d+(\\.\\d*)?)";
+ final String floatPattern = "(\\d+(\\.\\d*)?)";
boolean dms = false;
double deg = 0.0, min = 0.0, sec = 0.0;
// degrees
- m = Pattern.compile("^"+FLOAT+"d").matcher(s);
+ m = Pattern.compile("^"+floatPattern+"d").matcher(s);
if (m.find()) {
s = s.substring(m.end());
deg = Double.parseDouble(m.group(1));
dms = true;
}
// minutes
- m = Pattern.compile("^"+FLOAT+"'").matcher(s);
+ m = Pattern.compile("^"+floatPattern+"'").matcher(s);
if (m.find()) {
s = s.substring(m.end());
min = Double.parseDouble(m.group(1));
dms = true;
}
// seconds
- m = Pattern.compile("^"+FLOAT+"\"").matcher(s);
+ m = Pattern.compile("^"+floatPattern+"\"").matcher(s);
if (m.find()) {
s = s.substring(m.end());
sec = Double.parseDouble(m.group(1));
@@ -642,7 +642,7 @@ public class CustomProjection extends AbstractProjection {
if (dms) {
value = deg + (min/60.0) + (sec/3600.0);
} else {
- m = Pattern.compile("^"+FLOAT).matcher(s);
+ m = Pattern.compile("^"+floatPattern).matcher(s);
if (m.find()) {
s = s.substring(m.end());
value += Double.parseDouble(m.group(1));
@@ -712,11 +712,11 @@ public class CustomProjection extends AbstractProjection {
/**
* Factor to convert units of east/north coordinates to meters.
- *
+ *
* When east/north coordinates are in degrees (geographic CRS), the scale
* at the equator is taken, i.e. 360 degrees corresponds to the length of
* the equator in meters.
- *
+ *
* @return factor to convert units to meter
*/
@Override
@@ -779,19 +779,19 @@ public class CustomProjection extends AbstractProjection {
return ret;
}
- private EastNorth getPointAlong(int i, int N, ProjectionBounds r) {
- double dEast = (r.maxEast - r.minEast) / N;
- double dNorth = (r.maxNorth - r.minNorth) / N;
- if (i < N) {
+ private static EastNorth getPointAlong(int i, int n, ProjectionBounds r) {
+ double dEast = (r.maxEast - r.minEast) / n;
+ double dNorth = (r.maxNorth - r.minNorth) / n;
+ if (i < n) {
return new EastNorth(r.minEast + i * dEast, r.minNorth);
- } else if (i < 2*N) {
- i -= N;
+ } else if (i < 2*n) {
+ i -= n;
return new EastNorth(r.maxEast, r.minNorth + i * dNorth);
- } else if (i < 3*N) {
- i -= 2*N;
+ } else if (i < 3*n) {
+ i -= 2*n;
return new EastNorth(r.maxEast - i * dEast, r.maxNorth);
- } else if (i < 4*N) {
- i -= 3*N;
+ } else if (i < 4*n) {
+ i -= 3*n;
return new EastNorth(r.minEast, r.maxNorth - i * dNorth);
} else {
throw new AssertionError();
@@ -823,12 +823,12 @@ public class CustomProjection extends AbstractProjection {
@Override
public Bounds getLatLonBoundsBox(ProjectionBounds r) {
- final int N = 10;
+ final int n = 10;
Bounds result = new Bounds(eastNorth2latlon(r.getMin()));
result.extend(eastNorth2latlon(r.getMax()));
LatLon llPrev = null;
- for (int i = 0; i < 4*N; i++) {
- LatLon llNow = eastNorth2latlon(getPointAlong(i, N, r));
+ for (int i = 0; i < 4*n; i++) {
+ LatLon llNow = eastNorth2latlon(getPointAlong(i, n, r));
result.extend(llNow);
// check if segment crosses 180th meridian and if so, make sure
// to extend bounds to +/-180 degrees longitude
diff --git a/src/org/openstreetmap/josm/data/projection/Ellipsoid.java b/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
index 4bdd35c..57035cb 100644
--- a/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
+++ b/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
@@ -101,7 +101,6 @@ public final class Ellipsoid {
*/
public static final Ellipsoid WGS84 = Ellipsoid.create_a_rf(6378137.0, 298.257223563);
-
/**
* half long axis
*/
@@ -352,11 +351,11 @@ public final class Ellipsoid {
double phi = Math.toRadians(coord.lat());
double lambda = Math.toRadians(coord.lon());
- double Rn = a / Math.sqrt(1 - e2 * Math.pow(Math.sin(phi), 2));
+ double rn = a / Math.sqrt(1 - e2 * Math.pow(Math.sin(phi), 2));
double[] xyz = new double[3];
- xyz[0] = Rn * Math.cos(phi) * Math.cos(lambda);
- xyz[1] = Rn * Math.cos(phi) * Math.sin(lambda);
- xyz[2] = Rn * (1 - e2) * Math.sin(phi);
+ xyz[0] = rn * Math.cos(phi) * Math.cos(lambda);
+ xyz[1] = rn * Math.cos(phi) * Math.sin(lambda);
+ xyz[2] = rn * (1 - e2) * Math.sin(phi);
return xyz;
}
diff --git a/src/org/openstreetmap/josm/data/projection/ProjectionConfigurationException.java b/src/org/openstreetmap/josm/data/projection/ProjectionConfigurationException.java
index 008a83c..54ffc14 100644
--- a/src/org/openstreetmap/josm/data/projection/ProjectionConfigurationException.java
+++ b/src/org/openstreetmap/josm/data/projection/ProjectionConfigurationException.java
@@ -5,13 +5,6 @@ public class ProjectionConfigurationException extends Exception {
/**
* Constructs a new {@code ProjectionConfigurationException}.
- */
- public ProjectionConfigurationException() {
- super();
- }
-
- /**
- * Constructs a new {@code ProjectionConfigurationException}.
* @param message the detail message (which is saved for later retrieval
* by the {@link #getMessage()} method).
* @param cause the cause (which is saved for later retrieval by the
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
index 3df6f5d..f38e97d 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
@@ -334,21 +334,4 @@ public class NTV2GridShift implements Serializable {
public void setSubGridName(String string) {
subGridName = string;
}
-
- /**
- * Make this object a copy of the supplied GridShift
- * @param gs grid to copy data from
- */
- public void copy(NTV2GridShift gs) {
- this.lon = gs.lon;
- this.lat = gs.lat;
- this.lonShift = gs.lonShift;
- this.latShift = gs.latShift;
- this.lonAccuracy = gs.lonAccuracy;
- this.latAccuracy = gs.latAccuracy;
- this.latAccuracyAvailable = gs.latAccuracyAvailable;
- this.lonAccuracyAvailable = gs.lonAccuracyAvailable;
- this.subGridName = gs.subGridName;
- }
-
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
index ada4fa9..13e0bfd 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
@@ -60,7 +60,7 @@ import org.openstreetmap.josm.Main;
* arrangement) or in decimal Degrees using Positive East Longitude.
*
* @author Peter Yuill
- * Modifified for JOSM :
+ * Modified for JOSM :
* - removed the RandomAccessFile mode (Pieren)
*/
public class NTV2GridShiftFile implements Serializable {
@@ -268,14 +268,6 @@ public class NTV2GridShiftFile implements Serializable {
return sub;
}
- public boolean isLoaded() {
- return topLevelSubGrid != null;
- }
-
- public void unload() {
- topLevelSubGrid = null;
- }
-
@Override
public String toString() {
StringBuilder buff = new StringBuilder("Headers : ");
@@ -303,19 +295,6 @@ public class NTV2GridShiftFile implements Serializable {
return buff.toString();
}
- /**
- * Get a copy of the SubGrid tree for this file.
- *
- * @return a deep clone of the current SubGrid tree
- */
- public NTV2SubGrid[] getSubGridTree() {
- NTV2SubGrid[] clone = new NTV2SubGrid[topLevelSubGrid.length];
- for (int i = 0; i < topLevelSubGrid.length; i++) {
- clone[i] = (NTV2SubGrid) topLevelSubGrid[i].clone();
- }
- return clone;
- }
-
public String getFromEllipsoid() {
return fromEllipsoid;
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
index faa7239..c6233c4 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
@@ -35,8 +35,9 @@ import org.openstreetmap.josm.tools.Utils;
* - removed the RandomAccessFile mode (Pieren)
* - read grid file by single bytes. Workaround for a bug in some VM not supporting
* file reading by group of 4 bytes from a jar file.
+ * - removed the Cloneable interface
*/
-public class NTV2SubGrid implements Cloneable, Serializable {
+public class NTV2SubGrid implements Serializable {
private static final long serialVersionUID = 1L;
@@ -275,10 +276,6 @@ public class NTV2SubGrid implements Cloneable, Serializable {
return (subGrid == null) ? 0 : subGrid.length;
}
- public NTV2SubGrid getSubGrid(int index) {
- return (subGrid == null) ? null : subGrid[index];
- }
-
/**
* Set an array of Sub Grids of this sub grid
* @param subGrid subgrids
@@ -323,27 +320,6 @@ public class NTV2SubGrid implements Cloneable, Serializable {
}
/**
- * Make a deep clone of this Sub Grid
- */
- @Override
- public Object clone() {
- NTV2SubGrid clone = null;
- try {
- clone = (NTV2SubGrid) super.clone();
- // Do a deep clone of the sub grids
- if (subGrid != null) {
- clone.subGrid = new NTV2SubGrid[subGrid.length];
- for (int i = 0; i < subGrid.length; i++) {
- clone.subGrid[i] = (NTV2SubGrid) subGrid[i].clone();
- }
- }
- } catch (CloneNotSupportedException cnse) {
- Main.warn(cnse);
- }
- return clone;
- }
-
- /**
* Get maximum latitude value
* @return maximum latitude
*/
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
index b7a6c0f..5921f55 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
@@ -19,8 +19,6 @@
*/
package org.openstreetmap.josm.data.projection.datum;
-import org.openstreetmap.josm.Main;
-
/**
* A set of static utility methods for reading the NTv2 file format
*
@@ -103,19 +101,4 @@ public final class NTV2Util {
(j & 0x00000000FFFFFFFFL);
return Double.longBitsToDouble(l);
}
-
- /**
- * Does the current VM support the New IO api
- * @return true or false
- */
- public static boolean isNioAvailable() {
- boolean nioAvailable = false;
- try {
- Class.forName("java.nio.channels.FileChannel");
- nioAvailable = true;
- } catch (NoClassDefFoundError | ClassNotFoundException cnfe) {
- Main.info(cnfe.getMessage());
- }
- return nioAvailable;
- }
}
diff --git a/src/org/openstreetmap/josm/data/projection/package-info.java b/src/org/openstreetmap/josm/data/projection/package-info.java
new file mode 100644
index 0000000..6c97469
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/projection/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM map projection.
+ */
+package org.openstreetmap.josm.data.projection;
diff --git a/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java b/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
index 36044d4..dc00caf 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
@@ -38,18 +38,18 @@ public abstract class AbstractProj implements Proj {
* Constants used to calculate {@link #en0}, {@link #en1},
* {@link #en2}, {@link #en3}, {@link #en4}.
*/
- private static final double C00 = 1.0,
- C02 = 0.25,
- C04 = 0.046875,
- C06 = 0.01953125,
- C08 = 0.01068115234375,
- C22 = 0.75,
- C44 = 0.46875,
- C46 = 0.01302083333333333333,
- C48 = 0.00712076822916666666,
- C66 = 0.36458333333333333333,
- C68 = 0.00569661458333333333,
- C88 = 0.3076171875;
+ private static final double C00 = 1.0;
+ private static final double C02 = 0.25;
+ private static final double C04 = 0.046875;
+ private static final double C06 = 0.01953125;
+ private static final double C08 = 0.01068115234375;
+ private static final double C22 = 0.75;
+ private static final double C44 = 0.46875;
+ private static final double C46 = 0.01302083333333333333;
+ private static final double C48 = 0.00712076822916666666;
+ private static final double C66 = 0.36458333333333333333;
+ private static final double C68 = 0.00569661458333333333;
+ private static final double C88 = 0.3076171875;
/**
* Constant needed for the <code>mlfn</code> method.
diff --git a/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java b/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java
index 347708b..05fc359 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java
@@ -70,16 +70,6 @@ public class AlbersEqualArea extends AbstractProj {
*/
private double ec;
- /**
- * Standards parallel 1 in radians.
- */
- private double phi1;
-
- /**
- * Standards parallel 2 in radians.
- */
- private double phi2;
-
@Override
public String getName() {
return tr("Albers Equal Area");
@@ -99,8 +89,9 @@ public class AlbersEqualArea extends AbstractProj {
throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "lat_1"));
double lat0 = Math.toRadians(params.lat0);
- phi1 = Math.toRadians(params.lat1);
- phi2 = params.lat2 == null ? phi1 : Math.toRadians(params.lat2);
+ // Standards parallels in radians.
+ double phi1 = Math.toRadians(params.lat1);
+ double phi2 = params.lat2 == null ? phi1 : Math.toRadians(params.lat2);
// Compute Constants
if (Math.abs(phi1 + phi2) < EPSILON) {
@@ -175,7 +166,7 @@ public class AlbersEqualArea extends AbstractProj {
* @return the latitude
*/
public double phi1(final double qs) {
- final double tone_es = 1 - e2;
+ final double toneEs = 1 - e2;
double phi = Math.asin(0.5 * qs);
if (e < EPSILON) {
return phi;
@@ -186,7 +177,7 @@ public class AlbersEqualArea extends AbstractProj {
final double con = e * sinpi;
final double com = 1.0 - con*con;
final double dphi = 0.5 * com*com / cospi *
- (qs/tone_es - sinpi / com + 0.5/e * Math.log((1. - con) / (1. + con)));
+ (qs/toneEs - sinpi / com + 0.5/e * Math.log((1. - con) / (1. + con)));
phi += dphi;
if (Math.abs(dphi) <= ITERATION_TOLERANCE) {
return phi;
@@ -202,10 +193,10 @@ public class AlbersEqualArea extends AbstractProj {
* @return q from Snyder equation (3-12)
*/
private double qsfn(final double sinphi) {
- final double one_es = 1 - e2;
+ final double oneEs = 1 - e2;
if (e >= EPSILON) {
final double con = e * sinphi;
- return one_es * (sinphi / (1. - con*con) -
+ return oneEs * (sinphi / (1. - con*con) -
(0.5/e) * Math.log((1.-con) / (1.+con)));
} else {
return sinphi + sinphi;
diff --git a/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java b/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java
index e629d3d..d1d7d77 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java
@@ -57,14 +57,14 @@ public class DoubleStereographic extends AbstractProj {
initialize(params.lat0);
}
- private void initialize(double lat_0) {
- double phi0 = toRadians(lat_0);
+ private void initialize(double lat0) {
+ double phi0 = 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));
- double S1 = (1 + sin(phi0)) / (1 - sin(phi0));
- double S2 = (1 - e * sin(phi0)) / (1 + e * sin(phi0));
- double w1 = pow(S1 * pow(S2, e), n);
+ double s1 = (1 + sin(phi0)) / (1 - sin(phi0));
+ double s2 = (1 - e * sin(phi0)) / (1 + e * sin(phi0));
+ double w1 = pow(s1 * pow(s2, e), n);
double sinchi00 = (w1 - 1) / (w1 + 1);
c = (n + sin(phi0)) * (1 - sinchi00) / ((n - sin(phi0)) * (1 + sinchi00));
double w2 = c * w1;
@@ -73,14 +73,14 @@ public class DoubleStereographic extends AbstractProj {
@Override
public double[] project(double phi, double lambda) {
- double Lambda = n * lambda;
- double Sa = (1 + sin(phi)) / (1 - sin(phi));
- double Sb = (1 - e * sin(phi)) / (1 + e * sin(phi));
- double w = c * pow(Sa * pow(Sb, e), n);
+ double nLambda = n * lambda;
+ double sa = (1 + sin(phi)) / (1 - sin(phi));
+ double sb = (1 - e * sin(phi)) / (1 + e * sin(phi));
+ double w = c * pow(sa * pow(sb, e), n);
double chi = asin((w - 1) / (w + 1));
- double B = 1 + sin(chi) * sin(chi0) + cos(chi) * cos(chi0) * cos(Lambda);
- double x = 2 * r * cos(chi) * sin(Lambda) / B;
- double y = 2 * r * (sin(chi) * cos(chi0) - cos(chi) * sin(chi0) * cos(Lambda)) / B;
+ double b = 1 + sin(chi) * sin(chi0) + cos(chi) * cos(chi0) * cos(nLambda);
+ double x = 2 * r * cos(chi) * sin(nLambda) / b;
+ double y = 2 * r * (sin(chi) * cos(chi0) - cos(chi) * sin(chi0) * cos(nLambda)) / b;
return new double[] {x, y};
}
@@ -92,8 +92,7 @@ public class DoubleStereographic extends AbstractProj {
double i = atan(x/(h + y));
double j = atan(x/(g - y)) - i;
double chi = chi0 + 2 * atan((y - x * tan(j/2)) / (2 * r));
- double Lambda = j + 2*i;
- double lambda = Lambda / n;
+ double lambda = (j + 2*i) / n;
double psi = 0.5 * log((1 + sin(chi)) / (c*(1 - sin(chi)))) / n;
double phiprev = -1000;
int iteration = 0;
diff --git a/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java b/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java
index 577f090..a519525 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java
@@ -53,7 +53,7 @@ public class LambertAzimuthalEqualArea extends AbstractProj {
private Mode mode;
/** Constant parameters. */
- private double sinb1, cosb1, xmf, ymf, mmf, qp, dd, rq;
+ private double sinb1, cosb1, xmf, ymf, qp, dd, rq;
/** Coefficients for authalic latitude. */
private double aPA0, aPA1, aPA2;
@@ -101,7 +101,6 @@ public class LambertAzimuthalEqualArea extends AbstractProj {
final double sinphi;
qp = qsfn(1);
rq = Math.sqrt(0.5 * qp);
- mmf = 0.5 / (1 - e2);
sinphi = Math.sin(latitudeOfOrigin);
sinb1 = qsfn(sinphi) / qp;
cosb1 = Math.sqrt(1.0 - sinb1 * sinb1);
diff --git a/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java b/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
index c9057f2..5bb34c4 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
@@ -90,19 +90,19 @@ public class LambertConformalConic extends AbstractProj {
/**
* Initialize for LCC with 2 standard parallels.
*
- * @param lat_0 latitude of false origin (in degrees)
- * @param lat_1 latitude of first standard parallel (in degrees)
- * @param lat_2 latitude of second standard parallel (in degrees)
+ * @param lat0 latitude of false origin (in degrees)
+ * @param lat1 latitude of first standard parallel (in degrees)
+ * @param lat2 latitude of second standard parallel (in degrees)
*/
- private void initialize2SP(double lat_0, double lat_1, double lat_2) {
- this.params = new Parameters2SP(lat_0, lat_1, lat_2);
+ private void initialize2SP(double lat0, double lat1, double lat2) {
+ this.params = new Parameters2SP(lat0, lat1, lat2);
- final double m1 = m(toRadians(lat_1));
- final double m2 = m(toRadians(lat_2));
+ final double m1 = m(toRadians(lat1));
+ final double m2 = m(toRadians(lat2));
- final double t1 = t(toRadians(lat_1));
- final double t2 = t(toRadians(lat_2));
- final double tf = t(toRadians(lat_0));
+ final double t1 = t(toRadians(lat1));
+ final double t2 = t(toRadians(lat2));
+ final double tf = t(toRadians(lat0));
n = (log(m1) - log(m2)) / (log(t1) - log(t2));
f = m1 / (n * pow(t1, n));
@@ -112,37 +112,37 @@ public class LambertConformalConic extends AbstractProj {
/**
* Initialize for LCC with 1 standard parallel.
*
- * @param lat_0 latitude of natural origin (in degrees)
+ * @param lat0 latitude of natural origin (in degrees)
*/
- private void initialize1SP(double lat_0) {
- this.params = new Parameters1SP(lat_0);
- final double lat_0_rad = toRadians(lat_0);
+ private void initialize1SP(double lat0) {
+ this.params = new Parameters1SP(lat0);
+ final double lat0rad = toRadians(lat0);
- final double m0 = m(lat_0_rad);
- final double t0 = t(lat_0_rad);
+ final double m0 = m(lat0rad);
+ final double t0 = t(lat0rad);
- n = sin(lat_0_rad);
+ n = sin(lat0rad);
f = m0 / (n * pow(t0, n));
r0 = f * pow(t0, n);
}
/**
* auxiliary function t
- * @param lat_rad latitude in radians
+ * @param latRad latitude in radians
* @return result
*/
- protected double t(double lat_rad) {
- return tan(PI/4 - lat_rad / 2.0)
- / pow((1.0 - e * sin(lat_rad)) / (1.0 + e * sin(lat_rad)), e/2);
+ protected double t(double latRad) {
+ return tan(PI/4 - latRad / 2.0)
+ / pow((1.0 - e * sin(latRad)) / (1.0 + e * sin(latRad)), e/2);
}
/**
* auxiliary function m
- * @param lat_rad latitude in radians
+ * @param latRad latitude in radians
* @return result
*/
- protected double m(double lat_rad) {
- return cos(lat_rad) / (sqrt(1 - e * e * pow(sin(lat_rad), 2)));
+ protected double m(double latRad) {
+ return cos(latRad) / (sqrt(1 - e * e * pow(sin(latRad), 2)));
}
@Override
diff --git a/src/org/openstreetmap/josm/data/projection/proj/LonLat.java b/src/org/openstreetmap/josm/data/projection/proj/LonLat.java
index b3a8b19..a4e5cb2 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/LonLat.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/LonLat.java
@@ -29,8 +29,8 @@ public class LonLat implements Proj {
}
@Override
- public double[] project(double lat_rad, double lon_rad) {
- return new double[] {Math.toDegrees(lon_rad) / a, Math.toDegrees(lat_rad) / a};
+ public double[] project(double latRad, double lonRad) {
+ return new double[] {Math.toDegrees(lonRad) / a, Math.toDegrees(latRad) / a};
}
@Override
diff --git a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
index 263863c..27dc117 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
@@ -161,10 +161,19 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
private double b, a, e;
/**
- * Convenience values equal to {@link #a} / {@link #b},
- * {@link #a}×{@link #b}, and {@link #b} / {@link #a}.
+ * Convenience value equal to {@link #a} / {@link #b}.
*/
- private double arb, ab, bra;
+ private double arb;
+
+ /**
+ * Convenience value equal to {@link #a}×{@link #b}.
+ */
+ private double ab;
+
+ /**
+ * Convenience value equal to {@link #b} / {@link #a}.
+ */
+ private double bra;
/**
* <var>v</var> values when the input latitude is a pole.
@@ -358,7 +367,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
}
}
- private double normalizeLonRad(double a) {
+ private static double normalizeLonRad(double a) {
return Math.toRadians(LatLon.normalizeLon(Math.toDegrees(a)));
}
@@ -369,18 +378,18 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
double q = e / Math.pow(tsfn(y, Math.sin(y)), b);
double temp = 1.0 / q;
double s = 0.5 * (q - temp);
- double V = Math.sin(b * x);
- double U = (s * singamma0 - V * cosgamma0) / (0.5 * (q + temp));
- if (Math.abs(Math.abs(U) - 1.0) < EPSILON) {
+ double v2 = Math.sin(b * x);
+ double u2 = (s * singamma0 - v2 * cosgamma0) / (0.5 * (q + temp));
+ if (Math.abs(Math.abs(u2) - 1.0) < EPSILON) {
v = 0; // this is actually an error and should be reported to the caller somehow
} else {
- v = 0.5 * arb * Math.log((1.0 - U) / (1.0 + U));
+ v = 0.5 * arb * Math.log((1.0 - u2) / (1.0 + u2));
}
temp = Math.cos(b * x);
if (Math.abs(temp) < EPSILON_LATITUDE) {
u = ab * x;
} else {
- u = arb * Math.atan2(s * cosgamma0 + V * singamma0, temp);
+ u = arb * Math.atan2(s * cosgamma0 + v2 * singamma0, temp);
}
} else {
v = y > 0 ? vPoleN : vPoleS;
diff --git a/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java b/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java
index ccdc860..2667110 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java
@@ -78,11 +78,6 @@ public class PolarStereographic extends AbstractProj {
private double k0;
/**
- * Latitude of true scale, in radians
- */
- private double latitudeTrueScale;
-
- /**
* {@code true} if this projection is for the south pole, or {@code false}
* if it is for the north pole.
*/
@@ -106,6 +101,8 @@ public class PolarStereographic extends AbstractProj {
if (params.lat0 != 90.0 && params.lat0 != -90.0)
throw new ProjectionConfigurationException(
tr("Polar Stereographic: Parameter ''{0}'' must be 90 or -90.", "lat_0"));
+ // Latitude of true scale, in radians;
+ double latitudeTrueScale;
if (params.lat_ts == null) {
latitudeTrueScale = (params.lat0 < 0) ? -Math.PI/2 : Math.PI/2;
} else {
@@ -173,11 +170,11 @@ public class PolarStereographic extends AbstractProj {
@Override
public Bounds getAlgorithmBounds() {
- final double CUT = 60;
+ final double cut = 60;
if (southPole) {
- return new Bounds(-90, -180, CUT, 180, false);
+ return new Bounds(-90, -180, cut, 180, false);
} else {
- return new Bounds(-CUT, -180, 90, 180, false);
+ return new Bounds(-cut, -180, 90, 180, false);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/projection/proj/Proj.java b/src/org/openstreetmap/josm/data/projection/proj/Proj.java
index 3988012..fa9b3fe 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/Proj.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/Proj.java
@@ -49,12 +49,12 @@ public interface Proj {
/**
* Convert lat/lon to east/north.
*
- * @param lat_rad the latitude in radians
- * @param lon_rad the longitude in radians
+ * @param latRad the latitude in radians
+ * @param lonRad the longitude in radians
* @return array of length 2, containing east and north value in meters,
* divided by the semi major axis of the ellipsoid.
*/
- double[] project(double lat_rad, double lon_rad);
+ double[] project(double latRad, double lonRad);
/**
* Convert east/north to lat/lon.
diff --git a/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
index 2937231..9076d66 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
@@ -55,8 +55,8 @@ public class SwissObliqueMercator extends AbstractProj {
initialize(params.lat0);
}
- private void initialize(double lat_0) {
- phi0 = toRadians(lat_0);
+ private void initialize(double lat0) {
+ phi0 = 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);
@@ -77,9 +77,9 @@ public class SwissObliqueMercator extends AbstractProj {
@Override
public double[] project(double phi, double lambda) {
- double S = alpha * log(tan(PI / 4 + phi / 2)) - alpha * ellps.e / 2
+ double s = alpha * log(tan(PI / 4 + phi / 2)) - alpha * ellps.e / 2
* log((1 + ellps.e * sin(phi)) / (1 - ellps.e * sin(phi))) + k;
- double b = 2 * (atan(exp(S)) - PI / 4);
+ double b = 2 * (atan(exp(s)) - PI / 4);
double l = alpha * lambda;
double lb = atan2(sin(l), sin(b0) * tan(b) + cos(b0) * cos(l));
diff --git a/src/org/openstreetmap/josm/data/validation/OsmValidator.java b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
index b1f1be3..3e2ec86 100644
--- a/src/org/openstreetmap/josm/data/validation/OsmValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
@@ -343,10 +343,12 @@ public class OsmValidator implements LayerChangeListener {
/* -------------------------------------------------------------------------- */
@Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+ // Do nothing
}
@Override
public void layerAdded(Layer newLayer) {
+ // Do nothing
}
@Override
diff --git a/src/org/openstreetmap/josm/data/validation/PaintVisitor.java b/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
index 42c0b9b..795b6c1 100644
--- a/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
@@ -120,13 +120,13 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
if (!paintedPoints.contains(pp)) {
Point p = mv.getPoint(n);
- g.setColor(color);
if (selected) {
+ g.setColor(getHighlightColor());
g.fillOval(p.x - 5, p.y - 5, 10, 10);
- } else {
- g.drawOval(p.x - 5, p.y - 5, 10, 10);
}
+ g.setColor(color);
+ g.drawOval(p.x - 5, p.y - 5, 10, 10);
paintedPoints.add(pp);
}
}
@@ -139,13 +139,13 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
* @param color The color
*/
protected void drawSegment(Point p1, Point p2, Color color) {
- g.setColor(color);
double t = Math.atan2(p2.x - p1.x, p2.y - p1.y);
double cosT = 5 * Math.cos(t);
double sinT = 5 * Math.sin(t);
int deg = (int) Math.toDegrees(t);
if (selected) {
+ g.setColor(getHighlightColor());
int[] x = new int[] {(int) (p1.x + cosT), (int) (p2.x + cosT),
(int) (p2.x - cosT), (int) (p1.x - cosT)};
int[] y = new int[] {(int) (p1.y - sinT), (int) (p2.y - sinT),
@@ -153,14 +153,14 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
g.fillPolygon(x, y, 4);
g.fillArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180);
g.fillArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180);
- } else {
- g.drawLine((int) (p1.x + cosT), (int) (p1.y - sinT),
- (int) (p2.x + cosT), (int) (p2.y - sinT));
- g.drawLine((int) (p1.x - cosT), (int) (p1.y + sinT),
- (int) (p2.x - cosT), (int) (p2.y + sinT));
- g.drawArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180);
- g.drawArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180);
}
+ g.setColor(color);
+ g.drawLine((int) (p1.x + cosT), (int) (p1.y - sinT),
+ (int) (p2.x + cosT), (int) (p2.y - sinT));
+ g.drawLine((int) (p1.x - cosT), (int) (p1.y + sinT),
+ (int) (p2.x - cosT), (int) (p2.y + sinT));
+ g.drawArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180);
+ g.drawArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180);
}
/**
@@ -258,6 +258,14 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
}
/**
+ * Gets the color to draw highlight markers with.
+ * @return The color.
+ */
+ private Color getHighlightColor() {
+ return new Color(color.getRed(), color.getGreen(), color.getBlue(), (int) (color.getAlpha() * .4));
+ }
+
+ /**
* Clears the internal painted objects collections.
*/
public void clearPaintedObjects() {
diff --git a/src/org/openstreetmap/josm/data/validation/Test.java b/src/org/openstreetmap/josm/data/validation/Test.java
index 1c7f0e7..3260026 100644
--- a/src/org/openstreetmap/josm/data/validation/Test.java
+++ b/src/org/openstreetmap/josm/data/validation/Test.java
@@ -226,13 +226,19 @@ public class Test extends AbstractVisitor {
}
@Override
- public void visit(Node n) {}
+ public void visit(Node n) {
+ // To be overridden in subclasses
+ }
@Override
- public void visit(Way w) {}
+ public void visit(Way w) {
+ // To be overridden in subclasses
+ }
@Override
- public void visit(Relation r) {}
+ public void visit(Relation r) {
+ // To be overridden in subclasses
+ }
/**
* Allow the tester to manage its own preferences
diff --git a/src/org/openstreetmap/josm/data/validation/TestError.java b/src/org/openstreetmap/josm/data/validation/TestError.java
index 503a840..f9b2ea4 100644
--- a/src/org/openstreetmap/josm/data/validation/TestError.java
+++ b/src/org/openstreetmap/josm/data/validation/TestError.java
@@ -365,19 +365,33 @@ public class TestError implements Comparable<TestError>, DataSetListener {
}
}
- @Override public void primitivesAdded(PrimitivesAddedEvent event) {}
+ @Override public void primitivesAdded(PrimitivesAddedEvent event) {
+ // Do nothing
+ }
- @Override public void tagsChanged(TagsChangedEvent event) {}
+ @Override public void tagsChanged(TagsChangedEvent event) {
+ // Do nothing
+ }
- @Override public void nodeMoved(NodeMovedEvent event) {}
+ @Override public void nodeMoved(NodeMovedEvent event) {
+ // Do nothing
+ }
- @Override public void wayNodesChanged(WayNodesChangedEvent event) {}
+ @Override public void wayNodesChanged(WayNodesChangedEvent event) {
+ // Do nothing
+ }
- @Override public void relationMembersChanged(RelationMembersChangedEvent event) {}
+ @Override public void relationMembersChanged(RelationMembersChangedEvent event) {
+ // Do nothing
+ }
- @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {}
+ @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+ // Do nothing
+ }
- @Override public void dataChanged(DataChangedEvent event) {}
+ @Override public void dataChanged(DataChangedEvent event) {
+ // Do nothing
+ }
@Override
public String toString() {
diff --git a/src/org/openstreetmap/josm/data/validation/package-info.java b/src/org/openstreetmap/josm/data/validation/package-info.java
new file mode 100644
index 0000000..69bc191
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/validation/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM data validation.
+ */
+package org.openstreetmap.josm.data.validation;
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index ded9fec..22d9be3 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -289,12 +289,14 @@ 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 2016031001, Last Updated Fri Mar 11 07:07:01 2016 UTC
+ // Taken from Version 2016042300, Last Updated Sat Apr 23 07:07:01 2016 UTC
"aaa", // aaa American Automobile Association, Inc.
"aarp", // aarp AARP
"abb", // abb ABB Ltd
"abbott", // abbott Abbott Laboratories, Inc.
+ "abbvie", // abbvie AbbVie Inc.
"abogado", // abogado Top Level Domain Holdings Limited
+ "abudhabi", // abudhabi Abu Dhabi Systems and Information Centre
"academy", // academy Half Oaks, LLC
"accenture", // accenture Accenture plc
"accountant", // accountant dot Accountant Limited
@@ -308,18 +310,22 @@ public final class DomainValidator extends AbstractValidator {
"aeg", // aeg Aktiebolaget Electrolux
"aero", // aero Societe Internationale de Telecommunications Aeronautique (SITA INC USA)
"afl", // afl Australian Football League
+ "agakhan", // agakhan Fondation Aga Khan (Aga Khan Foundation)
"agency", // agency Steel Falls, LLC
"aig", // aig American International Group, Inc.
"airforce", // airforce United TLD Holdco Ltd.
"airtel", // airtel Bharti Airtel Limited
+ "akdn", // akdn Fondation Aga Khan (Aga Khan Foundation)
"alibaba", // alibaba Alibaba Group Holding Limited
"alipay", // alipay Alibaba Group Holding Limited
"allfinanz", // allfinanz Allfinanz Deutsche Vermögensberatung Aktiengesellschaft
+ "ally", // ally Ally Financial Inc.
"alsace", // alsace REGION D ALSACE
"amica", // amica Amica Mutual Insurance Company
"amsterdam", // amsterdam Gemeente Amsterdam
"analytics", // analytics Campus IP LLC
"android", // android Charleston Road Registry Inc.
+ "anquan", // anquan QIHOO 360 TECHNOLOGY CO. LTD.
"apartments", // apartments June Maple, LLC
"app", // app Charleston Road Registry Inc.
"apple", // apple Apple Inc.
@@ -338,8 +344,10 @@ public final class DomainValidator extends AbstractValidator {
"auto", // auto Uniregistry, Corp.
"autos", // autos DERAutos, LLC
"avianca", // avianca Aerovias del Continente Americano S.A. Avianca
+ "aws", // aws Amazon Registry Services, Inc.
"axa", // axa AXA SA
"azure", // azure Microsoft Corporation
+ "baby", // baby Johnson & Johnson Services, Inc.
"baidu", // baidu Baidu, Inc.
"band", // band United TLD Holdco, Ltd
"bank", // bank fTLD Registry Services, LLC
@@ -347,6 +355,7 @@ public final class DomainValidator extends AbstractValidator {
"barcelona", // barcelona Municipi de Barcelona
"barclaycard", // barclaycard Barclays Bank PLC
"barclays", // barclays Barclays Bank PLC
+ "barefoot", // barefoot Gallo Vineyards, Inc.
"bargains", // bargains Half Hallow, LLC
"bauhaus", // bauhaus Werkhaus GmbH
"bayern", // bayern Bayern Connect GmbH
@@ -553,6 +562,7 @@ public final class DomainValidator extends AbstractValidator {
"expert", // expert Magic Pass, LLC
"exposed", // exposed Victor Beach, LLC
"express", // express Sea Sunset, LLC
+ "extraspace", // extraspace Extra Space Storage LLC
"fage", // fage Fage International S.A.
"fail", // fail Atomic Pipe, LLC
"fairwinds", // fairwinds FairWinds Partners, LLC
@@ -593,12 +603,14 @@ public final class DomainValidator extends AbstractValidator {
"frl", // frl FRLregistry B.V.
"frogans", // frogans OP3FT
"frontier", // frontier Frontier Communications Corporation
+ "ftr", // ftr Frontier Communications Corporation
"fund", // fund John Castle, LLC
"furniture", // furniture Lone Fields, LLC
"futbol", // futbol United TLD Holdco, Ltd.
"fyi", // fyi Silver Tigers, LLC
"gal", // gal Asociación puntoGAL
"gallery", // gallery Sugar House, LLC
+ "gallo", // gallo Gallo Vineyards, Inc.
"gallup", // gallup Gallup, Inc.
"game", // game Uniregistry, Corp.
"garden", // garden Top Level Domain Holdings Limited
@@ -667,6 +679,7 @@ public final class DomainValidator extends AbstractValidator {
"house", // house Sugar Park, LLC
"how", // how Charleston Road Registry Inc.
"hsbc", // hsbc HSBC Holdings PLC
+ "htc", // htc HTC corporation
"hyundai", // hyundai Hyundai Motor Company
"ibm", // ibm International Business Machines Corporation
"icbc", // icbc Industrial and Commercial Bank of China Limited
@@ -674,6 +687,7 @@ public final class DomainValidator extends AbstractValidator {
"icu", // icu One.com A/S
"ifm", // ifm ifm electronic gmbh
"iinet", // iinet Connect West Pty. Ltd.
+ "imamat", // imamat Fondation Aga Khan (Aga Khan Foundation)
"immo", // immo Auburn Bloom, LLC
"immobilien", // immobilien United TLD Holdco Ltd.
"industries", // industries Outer House, LLC
@@ -690,6 +704,7 @@ public final class DomainValidator extends AbstractValidator {
"ipiranga", // ipiranga Ipiranga Produtos de Petroleo S.A.
"irish", // irish Dot-Irish LLC
"iselect", // iselect iSelect Ltd
+ "ismaili", // ismaili Fondation Aga Khan (Aga Khan Foundation)
"ist", // ist Istanbul Metropolitan Municipality
"istanbul", // istanbul Istanbul Metropolitan Municipality / Medya A.S.
"itau", // itau Itau Unibanco Holding S.A.
@@ -697,11 +712,13 @@ public final class DomainValidator extends AbstractValidator {
"jaguar", // jaguar Jaguar Land Rover Ltd
"java", // java Oracle Corporation
"jcb", // jcb JCB Co., Ltd.
+ "jcp", // jcp JCP Media, Inc.
"jetzt", // jetzt New TLD Company AB
"jewelry", // jewelry Wild Bloom, LLC
"jlc", // jlc Richemont DNS Inc.
"jll", // jll Jones Lang LaSalle Incorporated
"jmp", // jmp Matrix IP LLC
+ "jnj", // jnj Johnson & Johnson Services, Inc.
"jobs", // jobs Employ Media LLC
"joburg", // joburg ZA Central Registry NPC trading as ZA Central Registry
"jot", // jot Amazon Registry Services, Inc.
@@ -722,6 +739,7 @@ public final class DomainValidator extends AbstractValidator {
"kiwi", // kiwi DOT KIWI LIMITED
"koeln", // koeln NetCologne Gesellschaft für Telekommunikation mbH
"komatsu", // komatsu Komatsu Ltd.
+ "kpmg", // kpmg KPMG International Cooperative (KPMG International Genossenschaft)
"kpn", // kpn Koninklijke KPN N.V.
"krd", // krd KRG Department of Information Technology
"kred", // kred KredTLD Pty Ltd
@@ -798,6 +816,7 @@ public final class DomainValidator extends AbstractValidator {
"microsoft", // microsoft Microsoft Corporation
"mil", // mil DoD Network Information Center
"mini", // mini Bayerische Motoren Werke Aktiengesellschaft
+ "mls", // mls The Canadian Real Estate Association
"mma", // mma MMA IARD
"mobi", // mobi Afilias Technologies Limited dba dotMobi
"mobily", // mobily GreenTech Consultancy Company W.L.L.
@@ -819,6 +838,7 @@ public final class DomainValidator extends AbstractValidator {
"mtpc", // mtpc Mitsubishi Tanabe Pharma Corporation
"mtr", // mtr MTR Corporation Limited
"museum", // museum Museum Domain Management Association
+ "mutual", // mutual Northwestern Mutual MU TLD Registry, LLC
"mutuelle", // mutuelle Fédération Nationale de la Mutualité Française
"nadex", // nadex Nadex Domains, Inc
"nagoya", // nagoya GMO Registry, Inc.
@@ -839,7 +859,9 @@ public final class DomainValidator extends AbstractValidator {
"nikon", // nikon NIKON CORPORATION
"ninja", // ninja United TLD Holdco Ltd.
"nissan", // nissan NISSAN MOTOR CO., LTD.
+ "nissay", // nissay Nippon Life Insurance Company
"nokia", // nokia Nokia Corporation
+ "northwesternmutual", // northwesternmutual Northwestern Mutual Registry, LLC
"norton", // norton Symantec Corporation
"nowruz", // nowruz Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
"nra", // nra NRA Holdings Company, INC.
@@ -903,6 +925,7 @@ public final class DomainValidator extends AbstractValidator {
"prod", // prod Charleston Road Registry Inc.
"productions", // productions Magic Birch, LLC
"prof", // prof Charleston Road Registry Inc.
+ "progressive", // progressive Progressive Casualty Insurance Company
"promo", // promo Afilias plc
"properties", // properties Big Pass, LLC
"property", // property Uniregistry, Corp.
@@ -963,6 +986,7 @@ public final class DomainValidator extends AbstractValidator {
"sarl", // sarl Delta Orchard, LLC
"sas", // sas Research IP LLC
"saxo", // saxo Saxo Bank A/S
+ "sbi", // sbi STATE BANK OF INDIA
"sbs", // sbs SPECIAL BROADCASTING SERVICE CORPORATION
"sca", // sca SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
"scb", // scb The Siam Commercial Bank Public Company Limited ("SCB")
@@ -987,12 +1011,15 @@ public final class DomainValidator extends AbstractValidator {
"sexy", // sexy Uniregistry, Corp.
"sfr", // sfr Societe Francaise du Radiotelephone - SFR
"sharp", // sharp Sharp Corporation
+ "shaw", // shaw Shaw Cablesystems G.P.
"shell", // shell Shell Information Technology International Inc
"shia", // shia Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
"shiksha", // shiksha Afilias Limited
"shoes", // shoes Binky Galley, LLC
+ "shouji", // shouji QIHOO 360 TECHNOLOGY CO. LTD.
"show", // show Snow Beach, LLC
"shriram", // shriram Shriram Capital Ltd.
+ "sina", // sina Sina Corporation
"singles", // singles Fern Madison, LLC
"site", // site DotSite Inc.
"ski", // ski STARTING DOT LIMITED
@@ -1019,6 +1046,7 @@ public final class DomainValidator extends AbstractValidator {
"stada", // stada STADA Arzneimittel AG
"star", // star Star India Private Limited
"starhub", // starhub StarHub Limited
+ "statebank", // statebank STATE BANK OF INDIA
"statefarm", // statefarm State Farm Mutual Automobile Insurance Company
"statoil", // statoil Statoil ASA
"stc", // stc Saudi Telecom Company
@@ -1026,6 +1054,7 @@ public final class DomainValidator extends AbstractValidator {
"stockholm", // stockholm Stockholms kommun
"storage", // storage Self Storage Company LLC
"store", // store DotStore Inc.
+ "stream", // stream dot Stream Limited
"studio", // studio United TLD Holdco Ltd.
"study", // study OPEN UNIVERSITIES AUSTRALIA PTY LTD
"style", // style Binky Moon, LLC
@@ -1043,6 +1072,7 @@ public final class DomainValidator extends AbstractValidator {
"systems", // systems Dash Cypress, LLC
"tab", // tab Tabcorp Holdings Limited
"taipei", // taipei Taipei City Government
+ "talk", // talk Amazon Registry Services, Inc.
"taobao", // taobao Alibaba Group Holding Limited
"tatamotors", // tatamotors Tata Motors Ltd
"tatar", // tatar Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic"
@@ -1058,6 +1088,7 @@ public final class DomainValidator extends AbstractValidator {
"telefonica", // telefonica Telefónica S.A.
"temasek", // temasek Temasek Holdings (Private) Limited
"tennis", // tennis Cotton Bloom, LLC
+ "teva", // teva Teva Pharmaceutical Industries Limited
"thd", // thd Homer TLC, Inc.
"theater", // theater Blue Tigers, LLC
"theatre", // theatre XYZ.COM LLC
@@ -1106,6 +1137,7 @@ public final class DomainValidator extends AbstractValidator {
"vet", // vet United TLD Holdco, Ltd
"viajes", // viajes Black Madison, LLC
"video", // video United TLD Holdco, Ltd
+ "vig", // vig VIENNA INSURANCE GROUP AG Wiener Versicherung Gruppe
"viking", // viking Viking River Cruises (Bermuda) Ltd.
"villas", // villas New Sky, LLC
"vin", // vin Holly Shadow, LLC
@@ -1136,6 +1168,7 @@ public final class DomainValidator extends AbstractValidator {
"website", // website DotWebsite Inc.
"wed", // wed Atgron, Inc.
"wedding", // wedding Top Level Domain Holdings Limited
+ "weibo", // weibo Sina Corporation
"weir", // weir Weir Group IP Limited
"whoswho", // whoswho Who's Who Registry
"wien", // wien punkt.wien GmbH
@@ -1153,6 +1186,7 @@ public final class DomainValidator extends AbstractValidator {
"wtf", // wtf Hidden Way, LLC
"xbox", // xbox Microsoft Corporation
"xerox", // xerox Xerox DNHC LLC
+ "xihuan", // xihuan QIHOO 360 TECHNOLOGY CO. LTD.
"xin", // xin Elegant Leader Limited
"xn--11b4c3d", // कॉम VeriSign Sarl
"xn--1ck2e1b", // セール Amazon Registry Services, Inc.
@@ -1166,6 +1200,7 @@ public final class DomainValidator extends AbstractValidator {
"xn--4gbrim", // موقع Suhub Electronic Establishment
"xn--55qw42g", // 公益 China Organizational Name Administration Center
"xn--55qx5d", // 公司 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center）
+ "xn--5tzm5g", // 网站 Global Website TLD Asia Limited
"xn--6frz82g", // 移动 Afilias Limited
"xn--6qq986b3xl", // 我爱你 Tycoon Treasure Limited
"xn--80adxhks", // москва Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
@@ -1174,6 +1209,7 @@ public final class DomainValidator extends AbstractValidator {
"xn--8y0a063a", // 联通 China United Network Communications Corporation Limited
"xn--9dbq2a", // קום VeriSign Sarl
"xn--9et52u", // 时尚 RISE VICTORY LIMITED
+ "xn--9krt00a", // 微博 Sina Corporation
"xn--b4w605ferd", // 淡马锡 Temasek Holdings (Private) Limited
"xn--bck1b9a5dre4c", // ファッション Amazon Registry Services, Inc.
"xn--c1avg", // орг Public Interest Registry
@@ -1187,6 +1223,7 @@ public final class DomainValidator extends AbstractValidator {
"xn--eckvdtc9d", // ポイント Amazon Registry Services, Inc.
"xn--efvy88h", // 新闻 Xinhua News Agency Guangdong Branch 新华通讯社广东分社
"xn--estv75g", // 工行 Industrial and Commercial Bank of China Limited
+ "xn--fct429k", // 家電 Amazon Registry Services, Inc.
"xn--fhbei", // كوم VeriSign Sarl
"xn--fiq228c5hs", // 中文网 TLD REGISTRY LIMITED
"xn--fiq64b", // 中信 CITIC Group Corporation
@@ -1207,6 +1244,7 @@ public final class DomainValidator extends AbstractValidator {
"xn--mgba3a3ejt", // ارامكو Aramco Services Company
"xn--mgbab2bd", // بازار CORE Association
"xn--mgbb9fbpob", // موبايلي GreenTech Consultancy Company W.L.L.
+ "xn--mgbca7dzdo", // ابوظبي Abu Dhabi Systems and Information Centre
"xn--mgbt3dhd", // همراه Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
"xn--mk1bu44c", // 닷컴 VeriSign Sarl
"xn--mxtq1m", // 政府 Net-Chinese Co., Ltd.
@@ -1243,7 +1281,9 @@ public final class DomainValidator extends AbstractValidator {
"yodobashi", // yodobashi YODOBASHI CAMERA CO.,LTD.
"yoga", // yoga Top Level Domain Holdings Limited
"yokohama", // yokohama GMO Registry, Inc.
+ "you", // you Amazon Registry Services, Inc.
"youtube", // youtube Charleston Road Registry Inc.
+ "yun", // yun QIHOO 360 TECHNOLOGY CO. LTD.
"zara", // zara Industria de Diseño Textil, S.A. (INDITEX, S.A.)
"zero", // zero Amazon Registry Services, Inc.
"zip", // zip Charleston Road Registry Inc.
@@ -1261,7 +1301,7 @@ public final class DomainValidator extends AbstractValidator {
"ai", // Anguilla
"al", // Albania
"am", // Armenia
-// "an", // Netherlands Antilles (retired)
+ //"an", // Netherlands Antilles (retired)
"ao", // Angola
"aq", // Antarctica
"ar", // Argentina
@@ -1476,7 +1516,7 @@ public final class DomainValidator extends AbstractValidator {
"tm", // Turkmenistan
"tn", // Tunisia
"to", // Tonga
-// "tp", // East Timor (Retired)
+ //"tp", // East Timor (Retired)
"tr", // Turkey
"tt", // Trinidad and Tobago
"tv", // Tuvalu
diff --git a/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java b/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java
index d5b81f0..1829136 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java
@@ -136,17 +136,6 @@ public class EmailValidator extends AbstractValidator {
}
/**
- * Protected constructor for subclasses to use.
- *
- * @param allowLocal Should local addresses be considered valid?
- */
- protected EmailValidator(boolean allowLocal) {
- super();
- this.allowLocal = allowLocal;
- this.allowTld = false;
- }
-
- /**
* <p>Checks if a field has a valid e-mail address.</p>
*
* @param email The value validation is being performed on. A <code>null</code>
diff --git a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
index 4a9fbbe..1497627 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
@@ -155,9 +155,6 @@ public class UrlValidator extends AbstractValidator {
private static final int PARSE_AUTHORITY_HOST_IP = 2; // excludes userinfo, if present
- // Not needed, because it is validated by AUTHORITY_REGEX
-// private static final int PARSE_AUTHORITY_PORT = 3;
-
/**
* Should always be empty. The code currently allows spaces.
*/
@@ -539,9 +536,4 @@ public class UrlValidator extends AbstractValidator {
private boolean isOff(long flag) {
return (options & flag) == 0;
}
-
- // Unit test access to pattern matcher
- Matcher matchURL(String value) {
- return URL_PATTERN.matcher(value);
- }
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
index 8b717db..62f8bc4 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
@@ -33,6 +33,9 @@ public class LongSegment extends Test {
@Override
public void visit(Way w) {
+ if ("ferry".equals(w.get("route"))) {
+ return;
+ }
Double length = w.getLongestSegmentLength();
if (length > maxlength) {
length /= 1000.0;
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
index 9dabb38..de7cf74 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
@@ -113,7 +113,7 @@ public class MultipolygonTest extends Test {
return result;
}
- private List<GeneralPath> createPolygons(List<Multipolygon.PolyData> joinedWays) {
+ private static List<GeneralPath> createPolygons(List<Multipolygon.PolyData> joinedWays) {
List<GeneralPath> result = new ArrayList<>();
for (Multipolygon.PolyData way : joinedWays) {
result.add(createPath(way.getNodes()));
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
index 828c00a..595c93e 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
@@ -230,7 +230,7 @@ public class OpeningHourTest extends Test.TagTest {
* @param o error/warnign message
* @return translated/shortened error/warnign message
*/
- private String getErrorMessage(String key, Object o) {
+ private static String getErrorMessage(String key, Object o) {
String msg = o.toString().trim()
.replace("Unexpected token:", tr("Unexpected token:"))
.replace("Unexpected token (school holiday parser):", tr("Unexpected token (school holiday parser):"))
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
index e16d8d4..664f1c8 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
@@ -66,7 +66,7 @@ public class OverlappingWays extends Test {
nodePairs = new MultiMap<>(1000);
}
- private boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
+ private static boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
for (Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
if (r.concernsArea()) {
return true;
@@ -147,9 +147,7 @@ public class OverlappingWays extends Test {
errortype, type, prims, duplicated));
seenWays.put(currentWays, duplicated);
} else { /* way seen, mark highlight layer only */
- for (WaySegment ws : duplicated) {
- highlight.add(ws);
- }
+ highlight.addAll(duplicated);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java b/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java
index fc41587..6575156 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java
@@ -4,8 +4,13 @@ package org.openstreetmap.josm.data.validation.tests;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.validation.Severity;
@@ -39,12 +44,14 @@ public class PublicTransportRouteTest extends Test {
}
final List<RelationMember> membersToCheck = new ArrayList<>();
+ final Set<Node> routeNodes = new HashSet<>();
for (RelationMember member : r.getMembers()) {
if (member.hasRole("forward", "backward")) {
errors.add(new TestError(this, Severity.WARNING, tr("Route relation contains a ''{0}'' role", "forward/backward"), 3601, r));
return;
- } else if (member.hasRole("")) {
+ } else if (member.hasRole("") && OsmPrimitiveType.WAY.equals(member.getType())) {
membersToCheck.add(member);
+ routeNodes.addAll(member.getWay().getNodes());
}
}
if (membersToCheck.isEmpty()) {
@@ -64,5 +71,13 @@ public class PublicTransportRouteTest extends Test {
}
}
+ for (RelationMember member : r.getMembers()) {
+ if (member.hasRole("stop", "stop_exit_only", "stop_entry_only")
+ && OsmPrimitiveType.NODE.equals(member.getType())
+ && !routeNodes.contains(member.getNode())) {
+ errors.add(new TestError(this, Severity.WARNING,
+ tr("Stop position not part of route"), 3603, Arrays.asList(member.getMember(), r)));
+ }
+ }
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
index cc1d0f1..a797ba1 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
@@ -125,7 +125,7 @@ public class RelationChecker extends Test {
}
}
- private Map<String, RoleInfo> buildRoleInfoMap(Relation n) {
+ private static Map<String, RoleInfo> buildRoleInfoMap(Relation n) {
Map<String, RoleInfo> map = new HashMap<>();
for (RelationMember m : n.getMembers()) {
String role = m.getRole();
@@ -140,7 +140,7 @@ public class RelationChecker extends Test {
}
// return Roles grouped by key
- private Map<String, RolePreset> buildAllRoles(Relation n) {
+ private static Map<String, RolePreset> buildAllRoles(Relation n) {
Map<String, RolePreset> allroles = new HashMap<>();
for (TaggingPreset p : relationpresets) {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java b/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
index ab68dd7..bcb0f0f 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
@@ -118,8 +118,8 @@ public class SimilarNamedWays extends Test {
int m; // length of t
int i; // iterates through s
int j; // iterates through t
- char s_i; // ith character of s
- char t_j; // jth character of t
+ char si; // ith character of s
+ char tj; // jth character of t
int cost; // cost
// Step 1
@@ -142,15 +142,15 @@ public class SimilarNamedWays extends Test {
// Step 3
for (i = 1; i <= n; i++) {
- s_i = s.charAt(i - 1);
+ si = s.charAt(i - 1);
// Step 4
for (j = 1; j <= m; j++) {
- t_j = t.charAt(j - 1);
+ tj = t.charAt(j - 1);
// Step 5
- if (s_i == t_j) {
+ if (si == tj) {
cost = 0;
} else {
cost = 1;
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index fb7583a..b790e51 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -127,11 +128,11 @@ public class TagChecker extends TagTest {
protected static final int MISSPELLED_VALUE = 1212;
protected static final int MISSPELLED_KEY = 1213;
protected static final int MULTIPLE_SPACES = 1214;
- /** 1250 and up is used by tagcheck */
+ // 1250 and up is used by tagcheck
protected EditableList sourcesList;
- private static final List<String> DEFAULT_SOURCES = Arrays.asList(/*DATA_FILE, */IGNORE_FILE, SPELL_FILE);
+ private static final Set<String> DEFAULT_SOURCES = new HashSet<>(Arrays.asList(/*DATA_FILE, */IGNORE_FILE, SPELL_FILE));
/**
* Constructor
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
index 27ef3d2..34ee4d6 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
@@ -388,10 +388,10 @@ public abstract class UnconnectedWays extends Test {
// overlap a bit and can return duplicate nodes.
nearbyNodeCache = null;
List<LatLon> bounds = this.getBounds(dist);
- List<Node> found_nodes = endnodesHighway.search(new BBox(bounds.get(0), bounds.get(1)));
- found_nodes.addAll(endnodes.search(new BBox(bounds.get(0), bounds.get(1))));
+ List<Node> foundNodes = endnodesHighway.search(new BBox(bounds.get(0), bounds.get(1)));
+ foundNodes.addAll(endnodes.search(new BBox(bounds.get(0), bounds.get(1))));
- for (Node n : found_nodes) {
+ for (Node n : foundNodes) {
if (!nearby(n, dist) || !n.getCoor().isIn(dsArea)) {
continue;
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java b/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
index b4200ff..23adaa0 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
@@ -4,6 +4,8 @@ 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.Locale;
+
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.osm.AbstractPrimitive;
import org.openstreetmap.josm.data.osm.Node;
@@ -51,7 +53,7 @@ public class UntaggedNode extends Test implements AbstractPrimitive.KeyValueVisi
@Override
public void visitKeyValue(AbstractPrimitive n, String key, String value) {
- if (key.toLowerCase().contains("fixme") || value.toLowerCase().contains("fixme")) {
+ if (key.toLowerCase(Locale.ENGLISH).contains("fixme") || value.toLowerCase(Locale.ENGLISH).contains("fixme")) {
/* translation note: don't translate quoted words */
String msg = marktr("Has tag containing ''fixme'' or ''FIXME''");
errors.add(new TestError(this, Severity.WARNING, ERROR_MESSAGE, tr(msg), msg, UNTAGGED_NODE_FIXME, (OsmPrimitive) n));
diff --git a/src/org/openstreetmap/josm/data/validation/util/Entities.java b/src/org/openstreetmap/josm/data/validation/util/Entities.java
index bb5725e..f4d16fa 100644
--- a/src/org/openstreetmap/josm/data/validation/util/Entities.java
+++ b/src/org/openstreetmap/josm/data/validation/util/Entities.java
@@ -29,6 +29,7 @@ import java.util.Map;
* @see <a href="http://www.w3.org/TR/REC-html40/sgml/entities.html">HTML 4.0 Character entity references</a>
* @see <a href="http://www.w3.org/TR/html401/charset.html#h-5.3">HTML 4.01 Character References</a>
* @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
+ * @since 3669
*/
public final class Entities {
private static final String[][] ARRAY = {
@@ -339,6 +340,11 @@ public final class Entities {
// Private constructor for utilities classes
}
+ /**
+ * Returns unescaped entity representation.
+ * @param str entity
+ * @return unescaped entity representation
+ */
public static String unescape(String str) {
int firstAmp = str.indexOf('&');
if (firstAmp < 0)
@@ -356,7 +362,7 @@ public final class Entities {
}
int amphersandIdx = str.indexOf('&', i + 1);
if (amphersandIdx != -1 && amphersandIdx < semiColonIdx) {
- // Then the text looks like &...&...;
+ // Then the text looks like "&...&...;"
res.append(c);
continue;
}
@@ -364,8 +370,7 @@ public final class Entities {
int entityValue = -1;
int entityContentLen = entityContent.length();
if (entityContentLen > 0) {
- if (entityContent.charAt(0) == '#') { // escaped value content is an integer (decimal or
- // hexidecimal)
+ if (entityContent.charAt(0) == '#') { // escaped value content is an integer (decimal or hexidecimal)
if (entityContentLen > 1) {
char isHexChar = entityContent.charAt(1);
try {
diff --git a/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java b/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
index bb891e7..36c6b2d 100644
--- a/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
@@ -18,6 +18,9 @@ import org.openstreetmap.josm.tools.ImageProvider;
*/
public class MultipleNameVisitor extends NameVisitor {
+ /**
+ * Maximum displayed length, in characters.
+ */
public static final int MULTIPLE_NAME_MAX_LENGTH = 80;
/** The class name of the combined primitives */
diff --git a/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java b/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java
index 982092b..5fcd3db 100644
--- a/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java
@@ -18,27 +18,30 @@ import org.openstreetmap.josm.tools.ImageProvider;
*
* @author imi
*/
-//TODO This class used to be in JOSM but it was removed. MultipleNameVisitor depends on it so I copied it here,
-// but MultipleNameVisitor should be refactored instead of using this class
public class NameVisitor extends AbstractVisitor {
/**
* The name of the item class
*/
public String className;
+
+ /**
+ * The plural name of the item class
+ */
public String classNamePlural;
+
/**
* The name of this item.
*/
public String name = "";
+
/**
* The icon of this item.
*/
public Icon icon;
/**
- * If the node has a name-key or id-key, this is displayed. If not, (lat,lon)
- * is displayed.
+ * If the node has a name-key or id-key, this is displayed. If not, (lat,lon) is displayed.
*/
@Override
public void visit(Node n) {
@@ -68,6 +71,10 @@ public class NameVisitor extends AbstractVisitor {
classNamePlural = trn("relation", "relations", 2);
}
+ /**
+ * Returns an horizontal {@code JLabel} with icon and name.
+ * @return horizontal {@code JLabel} with icon and name
+ */
public JLabel toLabel() {
return new JLabel(name, icon, JLabel.HORIZONTAL);
}
diff --git a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
index 1af69d9..c3eee35 100644
--- a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
+++ b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
@@ -331,7 +331,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
return result;
}
- private StringBuilder formatRelationNameAndType(Relation relation, StringBuilder result, TaggingPreset preset) {
+ private static StringBuilder formatRelationNameAndType(Relation relation, StringBuilder result, TaggingPreset preset) {
if (preset == null) {
result.append(getRelationTypeName(relation));
String relationName = getRelationName(relation);
@@ -417,9 +417,9 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
if (name == null) {
name = tr("relation");
}
- String admin_level = relation.get("admin_level");
- if (admin_level != null) {
- name += '['+admin_level+']';
+ String adminLevel = relation.get("admin_level");
+ if (adminLevel != null) {
+ name += '['+adminLevel+']';
}
for (NameFormatterHook hook: formatHooks) {
@@ -454,8 +454,8 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
}
}
- private String getRelationName(IRelation relation) {
- String nameTag = null;
+ private static String getRelationName(IRelation relation) {
+ String nameTag;
for (String n : getNamingtagsForRelations()) {
nameTag = getNameTagValue(relation, n);
if (nameTag != null)
diff --git a/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java b/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
index f3067e7..90afdb4 100644
--- a/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
+++ b/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
@@ -24,8 +24,8 @@ import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmApiException;
import org.openstreetmap.josm.io.OsmApiInitializationException;
import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.ExceptionUtil;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
/**
* This utility class provides static methods which explain various exceptions to the user.
diff --git a/src/org/openstreetmap/josm/gui/ExtendedDialog.java b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
index f31b18d..aceb32b 100644
--- a/src/org/openstreetmap/josm/gui/ExtendedDialog.java
+++ b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
@@ -145,7 +145,7 @@ public class ExtendedDialog extends JDialog {
}
public ExtendedDialog(Component parent, String title, String[] buttonTexts, boolean modal, boolean disposeOnClose) {
- super(JOptionPane.getFrameForComponent(parent), title, modal ? ModalityType.DOCUMENT_MODAL : ModalityType.MODELESS);
+ super(GuiHelper.getFrameForComponent(parent), title, modal ? ModalityType.DOCUMENT_MODAL : ModalityType.MODELESS);
this.parent = parent;
this.modal = modal;
bTexts = Utils.copyArray(buttonTexts);
@@ -319,11 +319,11 @@ public class ExtendedDialog extends JDialog {
JPanel buttonsPanel = new JPanel(new GridBagLayout());
for (int i = 0; i < bTexts.length; i++) {
- final int final_i = i;
+ final int finalI = i;
Action action = new AbstractAction(bTexts[i]) {
@Override
public void actionPerformed(ActionEvent evt) {
- buttonAction(final_i, evt);
+ buttonAction(finalI, evt);
}
};
@@ -440,7 +440,7 @@ public class ExtendedDialog extends JDialog {
Dimension screenSize = GuiHelper.getScreenSize();
Dimension x = new Dimension(screenSize.width*2/3, screenSize.height*2/3);
if (parent != null && parent.isVisible()) {
- x = JOptionPane.getFrameForComponent(parent).getSize();
+ x = GuiHelper.getFrameForComponent(parent).getSize();
}
return x;
}
@@ -544,16 +544,6 @@ public class ExtendedDialog extends JDialog {
}
/**
- * Call this if you "accidentally" called toggleEnable. This doesn't need
- * to be called for every dialog, as it's the default anyway.
- * @return {@code this}
- */
- public ExtendedDialog toggleDisable() {
- this.toggleable = false;
- return this;
- }
-
- /**
* Sets the button that will react to ENTER.
* @param defaultButtonIdx The button index (starts to 1)
* @return {@code this}
diff --git a/src/org/openstreetmap/josm/gui/FileDrop.java b/src/org/openstreetmap/josm/gui/FileDrop.java
index 26d7771..928d522 100644
--- a/src/org/openstreetmap/josm/gui/FileDrop.java
+++ b/src/org/openstreetmap/josm/gui/FileDrop.java
@@ -33,7 +33,6 @@ import javax.swing.border.Border;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.OpenFileAction;
-import org.openstreetmap.josm.gui.FileDrop.TransferableObject;
// CHECKSTYLE.OFF: HideUtilityClassConstructor
@@ -83,9 +82,6 @@ public class FileDrop {
private Border normalBorder;
private DropTargetListener dropListener;
- /** Discover if the running JVM is modern enough to have drag and drop. */
- private static Boolean supportsDnD;
-
// Default border color
private static Color defaultBorderColor = new Color(0f, 0f, 1f, 0.25f);
@@ -128,29 +124,11 @@ public class FileDrop {
final boolean recursive,
final Listener listener) {
- if (supportsDnD()) {
- // Make a drop listener
- dropListener = new DropListener(listener, dragBorder, c);
+ // Make a drop listener
+ dropListener = new DropListener(listener, dragBorder, c);
- // Make the component (and possibly children) drop targets
- makeDropTarget(c, recursive);
- } else {
- Main.info("FileDrop: Drag and drop is not supported with this JVM");
- }
- }
-
- private static synchronized boolean supportsDnD() {
- if (supportsDnD == null) {
- boolean support = false;
- try {
- Class.forName("java.awt.dnd.DnDConstants");
- support = true;
- } catch (Exception e) {
- support = false;
- }
- supportsDnD = support;
- }
- return supportsDnD.booleanValue();
+ // Make the component (and possibly children) drop targets
+ makeDropTarget(c, recursive);
}
// BEGIN 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
@@ -285,17 +263,13 @@ public class FileDrop {
* @return {@code true} if at least one item has been removed, {@code false} otherwise
*/
public static boolean remove(Component c, boolean recursive) {
- // Make sure we support dnd.
- if (supportsDnD()) {
- Main.trace("FileDrop: Removing drag-and-drop hooks.");
- c.setDropTarget(null);
- if (recursive && (c instanceof Container)) {
- for (Component comp : ((Container) c).getComponents()) {
- remove(comp, recursive);
- }
- return true;
- } else
- return false;
+ Main.trace("FileDrop: Removing drag-and-drop hooks.");
+ c.setDropTarget(null);
+ if (recursive && (c instanceof Container)) {
+ for (Component comp : ((Container) c).getComponents()) {
+ remove(comp, recursive);
+ }
+ return true;
} else
return false;
}
diff --git a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
index 04769be..e104207 100644
--- a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
+++ b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
@@ -26,6 +26,7 @@ import javax.swing.KeyStroke;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.help.HelpBrowser;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -228,12 +229,8 @@ public final class HelpAwareOptionPane {
}
}
- if (msg instanceof String) {
- msg = new JMultilineLabel((String) msg, true);
- }
-
final JOptionPane pane = new JOptionPane(
- msg,
+ msg instanceof String ? new JMultilineLabel((String) msg, true) : msg,
messageType,
JOptionPane.DEFAULT_OPTION,
icon,
@@ -241,6 +238,18 @@ public final class HelpAwareOptionPane {
defaultButton
);
+ // Log message. Useful for bug reports and unit tests
+ switch (messageType) {
+ case JOptionPane.ERROR_MESSAGE:
+ Main.error(title + " - " + msg);
+ break;
+ case JOptionPane.WARNING_MESSAGE:
+ Main.warn(title + " - " + msg);
+ break;
+ default:
+ Main.info(title + " - " + msg);
+ }
+
if (!GraphicsEnvironment.isHeadless()) {
doShowOptionDialog(parentComponent, title, options, defaultOption, helpTopic, buttons, pane);
}
@@ -251,7 +260,7 @@ public final class HelpAwareOptionPane {
final ButtonSpec defaultOption, final String helpTopic, final List<JButton> buttons,
final JOptionPane pane) {
final JDialog dialog = new JDialog(
- JOptionPane.getFrameForComponent(parentComponent),
+ GuiHelper.getFrameForComponent(parentComponent),
title,
ModalityType.DOCUMENT_MODAL
);
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index d7c26c7..fdd4ade 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -3,8 +3,6 @@ package org.openstreetmap.josm.gui;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
import java.awt.Dimension;
import java.awt.Image;
@@ -53,10 +51,12 @@ import org.openstreetmap.josm.actions.RestartAction;
import org.openstreetmap.josm.data.AutosaveTask;
import org.openstreetmap.josm.data.CustomConfigurator;
import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
import org.openstreetmap.josm.gui.download.DownloadDialog;
import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.CertificateAmendment;
import org.openstreetmap.josm.io.DefaultProxySelector;
import org.openstreetmap.josm.io.MessageNotifier;
import org.openstreetmap.josm.io.OnlineResource;
@@ -65,7 +65,6 @@ import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.FontsManager;
import org.openstreetmap.josm.tools.HttpClient;
import org.openstreetmap.josm.tools.I18n;
@@ -73,6 +72,10 @@ import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
import org.openstreetmap.josm.tools.PlatformHookWindows;
import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
+
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
/**
* Main window class application.
@@ -400,6 +403,12 @@ public class MainApplication extends Main {
}
}
+ try {
+ CertificateAmendment.addMissingCertificates();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ Main.warn(getErrorMessage(Utils.getRootCause(ex)));
+ }
Authenticator.setDefault(DefaultAuthenticator.getInstance());
DefaultProxySelector proxySelector = new DefaultProxySelector(ProxySelector.getDefault());
ProxySelector.setDefault(proxySelector);
@@ -437,19 +446,8 @@ public class MainApplication extends Main {
Collection<PluginInformation> pluginsToLoad = null;
-
if (!skipLoadingPlugins) {
- pluginsToLoad = PluginHandler.buildListOfPluginsToLoad(splash, monitor.createSubTaskMonitor(1, false));
- if (!pluginsToLoad.isEmpty() && PluginHandler.checkAndConfirmPluginUpdate(splash)) {
- monitor.subTask(tr("Updating plugins"));
- pluginsToLoad = PluginHandler.updatePlugins(splash, null, monitor.createSubTaskMonitor(1, false), false);
- }
-
- monitor.indeterminateSubTask(tr("Installing updated plugins"));
- PluginHandler.installDownloadedPlugins(true);
-
- monitor.indeterminateSubTask(tr("Loading early plugins"));
- PluginHandler.loadEarlyPlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
+ pluginsToLoad = updateAndLoadEarlyPlugins(splash, monitor);
}
monitor.indeterminateSubTask(tr("Setting defaults"));
@@ -459,9 +457,7 @@ public class MainApplication extends Main {
final Main main = new MainApplication(mainFrame);
if (!skipLoadingPlugins) {
- monitor.indeterminateSubTask(tr("Loading plugins"));
- PluginHandler.loadLatePlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
- toolbar.refreshToolbarControl();
+ loadLatePlugins(splash, monitor, pluginsToLoad);
}
// Wait for splash disappearance (fix #9714)
@@ -518,6 +514,28 @@ public class MainApplication extends Main {
}
}
+ static Collection<PluginInformation> updateAndLoadEarlyPlugins(SplashScreen splash, SplashProgressMonitor monitor) {
+ Collection<PluginInformation> pluginsToLoad;
+ pluginsToLoad = PluginHandler.buildListOfPluginsToLoad(splash, monitor.createSubTaskMonitor(1, false));
+ if (!pluginsToLoad.isEmpty() && PluginHandler.checkAndConfirmPluginUpdate(splash)) {
+ monitor.subTask(tr("Updating plugins"));
+ pluginsToLoad = PluginHandler.updatePlugins(splash, null, monitor.createSubTaskMonitor(1, false), false);
+ }
+
+ monitor.indeterminateSubTask(tr("Installing updated plugins"));
+ PluginHandler.installDownloadedPlugins(true);
+
+ monitor.indeterminateSubTask(tr("Loading early plugins"));
+ PluginHandler.loadEarlyPlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
+ return pluginsToLoad;
+ }
+
+ static void loadLatePlugins(SplashScreen splash, SplashProgressMonitor monitor, Collection<PluginInformation> pluginsToLoad) {
+ monitor.indeterminateSubTask(tr("Loading plugins"));
+ PluginHandler.loadLatePlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
+ toolbar.refreshToolbarControl();
+ }
+
private static void processOffline(Map<Option, Collection<String>> args) {
if (args.containsKey(Option.OFFLINE)) {
for (String s : args.get(Option.OFFLINE).iterator().next().split(",")) {
@@ -643,7 +661,7 @@ public class MainApplication extends Main {
}
}
- private boolean handleNetworkOrProxyErrors(boolean hasErrors, String title, String message) {
+ private static boolean handleNetworkOrProxyErrors(boolean hasErrors, String title, String message) {
if (hasErrors) {
ExtendedDialog ed = new ExtendedDialog(
Main.parent, title,
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index ddc0101..f5e195b 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -130,18 +130,33 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
}
// Toggle dialogs
+
+ /** Conflict dialog */
public ConflictDialog conflictDialog;
+ /** Filter dialog */
public FilterDialog filterDialog;
+ /** Relation list dialog */
public RelationListDialog relationListDialog;
+ /** Validator dialog */
public ValidatorDialog validatorDialog;
+ /** Selection list dialog */
public SelectionListDialog selectionListDialog;
+ /** Properties dialog */
public PropertiesDialog propertiesDialog;
+ /** Map paint dialog */
+ public MapPaintDialog mapPaintDialog;
+ /** Notes dialog */
public NotesDialog noteDialog;
// Map modes
+
+ /** Select mode */
public final SelectAction mapModeSelect;
+ /** Draw mode */
public final DrawAction mapModeDraw;
+ /** Zoom mode */
public final ZoomAction mapModeZoom;
+ /** Select Lasso mode */
public LassoModeAction mapModeSelectLasso;
private final transient Map<Layer, MapMode> lastMapMode = new HashMap<>();
@@ -245,7 +260,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
addToggleDialog(validatorDialog = new ValidatorDialog());
addToggleDialog(filterDialog = new FilterDialog());
addToggleDialog(new ChangesetDialog(), true);
- addToggleDialog(new MapPaintDialog());
+ addToggleDialog(mapPaintDialog = new MapPaintDialog());
addToggleDialog(noteDialog = new NotesDialog());
toolBarToggle.setFloatable(false);
diff --git a/src/org/openstreetmap/josm/gui/MapMover.java b/src/org/openstreetmap/josm/gui/MapMover.java
index 21dadf8..6f88df6 100644
--- a/src/org/openstreetmap/josm/gui/MapMover.java
+++ b/src/org/openstreetmap/josm/gui/MapMover.java
@@ -9,9 +9,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
import javax.swing.AbstractAction;
import javax.swing.ActionMap;
@@ -21,13 +19,12 @@ import javax.swing.JPanel;
import javax.swing.KeyStroke;
import org.openstreetmap.gui.jmapviewer.JMapViewer;
-
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.mapmode.SelectAction;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.Shortcut;
@@ -37,7 +34,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* @author imi
*/
-public class MapMover extends MouseAdapter implements MouseMotionListener, MouseWheelListener, Destroyable {
+public class MapMover extends MouseAdapter implements Destroyable {
public static final BooleanProperty PROP_ZOOM_REVERSE_WHEEL = new BooleanProperty("zoom.reverse-wheel", false);
@@ -57,7 +54,7 @@ public class MapMover extends MouseAdapter implements MouseMotionListener, Mouse
}
}
- private void updateJMapViewer() {
+ private static void updateJMapViewer() {
JMapViewer.zoomReverseWheel = MapMover.PROP_ZOOM_REVERSE_WHEEL.get();
}
}
diff --git a/src/org/openstreetmap/josm/gui/MapScaler.java b/src/org/openstreetmap/josm/gui/MapScaler.java
index ddb6f84..a52e163 100644
--- a/src/org/openstreetmap/josm/gui/MapScaler.java
+++ b/src/org/openstreetmap/josm/gui/MapScaler.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.Color;
+import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.geom.Rectangle2D;
@@ -24,7 +25,8 @@ public class MapScaler extends JComponent implements Helpful, Accessible {
private final NavigatableComponent mv;
- private static final int PADDING_RIGHT = 100;
+ private static final int PADDING_LEFT = 5;
+ private static final int PADDING_RIGHT = 50;
/**
* Constructs a new {@code MapScaler}.
@@ -32,23 +34,25 @@ public class MapScaler extends JComponent implements Helpful, Accessible {
*/
public MapScaler(NavigatableComponent mv) {
this.mv = mv;
- setSize(100+PADDING_RIGHT, 30);
+ setPreferredLineLength(100);
setOpaque(false);
}
+ /**
+ * Sets the preferred length the distance line should have.
+ * @param pixel The length.
+ */
+ public void setPreferredLineLength(int pixel) {
+ setPreferredSize(new Dimension(pixel + PADDING_LEFT + PADDING_RIGHT, 30));
+ }
+
@Override
public void paint(Graphics g) {
- String text = mv.getDist100PixelText();
- Rectangle2D bound = g.getFontMetrics().getStringBounds(text, g);
g.setColor(getColor());
- g.drawLine(0, 5, 99, 5);
- g.drawLine(0, 0, 0, 10);
- g.drawLine(99, 0, 99, 10);
- g.drawLine(49, 3, 49, 7);
- g.drawLine(24, 3, 24, 7);
- g.drawLine(74, 3, 74, 7);
- g.drawString(text, (int) (100-bound.getWidth()/2), 23);
- g.drawString("0", 0, 23);
+
+ double dist100Pixel = mv.getDist100Pixel(true);
+ TickMarks tickMarks = new TickMarks(dist100Pixel, getWidth() - PADDING_LEFT - PADDING_RIGHT);
+ tickMarks.paintTicks(g);
}
/**
@@ -94,4 +98,69 @@ public class MapScaler extends JComponent implements Helpful, Accessible {
return null;
}
}
+
+ /**
+ * This class finds the best possible tick mark positions.
+ * <p>
+ * It will attempt to use steps of 1m, 2.5m, 10m, 25m, ...
+ */
+ private static final class TickMarks {
+
+ private final double dist100Pixel;
+ private final double lineDistance;
+ /**
+ * Distance in meters between two ticks.
+ */
+ private final double spacingMeter;
+ private final int steps;
+ private final int majorStepEvery;
+
+ /**
+ * Creates a new tick mark helper.
+ * @param dist100Pixel The distance of 100 pixel on the map.
+ * @param width The width of the mark.
+ */
+ TickMarks(double dist100Pixel, int width) {
+ this.dist100Pixel = dist100Pixel;
+ lineDistance = dist100Pixel * width / 100;
+
+ double log10 = Math.log(lineDistance) / Math.log(10);
+ double spacingLog10 = Math.pow(10, Math.floor(log10));
+ if (log10 - Math.floor(log10) < .75) {
+ spacingMeter = spacingLog10 / 4;
+ majorStepEvery = 4;
+ } else {
+ spacingMeter = spacingLog10;
+ majorStepEvery = 5;
+ }
+ steps = (int) Math.floor(lineDistance / spacingMeter);
+ }
+
+ public void paintTicks(Graphics g) {
+ double spacingPixel = spacingMeter / (dist100Pixel / 100);
+ double textBlockedUntil = -1;
+ for (int step = 0; step <= steps; step++) {
+ int x = (int) (PADDING_LEFT + spacingPixel * step);
+ boolean isMajor = step % majorStepEvery == 0;
+ int paddingY = isMajor ? 0 : 3;
+ g.drawLine(x, paddingY, x, 10 - paddingY);
+
+ if (isMajor || (step == steps && textBlockedUntil < 0)) {
+ String text;
+ if (step == 0) {
+ text = "0";
+ } else {
+ text = NavigatableComponent.getDistText(spacingMeter * step);
+ }
+ Rectangle2D bound = g.getFontMetrics().getStringBounds(text, g);
+ int left = (int) (x - bound.getWidth() / 2);
+ if (textBlockedUntil < left) {
+ g.drawString(text, left, 23);
+ textBlockedUntil = left + bound.getWidth() + 2;
+ }
+ }
+ }
+ g.drawLine(PADDING_LEFT + 0, 5, (int) (PADDING_LEFT + spacingPixel * steps), 5);
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/MapSlider.java b/src/org/openstreetmap/josm/gui/MapSlider.java
index f6f2fc1..7144a08 100644
--- a/src/org/openstreetmap/josm/gui/MapSlider.java
+++ b/src/org/openstreetmap/josm/gui/MapSlider.java
@@ -3,10 +3,12 @@ package org.openstreetmap.josm.gui;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import java.awt.Dimension;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.JSlider;
+import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -20,13 +22,15 @@ class MapSlider extends JSlider implements PropertyChangeListener, ChangeListene
private int lastValue;
MapSlider(MapView mv) {
- super(0, 150);
+ super(0, 160);
setOpaque(false);
this.mv = mv;
mv.addPropertyChangeListener("scale", this);
addChangeListener(this);
// Call this manually once so it gets setup correctly
propertyChange(null);
+ int w = UIManager.getDefaults().getInt("Slider.thumbWidth") + 150;
+ setPreferredSize(new Dimension(w, 27));
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index 83e9b36..11ade19 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -54,20 +54,24 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
+import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.gui.layer.ImageryLayer;
import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerPositionStrategy;
import org.openstreetmap.josm.gui.layer.MapViewPaintable;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationEvent;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationListener;
import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.AudioPlayer;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
/**
* This is a component used in the {@link MapFrame} for browsing the map. It use is to
@@ -123,6 +127,50 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer);
}
+ /**
+ * An invalidation listener that simply calls repaint() for now.
+ * @author Michael Zangl
+ */
+ private class LayerInvalidatedListener implements PaintableInvalidationListener {
+ private boolean ignoreRepaint;
+ @Override
+ public void paintablInvalidated(PaintableInvalidationEvent event) {
+ ignoreRepaint = true;
+ repaint();
+ }
+
+ /**
+ * Temporary until all {@link MapViewPaintable}s support this.
+ * @param p The paintable.
+ */
+ public void addTo(MapViewPaintable p) {
+ if (p instanceof AbstractMapViewPaintable) {
+ ((AbstractMapViewPaintable) p).addInvalidationListener(this);
+ }
+ }
+
+ /**
+ * Temporary until all {@link MapViewPaintable}s support this.
+ * @param p The paintable.
+ */
+ public void removeFrom(MapViewPaintable p) {
+ if (p instanceof AbstractMapViewPaintable) {
+ ((AbstractMapViewPaintable) p).removeInvalidationListener(this);
+ }
+ }
+
+ /**
+ * Attempts to trace repaints that did not originate from this listener. Good to find missed {@link MapView#repaint()}s in code.
+ */
+ protected synchronized void traceRandomRepaint() {
+ if (!ignoreRepaint) {
+ System.err.println("Repaint:");
+ Thread.dumpStack();
+ }
+ ignoreRepaint = false;
+ }
+ }
+
public boolean viewportFollowing;
/**
@@ -267,6 +315,11 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
private transient MapMover mapMover;
/**
+ * The listener that listens to invalidations of all layers.
+ */
+ private final LayerInvalidatedListener invalidatedListener = new LayerInvalidatedListener();
+
+ /**
* Constructs a new {@code MapView}.
* @param contentPane The content pane used to register shortcuts in its
* {@link InputMap} and {@link ActionMap}
@@ -278,13 +331,10 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
Main.pref.addPreferenceChangeListener(this);
addComponentListener(new ComponentAdapter() {
- @Override public void componentResized(ComponentEvent e) {
+ @Override
+ public void componentResized(ComponentEvent e) {
removeComponentListener(this);
- for (JComponent c : getMapNavigationComponents(MapView.this)) {
- MapView.this.add(c);
- }
-
mapMover = new MapMover(MapView.this, contentPane);
}
});
@@ -315,6 +365,10 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
if (Shortcut.findShortcut(KeyEvent.VK_TAB, 0) != null) {
setFocusTraversalKeysEnabled(false);
}
+
+ for (JComponent c : getMapNavigationComponents(MapView.this)) {
+ add(c);
+ }
}
/**
@@ -324,11 +378,15 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
*/
public static List<? extends JComponent> getMapNavigationComponents(MapView forMapView) {
MapSlider zoomSlider = new MapSlider(forMapView);
- zoomSlider.setBounds(3, 0, 114, 30);
+ Dimension size = zoomSlider.getPreferredSize();
+ zoomSlider.setSize(size);
+ zoomSlider.setLocation(3, 0);
zoomSlider.setFocusTraversalKeysEnabled(Shortcut.findShortcut(KeyEvent.VK_TAB, 0) == null);
MapScaler scaler = new MapScaler(forMapView);
- scaler.setLocation(10, 30);
+ scaler.setPreferredLineLength(size.width - 10);
+ scaler.setSize(scaler.getPreferredSize());
+ scaler.setLocation(3, size.height);
return Arrays.asList(zoomSlider, scaler);
}
@@ -346,33 +404,6 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
}
/**
- * Adds a GPX layer. A GPX layer is added below the lowest data layer.
- * <p>
- * Does not call {@link #fireLayerAdded(Layer)}.
- *
- * @param layer the GPX layer
- */
- protected void addGpxLayer(GpxLayer layer) {
- synchronized (layers) {
- if (layers.isEmpty()) {
- layers.add(layer);
- return;
- }
- for (int i = layers.size()-1; i >= 0; i--) {
- if (layers.get(i) instanceof OsmDataLayer) {
- if (i == layers.size()-1) {
- layers.add(layer);
- } else {
- layers.add(i+1, layer);
- }
- return;
- }
- }
- layers.add(0, layer);
- }
- }
-
- /**
* Add a layer to the current MapView. The layer will be added at topmost
* position.
* @param layer The layer to add
@@ -388,21 +419,10 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
playHeadMarker = PlayHeadMarker.create();
}
- if (layer instanceof GpxLayer) {
- addGpxLayer((GpxLayer) layer);
- } else if (layers.isEmpty()) {
- layers.add(layer);
- } else if (layer.isBackgroundLayer()) {
- int i = 0;
- for (; i < layers.size(); i++) {
- if (layers.get(i).isBackgroundLayer()) {
- break;
- }
- }
- layers.add(i, layer);
- } else {
- layers.add(0, layer);
- }
+ LayerPositionStrategy positionStrategy = layer.getDefaultLayerPosition();
+ int position = positionStrategy.getPosition(this);
+ checkPosition(position);
+ insertLayerAt(layer, position);
if (isOsmDataLayer || oldActiveLayer == null) {
// autoselect the new layer
@@ -418,6 +438,7 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
}
layer.addPropertyChangeListener(this);
+ invalidatedListener.addTo(layer);
Main.addProjectionChangeListener(layer);
AudioPlayer.reset();
}
@@ -429,6 +450,30 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
}
}
+ /**
+ * Check if the (new) position is valid
+ * @param position The position index
+ * @throws IndexOutOfBoundsException if it is not.
+ */
+ private void checkPosition(int position) {
+ if (position < 0 || position > layers.size()) {
+ throw new IndexOutOfBoundsException("Position " + position + " out of range.");
+ }
+ }
+
+ /**
+ * Insert a layer at a given position.
+ * @param layer The layer to add.
+ * @param position The position on which we should add it.
+ */
+ private void insertLayerAt(Layer layer, int position) {
+ if (position == layers.size()) {
+ layers.add(layer);
+ } else {
+ layers.add(position, layer);
+ }
+ }
+
@Override
protected DataSet getCurrentDataSet() {
synchronized (layers) {
@@ -518,6 +563,7 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
layers.remove(layer);
Main.removeProjectionChangeListener(layer);
layer.removePropertyChangeListener(this);
+ invalidatedListener.removeFrom(layer);
layer.destroy();
AudioPlayer.reset();
}
@@ -1047,7 +1093,11 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
*/
public boolean addTemporaryLayer(MapViewPaintable mvp) {
synchronized (temporaryLayers) {
- return temporaryLayers.add(mvp);
+ boolean added = temporaryLayers.add(mvp);
+ if (added) {
+ invalidatedListener.addTo(mvp);
+ }
+ return added;
}
}
@@ -1058,7 +1108,11 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
*/
public boolean removeTemporaryLayer(MapViewPaintable mvp) {
synchronized (temporaryLayers) {
- return temporaryLayers.remove(mvp);
+ boolean removed = temporaryLayers.remove(mvp);
+ if (removed) {
+ invalidatedListener.removeFrom(mvp);
+ }
+ return removed;
}
}
@@ -1218,4 +1272,12 @@ implements PropertyChangeListener, PreferenceChangedListener, OsmDataLayer.Layer
}
super.repaint(tm, x, y, width, height);
}
+
+ @Override
+ public void repaint() {
+ if (Main.isTraceEnabled()) {
+ invalidatedListener.traceRandomRepaint();
+ }
+ super.repaint();
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/NavigatableComponent.java b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
index af82068..1322c1f 100644
--- a/src/org/openstreetmap/josm/gui/NavigatableComponent.java
+++ b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
@@ -552,9 +552,9 @@ public class NavigatableComponent extends JComponent implements Helpful {
LatLon ll1 = getLatLon(width / 2 - 50, height / 2);
LatLon ll2 = getLatLon(width / 2 + 50, height / 2);
if (ll1.isValid() && ll2.isValid() && b.contains(ll1) && b.contains(ll2)) {
- double d_m = ll1.greatCircleDistance(ll2);
- double d_en = 100 * scale;
- double scaleMin = 0.01 * d_en / d_m / 100;
+ double dm = ll1.greatCircleDistance(ll2);
+ double den = 100 * scale;
+ double scaleMin = 0.01 * den / dm / 100;
if (!Double.isInfinite(scaleMin) && newScale < scaleMin) {
newScale = scaleMin;
}
@@ -1025,11 +1025,11 @@ public class NavigatableComponent extends JComponent implements Helpful {
continue;
}
- Point2D A = getPoint2D(lastN);
- Point2D B = getPoint2D(n);
- double c = A.distanceSq(B);
- double a = p.distanceSq(B);
- double b = p.distanceSq(A);
+ Point2D pA = getPoint2D(lastN);
+ Point2D pB = getPoint2D(n);
+ double c = pA.distanceSq(pB);
+ double a = p.distanceSq(pB);
+ double b = p.distanceSq(pA);
/* perpendicular distance squared
* loose some precision to account for possible deviations in the calculation above
@@ -1141,7 +1141,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
*
* @param p the point for which to search the nearest segment.
* @param predicate the returned object has to fulfill certain properties.
- * @param use_selected whether selected way segments should be preferred.
+ * @param useSelected whether selected way segments should be preferred.
* @param preferredRefs - prefer segments related to these primitives, may be null
*
* @return The nearest way segment to point p,
@@ -1152,7 +1152,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
* @since 6065
*/
public final WaySegment getNearestWaySegment(Point p, Predicate<OsmPrimitive> predicate,
- boolean use_selected, Collection<OsmPrimitive> preferredRefs) {
+ boolean useSelected, Collection<OsmPrimitive> preferredRefs) {
WaySegment wayseg = null, ntsel = null, ntref = null;
if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
@@ -1184,7 +1184,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
}
}
- if (ntsel != null && use_selected)
+ if (ntsel != null && useSelected)
return ntsel;
if (ntref != null)
return ntref;
@@ -1351,33 +1351,33 @@ public class NavigatableComponent extends JComponent implements Helpful {
*
* @param p The point on screen.
* @param predicate the returned object has to fulfill certain properties.
- * @param use_selected whether to prefer primitives that are currently selected or referred by selected primitives
+ * @param useSelected whether to prefer primitives that are currently selected or referred by selected primitives
*
* @return A primitive within snap-distance to point p,
* that is chosen by the algorithm described.
* @see #getNearestNode(Point, Predicate)
* @see #getNearestWay(Point, Predicate)
*/
- public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean use_selected) {
+ public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean useSelected) {
Collection<OsmPrimitive> sel;
DataSet ds = getCurrentDataSet();
- if (use_selected && ds != null) {
+ if (useSelected && ds != null) {
sel = ds.getSelected();
} else {
sel = null;
}
- OsmPrimitive osm = getNearestNode(p, predicate, use_selected, sel);
+ OsmPrimitive osm = getNearestNode(p, predicate, useSelected, sel);
- if (isPrecedenceNode((Node) osm, p, use_selected)) return osm;
+ if (isPrecedenceNode((Node) osm, p, useSelected)) return osm;
WaySegment ws;
- if (use_selected) {
- ws = getNearestWaySegment(p, predicate, use_selected, sel);
+ if (useSelected) {
+ ws = getNearestWaySegment(p, predicate, useSelected, sel);
} else {
- ws = getNearestWaySegment(p, predicate, use_selected);
+ ws = getNearestWaySegment(p, predicate, useSelected);
}
if (ws == null) return osm;
- if ((ws.way.isSelected() && use_selected) || osm == null) {
+ if ((ws.way.isSelected() && useSelected) || osm == null) {
// either (no _selected_ nearest node found, if desired) or no nearest node was found
osm = ws.way;
} else {
diff --git a/src/org/openstreetmap/josm/gui/NotificationManager.java b/src/org/openstreetmap/josm/gui/NotificationManager.java
index 3780d33..06d5d65 100644
--- a/src/org/openstreetmap/josm/gui/NotificationManager.java
+++ b/src/org/openstreetmap/josm/gui/NotificationManager.java
@@ -107,18 +107,18 @@ class NotificationManager {
currentNotificationPanel = new NotificationPanel(currentNotification);
currentNotificationPanel.validate();
- int MARGIN = 5;
+ int margin = 5;
int x, y;
JFrame parentWindow = (JFrame) Main.parent;
Dimension size = currentNotificationPanel.getPreferredSize();
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;
+ 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;
+ x = margin;
+ y = parentWindow.getHeight() - Main.toolbar.control.getSize().height - size.height - margin;
}
parentWindow.getLayeredPane().add(currentNotificationPanel, JLayeredPane.POPUP_LAYER, 0);
diff --git a/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java b/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
index 6441375..77c2188 100644
--- a/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
+++ b/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
@@ -15,7 +15,6 @@ import javax.swing.BoundedRangeModel;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
@@ -23,6 +22,7 @@ import javax.swing.UIManager;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor.ProgressMonitorDialog;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -89,7 +89,7 @@ public class PleaseWaitDialog extends JDialog implements ProgressMonitorDialog {
* @param parent the {@code Component} from which the dialog is displayed. Can be {@code null}.
*/
public PleaseWaitDialog(Component parent) {
- super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
initDialog();
}
diff --git a/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java b/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
index 43339e1..5a2f9ce 100644
--- a/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
+++ b/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
@@ -12,8 +12,8 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
import org.openstreetmap.josm.gui.progress.ProgressTaskId;
import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
import org.xml.sax.SAXException;
/**
diff --git a/src/org/openstreetmap/josm/gui/SelectionManager.java b/src/org/openstreetmap/josm/gui/SelectionManager.java
index c0d87e4..eacb9ba 100644
--- a/src/org/openstreetmap/josm/gui/SelectionManager.java
+++ b/src/org/openstreetmap/josm/gui/SelectionManager.java
@@ -22,7 +22,7 @@ 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.visitor.paint.PaintColors;
-import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -88,7 +88,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
*
* @author Michael Zangl
*/
- private class SelectionHintLayer implements MapViewPaintable {
+ private class SelectionHintLayer extends AbstractMapViewPaintable {
@Override
public void paint(Graphics2D g, MapView mv, Bounds bbox) {
if (mousePos == null || mousePosStart == null || mousePos == mousePosStart)
@@ -367,10 +367,8 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
}
}
- private static void selectionAreaChanged() {
- // Trigger a redraw of the map view.
- // A nicer way would be to provide change events for the temporary layer.
- Main.map.mapView.repaint();
+ private void selectionAreaChanged() {
+ selectionHintLayer.invalidate();
}
/**
@@ -382,7 +380,6 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
* @return The collection of selected objects.
*/
public Collection<OsmPrimitive> getSelectedObjects(boolean alt) {
-
Collection<OsmPrimitive> selection = new LinkedList<>();
// whether user only clicked, not dragged.
diff --git a/src/org/openstreetmap/josm/gui/SplashScreen.java b/src/org/openstreetmap/josm/gui/SplashScreen.java
index 19ccd3d..d992dd9 100644
--- a/src/org/openstreetmap/josm/gui/SplashScreen.java
+++ b/src/org/openstreetmap/josm/gui/SplashScreen.java
@@ -196,6 +196,11 @@ public class SplashScreen extends JFrame implements ChangeListener {
private final List<Task> tasks = new CopyOnWriteArrayList<>();
private SplashProgressMonitor latestSubtask;
+ /**
+ * Constructs a new {@code SplashProgressMonitor}.
+ * @param name name
+ * @param listener change listener
+ */
public SplashProgressMonitor(String name, ChangeListener listener) {
this.name = name;
this.listener = listener;
@@ -219,6 +224,9 @@ public class SplashScreen extends JFrame implements ChangeListener {
@Override
public void beginTask(String title) {
if (title != null) {
+ if (Main.isDebugEnabled()) {
+ Main.debug(title);
+ }
final MeasurableTask task = new MeasurableTask(title);
tasks.add(task);
listener.stateChanged(null);
@@ -247,6 +255,9 @@ public class SplashScreen extends JFrame implements ChangeListener {
@Override
public void subTask(String title) {
+ if (Main.isDebugEnabled()) {
+ Main.debug(title);
+ }
latestSubtask = new SplashProgressMonitor(title, listener);
tasks.add(latestSubtask);
listener.stateChanged(null);
@@ -274,7 +285,9 @@ public class SplashScreen extends JFrame implements ChangeListener {
final Task task = Utils.find(tasks, Predicates.<Task>equalTo(new MeasurableTask(title)));
if (task instanceof MeasurableTask) {
((MeasurableTask) task).finish();
- Main.debug(tr("{0} completed in {1}", title, ((MeasurableTask) task).duration));
+ if (Main.isDebugEnabled()) {
+ Main.debug(tr("{0} completed in {1}", title, ((MeasurableTask) task).duration));
+ }
listener.stateChanged(null);
}
}
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
index 0a03424..a625fd5 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
@@ -86,10 +86,6 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
}
return sources;
}
-
- public static void addExistingSlippyMapUrl(String url) {
- existingSlippyMapUrls.add(url);
- }
}
/**
@@ -243,11 +239,11 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
if (aStart == null || aEnd == null || aStart.x == aEnd.x || aStart.y == aEnd.y)
return;
- Point p_max = new Point(Math.max(aEnd.x, aStart.x), Math.max(aEnd.y, aStart.y));
- Point p_min = new Point(Math.min(aEnd.x, aStart.x), Math.min(aEnd.y, aStart.y));
+ Point pMax = new Point(Math.max(aEnd.x, aStart.x), Math.max(aEnd.y, aStart.y));
+ Point pMin = new Point(Math.min(aEnd.x, aStart.x), Math.min(aEnd.y, aStart.y));
- iSelectionRectStart = getPosition(p_min);
- iSelectionRectEnd = getPosition(p_max);
+ iSelectionRectStart = getPosition(pMin);
+ iSelectionRectEnd = getPosition(pMax);
Bounds b = new Bounds(
new LatLon(
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
index d3dfcf7..23330eb 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
@@ -7,8 +7,6 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
import java.util.Timer;
import java.util.TimerTask;
@@ -29,7 +27,7 @@ import org.openstreetmap.josm.Main;
*
* @author Tim Haussmann
*/
-public class SlippyMapControler extends MouseAdapter implements MouseMotionListener, MouseListener {
+public class SlippyMapControler extends MouseAdapter {
/** A Timer for smoothly moving the map area */
private static final Timer timer = new Timer(true);
diff --git a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
index beeab03..d369cca 100644
--- a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
@@ -153,12 +153,9 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser {
if (bbox == null) return;
// calc the screen coordinates for the new selection rectangle
- MapMarkerDot xmin_ymin = new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon());
- MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
-
List<MapMarker> marker = new ArrayList<>(2);
- marker.add(xmin_ymin);
- marker.add(xmax_ymax);
+ marker.add(new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon()));
+ marker.add(new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon()));
mapViewer.setBoundingBox(bbox);
mapViewer.setMapMarkerList(marker);
mapViewer.setDisplayToFitMapMarkers();
@@ -703,18 +700,18 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser {
if (min == null || max == null) return;
int zoomDiff = MAX_ZOOM - zoom;
Point tlc = getTopLeftCoordinates();
- int x_min = (min.x >> zoomDiff) - tlc.x;
- int y_min = (min.y >> zoomDiff) - tlc.y;
- int x_max = (max.x >> zoomDiff) - tlc.x;
- int y_max = (max.y >> zoomDiff) - tlc.y;
+ int xMin = (min.x >> zoomDiff) - tlc.x;
+ int yMin = (min.y >> zoomDiff) - tlc.y;
+ int xMax = (max.x >> zoomDiff) - tlc.x;
+ int yMax = (max.y >> zoomDiff) - tlc.y;
- int w = x_max - x_min;
- int h = y_max - y_min;
+ int w = xMax - xMin;
+ int h = yMax - yMin;
g.setColor(new Color(0.9f, 0.7f, 0.7f, 0.6f));
- g.fillRect(x_min, y_min, w, h);
+ g.fillRect(xMin, yMin, w, h);
g.setColor(Color.BLACK);
- g.drawRect(x_min, y_min, w, h);
+ g.drawRect(xMin, yMin, w, h);
} catch (Exception e) {
Main.error(e);
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java b/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
index 56b0597..2d5e7e3 100644
--- a/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
+++ b/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
@@ -8,43 +8,78 @@ import java.awt.Color;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences.ColorKey;
+/**
+ * Conflict color constants.
+ * @since 4162
+ */
public enum ConflictColors implements ColorKey {
+ /** Conflict background: no conflict */
BGCOLOR_NO_CONFLICT(marktr("Conflict background: no conflict"), new Color(234, 234, 234)),
+ /** Conflict background: decided */
BGCOLOR_DECIDED(marktr("Conflict background: decided"), new Color(217, 255, 217)),
+ /** Conflict background: undecided */
BGCOLOR_UNDECIDED(marktr("Conflict background: undecided"), new Color(255, 197, 197)),
+ /** Conflict background: drop */
BGCOLOR_DROP(marktr("Conflict background: drop"), Color.white),
+ /** Conflict background: keep */
BGCOLOR_KEEP(marktr("Conflict background: keep"), new Color(217, 255, 217)),
+ /** Conflict background: combined */
BGCOLOR_COMBINED(marktr("Conflict background: combined"), new Color(217, 255, 217)),
+ /** Conflict background: selected */
BGCOLOR_SELECTED(marktr("Conflict background: selected"), new Color(143, 170, 255)),
+ /** Conflict foreground: undecided */
FGCOLOR_UNDECIDED(marktr("Conflict foreground: undecided"), Color.black),
+ /** Conflict foreground: drop */
FGCOLOR_DROP(marktr("Conflict foreground: drop"), Color.lightGray),
+ /** Conflict foreground: keep */
FGCOLOR_KEEP(marktr("Conflict foreground: keep"), Color.black),
+ /** Conflict background: empty row */
BGCOLOR_EMPTY_ROW(marktr("Conflict background: empty row"), new Color(234, 234, 234)),
+ /** Conflict background: frozen */
BGCOLOR_FROZEN(marktr("Conflict background: frozen"), new Color(234, 234, 234)),
+ /** Conflict background: in comparison */
BGCOLOR_PARTICIPATING_IN_COMPARISON(marktr("Conflict background: in comparison"), Color.black),
+ /** Conflict foreground: in comparison */
FGCOLOR_PARTICIPATING_IN_COMPARISON(marktr("Conflict foreground: in comparison"), Color.white),
+ /** Conflict background */
BGCOLOR(marktr("Conflict background"), Color.white),
+ /** Conflict foreground */
FGCOLOR(marktr("Conflict foreground"), Color.black),
+ /** Conflict background: not in opposite */
BGCOLOR_NOT_IN_OPPOSITE(marktr("Conflict background: not in opposite"), new Color(255, 197, 197)),
+ /** Conflict background: in opposite */
BGCOLOR_IN_OPPOSITE(marktr("Conflict background: in opposite"), new Color(255, 234, 213)),
+ /** Conflict background: same position in opposite */
BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217, 255, 217)),
+ /** Conflict background: keep one tag */
BGCOLOR_TAG_KEEP_ONE(marktr("Conflict background: keep one tag"), new Color(217, 255, 217)),
+ /** Conflict foreground: keep one tag */
FGCOLOR_TAG_KEEP_ONE(marktr("Conflict foreground: keep one tag"), Color.black),
+ /** Conflict background: drop tag */
BGCOLOR_TAG_KEEP_NONE(marktr("Conflict background: drop tag"), Color.lightGray),
+ /** Conflict foreground: drop tag */
FGCOLOR_TAG_KEEP_NONE(marktr("Conflict foreground: drop tag"), Color.black),
+ /** Conflict background: keep all tags */
BGCOLOR_TAG_KEEP_ALL(marktr("Conflict background: keep all tags"), new Color(255, 234, 213)),
+ /** Conflict foreground: keep all tags */
FGCOLOR_TAG_KEEP_ALL(marktr("Conflict foreground: keep all tags"), Color.black),
+ /** Conflict background: sum all numeric tags */
BGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict background: sum all numeric tags"), new Color(255, 234, 213)),
+ /** Conflict foreground: sum all numeric tags */
FGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict foreground: sum all numeric tags"), Color.black),
+ /** Conflict background: keep member */
BGCOLOR_MEMBER_KEEP(marktr("Conflict background: keep member"), new Color(217, 255, 217)),
+ /** Conflict foreground: keep member */
FGCOLOR_MEMBER_KEEP(marktr("Conflict foreground: keep member"), Color.black),
+ /** Conflict background: remove member */
BGCOLOR_MEMBER_REMOVE(marktr("Conflict background: remove member"), Color.lightGray),
+ /** Conflict foreground: remove member */
FGCOLOR_MEMBER_REMOVE(marktr("Conflict foreground: remove member"), Color.black);
private final String name;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
index 4dea84e..8d0203f 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
@@ -48,7 +48,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* @see ListMergeModel
* @since 1631
*/
-public abstract class ListMerger<T extends PrimitiveId> extends JPanel implements PropertyChangeListener, Observer {
+public abstract class ListMerger<T extends PrimitiveId> extends JPanel implements PropertyChangeListener, Observer, IConflictResolver {
protected OsmPrimitivesTable myEntriesTable;
protected OsmPrimitivesTable mergedEntriesTable;
protected OsmPrimitivesTable theirEntriesTable;
@@ -415,15 +415,15 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
/**
* Base class of all other Copy* inner classes.
*/
- abstract class CopyAction extends AbstractAction implements ListSelectionListener {
+ abstract static class CopyAction extends AbstractAction implements ListSelectionListener {
- protected CopyAction(String icon_name, String action_name, String short_description) {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", icon_name);
+ protected CopyAction(String iconName, String actionName, String shortDescription) {
+ ImageIcon icon = ImageProvider.get("dialogs/conflict", iconName);
putValue(Action.SMALL_ICON, icon);
if (icon == null) {
- putValue(Action.NAME, action_name);
+ putValue(Action.NAME, actionName);
}
- putValue(Action.SHORT_DESCRIPTION, short_description);
+ putValue(Action.SHORT_DESCRIPTION, shortDescription);
setEnabled(false);
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
index 11c4d64..49907ac 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
@@ -7,14 +7,13 @@ import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
/**
* A UI component for resolving conflicts in the node lists of two {@link Way}s.
* @since 1622
*/
-public class NodeListMerger extends ListMerger<Node> implements IConflictResolver {
+public class NodeListMerger extends ListMerger<Node> {
/**
* Constructs a new {@code NodeListMerger}.
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 e039935..c51c65b 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
@@ -83,6 +83,7 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
gc.insets = new Insets(10, 0, 0, 0);
JLabel lblMyVersion = new JLabel(tr("My version"));
lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset"));
+ lblMyVersion.setLabelFor(mineVersionInfo);
add(lblMyVersion, gc);
gc.gridx = 3;
@@ -94,6 +95,7 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
gc.gridx = 5;
JLabel lblTheirVersion = new JLabel(tr("Their version"));
lblTheirVersion.setToolTipText(tr("Properties in their dataset, i.e. the server dataset"));
+ lblMyVersion.setLabelFor(theirVersionInfo);
add(lblTheirVersion, gc);
gc.gridx = 1;
@@ -105,7 +107,6 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
gc.gridx = 5;
add(theirVersionInfo, gc);
-
}
protected void buildCoordinateConflictRows() {
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
index 0d9c6f8..e0d4d7f 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
@@ -7,14 +7,13 @@ import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
/**
* A UI component for resolving conflicts in the member lists of two {@link Relation}s.
* @since 1631
*/
-public class RelationMemberMerger extends ListMerger<RelationMember> implements IConflictResolver {
+public class RelationMemberMerger extends ListMerger<RelationMember> {
/**
* Constructs a new {@code RelationMemberMerger}.
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
index c8cd5b4..60f341b 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
@@ -217,7 +217,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
* @param parent The parent component in which this dialog will be displayed.
*/
public CombinePrimitiveResolverDialog(Component parent) {
- super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
build();
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java b/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
index bd51f64..1875345 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
@@ -27,7 +27,6 @@ import javax.swing.Action;
import javax.swing.ImageIcon;
import javax.swing.JDialog;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.JTable;
@@ -39,6 +38,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -72,7 +72,7 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
* @param owner parent component
*/
public PasteTagsConflictResolverDialog(Component owner) {
- super(JOptionPane.getFrameForComponent(owner), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(owner), ModalityType.DOCUMENT_MODAL);
build();
iconResolved = ImageProvider.get("dialogs/conflict", "tagconflictresolved");
iconUnresolved = ImageProvider.get("dialogs/conflict", "tagconflictunresolved");
diff --git a/src/org/openstreetmap/josm/corrector/CorrectionTable.java b/src/org/openstreetmap/josm/gui/correction/CorrectionTable.java
similarity index 76%
rename from src/org/openstreetmap/josm/corrector/CorrectionTable.java
rename to src/org/openstreetmap/josm/gui/correction/CorrectionTable.java
index a99662b..910354e 100644
--- a/src/org/openstreetmap/josm/corrector/CorrectionTable.java
+++ b/src/org/openstreetmap/josm/gui/correction/CorrectionTable.java
@@ -1,5 +1,5 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
+package org.openstreetmap.josm.gui.correction;
import java.awt.Component;
import java.awt.Dimension;
@@ -9,24 +9,25 @@ import javax.swing.JLabel;
import javax.swing.JTable;
import javax.swing.table.TableCellRenderer;
-public abstract class CorrectionTable<T extends CorrectionTableModel<?>>
- extends JTable {
+/**
+ * Abstract correction table.
+ * @param <T> type of table model
+ */
+public abstract class CorrectionTable<T extends CorrectionTableModel<?>> extends JTable {
private static final int MAX_VISIBLE_LINES = 10;
- public static class BoldRenderer extends JLabel implements
- TableCellRenderer {
+ /**
+ * Renders text in bold.
+ */
+ public static class BoldRenderer extends JLabel implements TableCellRenderer {
@Override
public Component getTableCellRendererComponent(JTable table,
- Object value, boolean isSelected, boolean hasFocus, int row,
- int column) {
-
+ Object value, boolean isSelected, boolean hasFocus, int row, int column) {
Font f = getFont();
setFont(new Font(f.getName(), f.getStyle() | Font.BOLD, f.getSize()));
-
setText((String) value);
-
return this;
}
}
@@ -37,12 +38,9 @@ public abstract class CorrectionTable<T extends CorrectionTableModel<?>>
super(correctionTableModel);
final int correctionsSize = correctionTableModel.getCorrections().size();
- final int lines = correctionsSize > MAX_VISIBLE_LINES ? MAX_VISIBLE_LINES
- : correctionsSize;
- setPreferredScrollableViewportSize(new Dimension(400, lines
- * getRowHeight()));
- getColumnModel().getColumn(correctionTableModel.getApplyColumn())
- .setPreferredWidth(40);
+ final int lines = correctionsSize > MAX_VISIBLE_LINES ? MAX_VISIBLE_LINES : correctionsSize;
+ setPreferredScrollableViewportSize(new Dimension(400, lines * getRowHeight()));
+ getColumnModel().getColumn(correctionTableModel.getApplyColumn()).setPreferredWidth(40);
setRowSelectionAllowed(false);
}
@@ -56,6 +54,10 @@ public abstract class CorrectionTable<T extends CorrectionTableModel<?>>
return super.getCellRenderer(row, column);
}
+ /**
+ * Returns correction table model.
+ * @return correction table model
+ */
@SuppressWarnings("unchecked")
public T getCorrectionTableModel() {
return (T) getModel();
diff --git a/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java b/src/org/openstreetmap/josm/gui/correction/CorrectionTableModel.java
similarity index 66%
rename from src/org/openstreetmap/josm/corrector/CorrectionTableModel.java
rename to src/org/openstreetmap/josm/gui/correction/CorrectionTableModel.java
index 6a00e1f..fbb0141 100644
--- a/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java
+++ b/src/org/openstreetmap/josm/gui/correction/CorrectionTableModel.java
@@ -1,5 +1,5 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
+package org.openstreetmap.josm.gui.correction;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -8,12 +8,22 @@ import java.util.List;
import javax.swing.table.AbstractTableModel;
+import org.openstreetmap.josm.data.correction.Correction;
+
+/**
+ * Abstract correction table model.
+ * @param <C> type of correction
+ */
public abstract class CorrectionTableModel<C extends Correction> extends AbstractTableModel {
private final transient List<C> corrections;
private boolean[] apply;
private final int applyColumn;
+ /**
+ * Constructs a new {@code CorrectionTableModel}.
+ * @param corrections list of corrections
+ */
public CorrectionTableModel(List<C> corrections) {
this.corrections = corrections;
apply = new boolean[this.corrections.size()];
@@ -21,23 +31,45 @@ public abstract class CorrectionTableModel<C extends Correction> extends Abstrac
applyColumn = getColumnCount() - 1;
}
- @Override
- public abstract int getColumnCount();
-
protected abstract boolean isBoldCell(int row, int column);
+ /**
+ * Returns the column name for columns other than "Apply".
+ * @param colIndex column index
+ * @return the translated column name for given index
+ * @see #getApplyColumn
+ */
public abstract String getCorrectionColumnName(int colIndex);
+ /**
+ * Returns the correction value at given position.
+ * @param rowIndex row index
+ * @param colIndex column index
+ * @return the correction value at given position
+ */
public abstract Object getCorrectionValueAt(int rowIndex, int colIndex);
+ /**
+ * Returns the list of corrections.
+ * @return the list of corrections
+ */
public List<C> getCorrections() {
return corrections;
}
+ /**
+ * Returns the index of the "Apply" column.
+ * @return the index of the "Apply" column
+ */
public int getApplyColumn() {
return applyColumn;
}
+ /**
+ * Returns the "Apply" flag for given index.
+ * @param i index
+ * @return the "Apply" flag for given index
+ */
public boolean getApply(int i) {
return apply[i];
}
diff --git a/src/org/openstreetmap/josm/gui/correction/RoleCorrectionTable.java b/src/org/openstreetmap/josm/gui/correction/RoleCorrectionTable.java
new file mode 100644
index 0000000..e6e4bd5
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/correction/RoleCorrectionTable.java
@@ -0,0 +1,21 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.correction;
+
+import java.util.List;
+
+import org.openstreetmap.josm.data.correction.RoleCorrection;
+
+/**
+ * Role correction table.
+ * @since 1001
+ */
+public class RoleCorrectionTable extends CorrectionTable<RoleCorrectionTableModel> {
+
+ /**
+ * Constructs a new {@code RoleCorrectionTable}.
+ * @param roleCorrections role corrections
+ */
+ public RoleCorrectionTable(List<RoleCorrection> roleCorrections) {
+ super(new RoleCorrectionTableModel(roleCorrections));
+ }
+}
diff --git a/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java b/src/org/openstreetmap/josm/gui/correction/RoleCorrectionTableModel.java
similarity index 71%
rename from src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java
rename to src/org/openstreetmap/josm/gui/correction/RoleCorrectionTableModel.java
index bd39f2b..9431f78 100644
--- a/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java
+++ b/src/org/openstreetmap/josm/gui/correction/RoleCorrectionTableModel.java
@@ -1,15 +1,23 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
+package org.openstreetmap.josm.gui.correction;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.List;
+import org.openstreetmap.josm.data.correction.RoleCorrection;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
-public class RoleCorrectionTableModel extends
-CorrectionTableModel<RoleCorrection> {
+/**
+ * Role correction table model.
+ * @since 1001
+ */
+public class RoleCorrectionTableModel extends CorrectionTableModel<RoleCorrection> {
+ /**
+ * Constructs a new {@code RoleCorrectionTableModel}.
+ * @param roleCorrections list of role corrections
+ */
public RoleCorrectionTableModel(List<RoleCorrection> roleCorrections) {
super(roleCorrections);
}
@@ -28,8 +36,9 @@ CorrectionTableModel<RoleCorrection> {
return tr("Old role");
case 2:
return tr("New role");
+ default:
+ return null;
}
- return null;
}
@Override
@@ -43,13 +52,13 @@ CorrectionTableModel<RoleCorrection> {
return roleCorrection.member.getRole();
case 2:
return roleCorrection.newRole;
+ default:
+ return null;
}
- return null;
}
@Override
protected boolean isBoldCell(int row, int column) {
return column == 2;
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/correction/TagCorrectionTable.java b/src/org/openstreetmap/josm/gui/correction/TagCorrectionTable.java
new file mode 100644
index 0000000..a2160ee
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/correction/TagCorrectionTable.java
@@ -0,0 +1,21 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.correction;
+
+import java.util.List;
+
+import org.openstreetmap.josm.data.correction.TagCorrection;
+
+/**
+ * Tag correction table.
+ * @since 729
+ */
+public class TagCorrectionTable extends CorrectionTable<TagCorrectionTableModel> {
+
+ /**
+ * Constructs a new {@code TagCorrectionTable}.
+ * @param tagCorrections tag corrections
+ */
+ public TagCorrectionTable(List<TagCorrection> tagCorrections) {
+ super(new TagCorrectionTableModel(tagCorrections));
+ }
+}
diff --git a/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java b/src/org/openstreetmap/josm/gui/correction/TagCorrectionTableModel.java
similarity index 75%
rename from src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java
rename to src/org/openstreetmap/josm/gui/correction/TagCorrectionTableModel.java
index ffc08cc..c14c94f 100644
--- a/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java
+++ b/src/org/openstreetmap/josm/gui/correction/TagCorrectionTableModel.java
@@ -1,12 +1,22 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.corrector;
+package org.openstreetmap.josm.gui.correction;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.List;
+import org.openstreetmap.josm.data.correction.TagCorrection;
+
+/**
+ * Tag correction table model.
+ * @since 729
+ */
public class TagCorrectionTableModel extends CorrectionTableModel<TagCorrection> {
+ /**
+ * Constructs a new {@code TagCorrectionTableModel}.
+ * @param tagCorrections list of tag corrections
+ */
public TagCorrectionTableModel(List<TagCorrection> tagCorrections) {
super(tagCorrections);
}
@@ -27,8 +37,9 @@ public class TagCorrectionTableModel extends CorrectionTableModel<TagCorrection>
return tr("New key");
case 3:
return tr("New value");
+ default:
+ return null;
}
- return null;
}
@Override
@@ -44,15 +55,15 @@ public class TagCorrectionTableModel extends CorrectionTableModel<TagCorrection>
return tagCorrection.newKey;
case 3:
return tagCorrection.newValue;
+ default:
+ return null;
}
- return null;
}
@Override
protected boolean isBoldCell(int row, int column) {
TagCorrection tagCorrection = getCorrections().get(row);
return (column == 2 && tagCorrection.isKeyChanged())
- || (column == 3 && tagCorrection.isValueChanged());
+ || (column == 3 && tagCorrection.isValueChanged());
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/correction/package-info.java b/src/org/openstreetmap/josm/gui/correction/package-info.java
new file mode 100644
index 0000000..e13ae11
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/correction/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM data correction tables.
+ */
+package org.openstreetmap.josm.gui.correction;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
index 3e2bbcb..79ba49f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
@@ -34,6 +34,8 @@ import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AbstractInfoAction;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetHeaderDownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.ChangesetCache;
import org.openstreetmap.josm.data.osm.DataSet;
@@ -43,7 +45,6 @@ import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager;
-import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetHeaderDownloadTask;
import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetInSelectionListModel;
import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetListCellRenderer;
import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetListModel;
@@ -55,9 +56,9 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.io.OnlineResource;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
/**
* ChangesetDialog is a toggle dialog which displays the current list of changesets.
@@ -329,7 +330,7 @@ public class ChangesetDialog extends ToggleDialog {
}
@Override
- public void itemStateChanged(ItemEvent arg0) {
+ public void itemStateChanged(ItemEvent e) {
updateEnabledState();
}
@@ -353,13 +354,13 @@ public class ChangesetDialog extends ToggleDialog {
}
@Override
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(ActionEvent e) {
ChangesetListModel model = getCurrentChangesetListModel();
Set<Integer> sel = model.getSelectedChangesetIds();
if (sel.isEmpty())
return;
ChangesetHeaderDownloadTask task = new ChangesetHeaderDownloadTask(sel);
- Main.worker.submit(task);
+ Main.worker.submit(new PostDownloadHandler(task, task.download()));
}
protected void updateEnabledState() {
@@ -367,9 +368,8 @@ public class ChangesetDialog extends ToggleDialog {
}
@Override
- public void itemStateChanged(ItemEvent arg0) {
+ public void itemStateChanged(ItemEvent e) {
updateEnabledState();
-
}
@Override
@@ -391,7 +391,7 @@ public class ChangesetDialog extends ToggleDialog {
}
@Override
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(ActionEvent e) {
List<Changeset> sel = getCurrentChangesetListModel().getSelectedOpenChangesets();
if (sel.isEmpty())
return;
@@ -403,7 +403,7 @@ public class ChangesetDialog extends ToggleDialog {
}
@Override
- public void itemStateChanged(ItemEvent arg0) {
+ public void itemStateChanged(ItemEvent e) {
updateEnabledState();
}
@@ -426,7 +426,7 @@ public class ChangesetDialog extends ToggleDialog {
}
@Override
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(ActionEvent e) {
Set<Changeset> sel = getCurrentChangesetListModel().getSelectedChangesets();
if (sel.isEmpty())
return;
@@ -434,10 +434,7 @@ public class ChangesetDialog extends ToggleDialog {
return;
String baseUrl = Main.getBaseBrowseUrl();
for (Changeset cs: sel) {
- String url = baseUrl + "/changeset/" + cs.getId();
- OpenBrowser.displayUrl(
- url
- );
+ OpenBrowser.displayUrl(baseUrl + "/changeset/" + cs.getId());
}
}
@@ -446,7 +443,7 @@ public class ChangesetDialog extends ToggleDialog {
}
@Override
- public void itemStateChanged(ItemEvent arg0) {
+ public void itemStateChanged(ItemEvent e) {
updateEnabledState();
}
@@ -468,7 +465,7 @@ public class ChangesetDialog extends ToggleDialog {
}
@Override
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(ActionEvent e) {
ChangesetListModel model = getCurrentChangesetListModel();
Set<Integer> sel = model.getSelectedChangesetIds();
LaunchChangesetManager.displayChangesets(sel);
@@ -520,7 +517,7 @@ public class ChangesetDialog extends ToggleDialog {
future = null;
} else {
task = new ChangesetHeaderDownloadTask(toDownload);
- future = Main.worker.submit(task);
+ future = Main.worker.submit(new PostDownloadHandler(task, task.download()));
}
Runnable r = new Runnable() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
index d829fec..b826c4e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
@@ -29,6 +29,7 @@ import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
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;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -133,7 +134,7 @@ public class ConflictResolutionDialog extends JDialog implements PropertyChangeL
* @param parent parent component
*/
public ConflictResolutionDialog(Component parent) {
- super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
build();
pack();
if (getInsets().top > 0) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java b/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
index bb43fee..a16346f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
@@ -21,7 +21,6 @@ import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.JDialog;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
@@ -40,6 +39,7 @@ import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -131,7 +131,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
* Constructs a new {@code DeleteFromRelationConfirmationDialog}.
*/
public DeleteFromRelationConfirmationDialog() {
- super(JOptionPane.getFrameForComponent(Main.parent), "", ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(Main.parent), "", ModalityType.DOCUMENT_MODAL);
build();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java b/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
index a9fcfb3..049ed86 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
@@ -106,7 +106,7 @@ public class DialogsPanel extends JPanel implements Destroyable {
*/
public void reconstruct(Action action, ToggleDialog triggeredBy) {
- final int N = allDialogs.size();
+ final int n = allDialogs.size();
/**
* reset the panels
@@ -125,13 +125,13 @@ public class DialogsPanel extends JPanel implements Destroyable {
* If there are no dialogs in default view, show the collapsed ones
* in the last panel anyway.
*/
- JPanel p = panels.get(N-1); // current Panel (start with last one)
+ JPanel p = panels.get(n-1); // current Panel (start with last one)
int k = -1; // indicates that current Panel index is N-1, but no default-view-Dialog has been added to this Panel yet.
- for (int i = N-1; i >= 0; --i) {
+ for (int i = n-1; i >= 0; --i) {
final ToggleDialog dlg = allDialogs.get(i);
if (dlg.isDialogInDefaultView()) {
if (k == -1) {
- k = N-1;
+ k = n-1;
} else {
--k;
p = panels.get(k);
@@ -145,15 +145,15 @@ public class DialogsPanel extends JPanel implements Destroyable {
}
if (k == -1) {
- k = N-1;
+ k = n-1;
}
- final int numPanels = N - k;
+ final int numPanels = n - k;
/**
* Determine the panel geometry
*/
if (action == Action.ELEMENT_SHRINKS) {
- for (int i = 0; i < N; ++i) {
+ for (int i = 0; i < n; ++i) {
final ToggleDialog dlg = allDialogs.get(i);
if (dlg.isDialogInDefaultView()) {
final int ph = dlg.getPreferredHeight();
@@ -190,54 +190,54 @@ public class DialogsPanel extends JPanel implements Destroyable {
}
/** total Height */
- final int H = mSpltPane.getMultiSplitLayout().getModel().getBounds().getSize().height;
+ final int h = mSpltPane.getMultiSplitLayout().getModel().getBounds().getSize().height;
/** space, that is available for dialogs in default view (after the reconfiguration) */
- final int s2 = H - (numPanels - 1) * DIVIDER_SIZE - sumC;
+ final int s2 = h - (numPanels - 1) * DIVIDER_SIZE - sumC;
- final int hp_trig = triggeredBy.getPreferredHeight();
- if (hp_trig <= 0) throw new IllegalStateException(); // Must be positive
+ final int hpTrig = triggeredBy.getPreferredHeight();
+ if (hpTrig <= 0) throw new IllegalStateException(); // Must be positive
/** The new dialog gets a fair share */
- final int hn_trig = hp_trig * s2 / (hp_trig + sumP);
- triggeredBy.setPreferredSize(new Dimension(Integer.MAX_VALUE, hn_trig));
+ final int hnTrig = hpTrig * s2 / (hpTrig + sumP);
+ triggeredBy.setPreferredSize(new Dimension(Integer.MAX_VALUE, hnTrig));
/** This is remainig for the other default view dialogs */
- final int R = s2 - hn_trig;
+ final int r = s2 - hnTrig;
/**
* Take space only from dialogs that are relatively large
*/
- int D_m = 0; // additional space needed by the small dialogs
- int D_p = 0; // available space from the large dialogs
- for (int i = 0; i < N; ++i) {
+ int dm = 0; // additional space needed by the small dialogs
+ int dp = 0; // available space from the large dialogs
+ for (int i = 0; i < n; ++i) {
final ToggleDialog dlg = allDialogs.get(i);
if (dlg.isDialogInDefaultView() && dlg != triggeredBy) {
final int ha = dlg.getSize().height; // current
- final int h0 = ha * R / sumA; // proportional shrinking
- final int he = dlg.getPreferredHeight() * s2 / (sumP + hp_trig); // fair share
+ final int h0 = ha * r / sumA; // proportional shrinking
+ final int he = dlg.getPreferredHeight() * s2 / (sumP + hpTrig); // fair share
if (h0 < he) { // dialog is relatively small
int hn = Math.min(ha, he); // shrink less, but do not grow
- D_m += hn - h0;
+ dm += hn - h0;
} else { // dialog is relatively large
- D_p += h0 - he;
+ dp += h0 - he;
}
}
}
/** adjust, without changing the sum */
- for (int i = 0; i < N; ++i) {
+ for (int i = 0; i < n; ++i) {
final ToggleDialog dlg = allDialogs.get(i);
if (dlg.isDialogInDefaultView() && dlg != triggeredBy) {
final int ha = dlg.getHeight();
- final int h0 = ha * R / sumA;
- final int he = dlg.getPreferredHeight() * s2 / (sumP + hp_trig);
+ final int h0 = ha * r / sumA;
+ final int he = dlg.getPreferredHeight() * s2 / (sumP + hpTrig);
if (h0 < he) {
int hn = Math.min(ha, he);
dlg.setPreferredSize(new Dimension(Integer.MAX_VALUE, hn));
} else {
int d;
try {
- d = (h0-he) * D_m / D_p;
+ d = (h0-he) * dm / dp;
} catch (ArithmeticException e) { /* D_p may be zero - nothing wrong with that. */
d = 0;
}
@@ -252,7 +252,7 @@ public class DialogsPanel extends JPanel implements Destroyable {
*/
final List<Node> ch = new ArrayList<>();
- for (int i = k; i <= N-1; ++i) {
+ for (int i = k; i <= n-1; ++i) {
if (i != k) {
ch.add(new Divider());
}
@@ -278,7 +278,7 @@ public class DialogsPanel extends JPanel implements Destroyable {
/**
* Hide the Panel, if there is nothing to show
*/
- if (numPanels == 1 && panels.get(N-1).getComponents().length == 0) {
+ if (numPanels == 1 && panels.get(n-1).getComponents().length == 0) {
parent.setDividerSize(0);
this.setVisible(false);
} else {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
index 127a0d3..a7f3f1d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
@@ -97,7 +97,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
= Shortcut.registerShortcut("core_multikey:hidingFilter", tr("Multikey: {0}", tr("Hide filter")),
KeyEvent.VK_H, Shortcut.ALT_CTRL);
- protected static final String[] COLUMN_TOOLTIPS = {
+ private static final String[] COLUMN_TOOLTIPS = {
Main.platform.makeTooltip(tr("Enable filter"), ENABLE_FILTER_SHORTCUT),
Main.platform.makeTooltip(tr("Hiding filter"), HIDING_FILTER_SHORTCUT),
null,
@@ -179,8 +179,9 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
@Override
public void actionPerformed(ActionEvent e) {
int index = userTable.getSelectionModel().getMinSelectionIndex();
- if (index < 0) return;
- filterModel.removeFilter(index);
+ if (index >= 0) {
+ filterModel.removeFilter(index);
+ }
}
});
SideButton upButton = new SideButton(new AbstractAction() {
@@ -193,11 +194,11 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
@Override
public void actionPerformed(ActionEvent e) {
int index = userTable.getSelectionModel().getMinSelectionIndex();
- if (index < 0) return;
- filterModel.moveUpFilter(index);
- userTable.getSelectionModel().setSelectionInterval(index-1, index-1);
+ if (index >= 0) {
+ filterModel.moveUpFilter(index);
+ userTable.getSelectionModel().setSelectionInterval(index-1, index-1);
+ }
}
-
});
SideButton downButton = new SideButton(new AbstractAction() {
{
@@ -209,9 +210,10 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
@Override
public void actionPerformed(ActionEvent e) {
int index = userTable.getSelectionModel().getMinSelectionIndex();
- if (index < 0) return;
- filterModel.moveDownFilter(index);
- userTable.getSelectionModel().setSelectionInterval(index+1, index+1);
+ if (index >= 0) {
+ filterModel.moveDownFilter(index);
+ userTable.getSelectionModel().setSelectionInterval(index+1, index+1);
+ }
}
});
@@ -220,9 +222,10 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
@Override
public void actionPerformed(ActionEvent e) {
int index = userTable.getSelectedRow();
- if (index < 0) return;
- Filter filter = filterModel.getFilter(index);
- filterModel.setValueAt(!filter.enable, index, FilterTableModel.COL_ENABLED);
+ if (index >= 0) {
+ Filter filter = filterModel.getFilter(index);
+ filterModel.setValueAt(!filter.enable, index, FilterTableModel.COL_ENABLED);
+ }
}
});
@@ -231,9 +234,10 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
@Override
public void actionPerformed(ActionEvent e) {
int index = userTable.getSelectedRow();
- if (index < 0) return;
- Filter filter = filterModel.getFilter(index);
- filterModel.setValueAt(!filter.hiding, index, FilterTableModel.COL_HIDING);
+ if (index >= 0) {
+ Filter filter = filterModel.getFilter(index);
+ filterModel.setValueAt(!filter.hiding, index, FilterTableModel.COL_HIDING);
+ }
}
});
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
index af5f61c..7ed2541 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -15,7 +15,6 @@ import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -29,16 +28,11 @@ import javax.swing.ImageIcon;
import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JSlider;
import javax.swing.JTable;
import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -54,25 +48,27 @@ import org.openstreetmap.josm.actions.MergeLayerAction;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.dialogs.layer.ActivateLayerAction;
+import org.openstreetmap.josm.gui.dialogs.layer.DeleteLayerAction;
+import org.openstreetmap.josm.gui.dialogs.layer.DuplicateAction;
+import org.openstreetmap.josm.gui.dialogs.layer.IEnabledStateUpdating;
+import org.openstreetmap.josm.gui.dialogs.layer.LayerVisibilityAction;
+import org.openstreetmap.josm.gui.dialogs.layer.MergeAction;
+import org.openstreetmap.josm.gui.dialogs.layer.MoveDownAction;
+import org.openstreetmap.josm.gui.dialogs.layer.MoveUpAction;
+import org.openstreetmap.josm.gui.dialogs.layer.ShowHideLayerAction;
import org.openstreetmap.josm.gui.layer.JumpToMarkerActions;
import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
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.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.MultikeyActionsHandler;
-import org.openstreetmap.josm.tools.MultikeyShortcutAction;
import org.openstreetmap.josm.tools.MultikeyShortcutAction.MultikeyInfo;
import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
/**
* This is a toggle dialog which displays the list of layers. Actions allow to
@@ -241,17 +237,17 @@ public class LayerListDialog extends ToggleDialog {
);
// -- move up action
- MoveUpAction moveUpAction = new MoveUpAction();
+ MoveUpAction moveUpAction = new MoveUpAction(model);
adaptTo(moveUpAction, model);
adaptTo(moveUpAction, selectionModel);
// -- move down action
- MoveDownAction moveDownAction = new MoveDownAction();
+ MoveDownAction moveDownAction = new MoveDownAction(model);
adaptTo(moveDownAction, model);
adaptTo(moveDownAction, selectionModel);
// -- activate action
- activateLayerAction = new ActivateLayerAction();
+ activateLayerAction = new ActivateLayerAction(model);
activateLayerAction.updateEnabledState();
MultikeyActionsHandler.getInstance().addAction(activateLayerAction);
adaptTo(activateLayerAction, selectionModel);
@@ -259,24 +255,17 @@ public class LayerListDialog extends ToggleDialog {
JumpToMarkerActions.initialize();
// -- show hide action
- showHideLayerAction = new ShowHideLayerAction();
+ showHideLayerAction = new ShowHideLayerAction(model);
MultikeyActionsHandler.getInstance().addAction(showHideLayerAction);
adaptTo(showHideLayerAction, selectionModel);
- // -- layer opacity action
- LayerOpacityAction layerOpacityAction = new LayerOpacityAction(model);
- adaptTo(layerOpacityAction, selectionModel);
- SideButton opacityButton = new SideButton(layerOpacityAction, false);
- layerOpacityAction.setCorrespondingSideButton(opacityButton);
-
- // -- layer gamma action
- LayerGammaAction layerGammaAction = new LayerGammaAction(model);
- adaptTo(layerGammaAction, selectionModel);
- SideButton gammaButton = new SideButton(layerGammaAction, false);
- layerGammaAction.setCorrespondingSideButton(gammaButton);
+ LayerVisibilityAction visibilityAction = new LayerVisibilityAction(model);
+ adaptTo(visibilityAction, selectionModel);
+ SideButton visibilityButton = new SideButton(visibilityAction, false);
+ visibilityAction.setCorrespondingSideButton(visibilityButton);
// -- delete layer action
- DeleteLayerAction deleteLayerAction = new DeleteLayerAction();
+ DeleteLayerAction deleteLayerAction = new DeleteLayerAction(model);
layerList.getActionMap().put("deleteLayer", deleteLayerAction);
adaptTo(deleteLayerAction, selectionModel);
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
@@ -300,9 +289,7 @@ public class LayerListDialog extends ToggleDialog {
new SideButton(moveUpAction, false),
new SideButton(moveDownAction, false),
new SideButton(activateLayerAction, false),
- new SideButton(showHideLayerAction, false),
- opacityButton,
- gammaButton,
+ visibilityButton,
new SideButton(deleteLayerAction, false)
));
@@ -330,10 +317,6 @@ public class LayerListDialog extends ToggleDialog {
return model;
}
- protected interface IEnabledStateUpdating {
- void updateEnabledState();
- }
-
/**
* Wires <code>listener</code> to <code>listSelectionModel</code> in such a way, that
* <code>listener</code> receives a {@link IEnabledStateUpdating#updateEnabledState()}
@@ -364,7 +347,6 @@ public class LayerListDialog extends ToggleDialog {
protected void adaptTo(final IEnabledStateUpdating listener, LayerListModel listModel) {
listModel.addTableModelListener(
new TableModelListener() {
-
@Override
public void tableChanged(TableModelEvent e) {
listener.updateEnabledState();
@@ -385,602 +367,6 @@ public class LayerListDialog extends ToggleDialog {
instance = null;
}
- /**
- * The action to delete the currently selected layer
- */
- public final class DeleteLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
-
- /**
- * Creates a {@link DeleteLayerAction} which will delete the currently
- * selected layers in the layer dialog.
- */
- public DeleteLayerAction() {
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
- putValue(SHORT_DESCRIPTION, tr("Delete the selected layers."));
- putValue(NAME, tr("Delete"));
- putValue("help", HelpUtil.ht("/Dialog/LayerList#DeleteLayer"));
- updateEnabledState();
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- List<Layer> selectedLayers = getModel().getSelectedLayers();
- if (selectedLayers.isEmpty())
- return;
- if (!Main.saveUnsavedModifications(selectedLayers, false))
- return;
- for (Layer l: selectedLayers) {
- Main.main.removeLayer(l);
- }
- }
-
- @Override
- public void updateEnabledState() {
- setEnabled(!getModel().getSelectedLayers().isEmpty());
- }
-
- @Override
- public Component createMenuComponent() {
- return new JMenuItem(this);
- }
-
- @Override
- public boolean supportLayers(List<Layer> layers) {
- return true;
- }
-
- @Override
- public boolean equals(Object obj) {
- return obj instanceof DeleteLayerAction;
- }
-
- @Override
- public int hashCode() {
- return getClass().hashCode();
- }
- }
-
- /**
- * Action which will toggle the visibility of the currently selected layers.
- */
- public final class ShowHideLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, MultikeyShortcutAction {
-
- private transient WeakReference<Layer> lastLayer;
- private final transient Shortcut multikeyShortcut;
-
- /**
- * Creates a {@link ShowHideLayerAction} which will toggle the visibility of
- * the currently selected layers
- */
- public ShowHideLayerAction() {
- putValue(NAME, tr("Show/hide"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "showhide"));
- putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer."));
- putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer"));
- multikeyShortcut = Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
- tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT);
- multikeyShortcut.setAccelerator(this);
- updateEnabledState();
- }
-
- @Override
- public Shortcut getMultikeyShortcut() {
- return multikeyShortcut;
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- for (Layer l : model.getSelectedLayers()) {
- l.toggleVisible();
- }
- }
-
- @Override
- public void executeMultikeyAction(int index, boolean repeat) {
- Layer l = LayerListDialog.getLayerForIndex(index);
- if (l != null) {
- l.toggleVisible();
- lastLayer = new WeakReference<>(l);
- } else if (repeat && lastLayer != null) {
- l = lastLayer.get();
- if (LayerListDialog.isLayerValid(l)) {
- l.toggleVisible();
- }
- }
- }
-
- @Override
- public void updateEnabledState() {
- setEnabled(!model.getSelectedLayers().isEmpty());
- }
-
- @Override
- public Component createMenuComponent() {
- return new JMenuItem(this);
- }
-
- @Override
- public boolean supportLayers(List<Layer> layers) {
- return true;
- }
-
- @Override
- public boolean equals(Object obj) {
- return obj instanceof ShowHideLayerAction;
- }
-
- @Override
- public int hashCode() {
- return getClass().hashCode();
- }
-
- @Override
- public List<MultikeyInfo> getMultikeyCombinations() {
- return LayerListDialog.getLayerInfoByClass(Layer.class);
- }
-
- @Override
- public MultikeyInfo getLastMultikeyAction() {
- if (lastLayer != null)
- return LayerListDialog.getLayerInfo(lastLayer.get());
- return null;
- }
- }
-
- /**
- * Abstract action which allows to adjust a double value using a slider
- */
- public abstract static class AbstractLayerPropertySliderAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
- protected final LayerListModel model;
- protected final JPopupMenu popup;
- protected final JSlider slider;
- private final double factor;
- private SideButton sideButton;
-
- protected AbstractLayerPropertySliderAction(LayerListModel model, String name, final double factor) {
- super(name);
- this.model = model;
- this.factor = factor;
- updateEnabledState();
-
- popup = new JPopupMenu();
- slider = new JSlider(JSlider.VERTICAL);
- slider.addChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- setValue(slider.getValue() / factor);
- }
- });
- popup.add(slider);
- }
-
- protected abstract void setValue(double value);
-
- protected abstract double getValue();
-
- /**
- * Sets the corresponding side button.
- * @param sideButton the corresponding side button
- */
- final void setCorrespondingSideButton(SideButton sideButton) {
- this.sideButton = sideButton;
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- slider.setValue((int) (getValue() * factor));
- if (e.getSource() == sideButton) {
- popup.show(sideButton, 0, sideButton.getHeight());
- } else {
- // Action can be trigger either by opacity button or by popup menu (in case toggle buttons are hidden).
- // In that case, show it in the middle of screen (because opacityButton is not visible)
- popup.show(Main.parent, Main.parent.getWidth() / 2, (Main.parent.getHeight() - popup.getHeight()) / 2);
- }
- }
-
- @Override
- public Component createMenuComponent() {
- return new JMenuItem(this);
- }
- }
-
- /**
- * Action which allows to change the opacity of one or more layers.
- */
- public static final class LayerOpacityAction extends AbstractLayerPropertySliderAction {
- private transient Layer layer;
-
- /**
- * Creates a {@link LayerOpacityAction} which allows to change the opacity of one or more layers.
- *
- * @param model layer list model
- * @param layer the layer. Must not be null.
- * @throws IllegalArgumentException if layer is null
- */
- public LayerOpacityAction(LayerListModel model, Layer layer) {
- this(model);
- CheckParameterUtil.ensureParameterNotNull(layer, "layer");
- this.layer = layer;
- updateEnabledState();
- }
-
- /**
- * Creates a {@link ShowHideLayerAction} which will toggle the visibility of the currently selected layers
- * @param model layer list model
- */
- public LayerOpacityAction(LayerListModel model) {
- super(model, tr("Opacity"), 100);
- putValue(SHORT_DESCRIPTION, tr("Adjust opacity of the layer."));
- putValue(SMALL_ICON, ImageProvider.get("dialogs/layerlist", "transparency"));
- }
-
- @Override
- protected void setValue(double value) {
- if (!isEnabled()) return;
- if (layer != null) {
- layer.setOpacity(value);
- } else {
- for (Layer l : model.getSelectedLayers()) {
- l.setOpacity(value);
- }
- }
- }
-
- @Override
- protected double getValue() {
- if (layer != null)
- return layer.getOpacity();
- else {
- double opacity = 0;
- List<Layer> layers = model.getSelectedLayers();
- for (Layer l : layers) {
- opacity += l.getOpacity();
- }
- return opacity / layers.size();
- }
- }
-
- @Override
- public void updateEnabledState() {
- if (layer == null) {
- setEnabled(!model.getSelectedLayers().isEmpty());
- } else {
- setEnabled(true);
- }
- }
-
- @Override
- public boolean supportLayers(List<Layer> layers) {
- return true;
- }
- }
-
- /**
- * Action which allows to change the gamma of one imagery layer.
- */
- public static final class LayerGammaAction extends AbstractLayerPropertySliderAction {
-
- /**
- * Constructs a new {@code LayerGammaAction}.
- * @param model layer list model
- */
- public LayerGammaAction(LayerListModel model) {
- super(model, tr("Gamma"), 50);
- putValue(SHORT_DESCRIPTION, tr("Adjust gamma value of the layer."));
- putValue(SMALL_ICON, ImageProvider.get("dialogs/layerlist", "gamma"));
- }
-
- @Override
- protected void setValue(double value) {
- for (ImageryLayer imageryLayer : Utils.filteredCollection(model.getSelectedLayers(), ImageryLayer.class)) {
- imageryLayer.setGamma(value);
- }
- }
-
- @Override
- protected double getValue() {
- return Utils.filteredCollection(model.getSelectedLayers(), ImageryLayer.class).iterator().next().getGamma();
- }
-
- @Override
- public void updateEnabledState() {
- setEnabled(!Utils.filteredCollection(model.getSelectedLayers(), ImageryLayer.class).isEmpty());
- }
-
- @Override
- public boolean supportLayers(List<Layer> layers) {
- return !Utils.filteredCollection(layers, ImageryLayer.class).isEmpty();
- }
- }
-
- /**
- * The action to activate the currently selected layer
- */
-
- public final class ActivateLayerAction extends AbstractAction
- implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction {
- private transient Layer layer;
- private transient Shortcut multikeyShortcut;
-
- /**
- * Constructs a new {@code ActivateLayerAction}.
- * @param layer the layer
- */
- public ActivateLayerAction(Layer layer) {
- this();
- CheckParameterUtil.ensureParameterNotNull(layer, "layer");
- this.layer = layer;
- putValue(NAME, tr("Activate"));
- updateEnabledState();
- }
-
- /**
- * Constructs a new {@code ActivateLayerAction}.
- */
- public ActivateLayerAction() {
- putValue(NAME, tr("Activate"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate"));
- putValue(SHORT_DESCRIPTION, tr("Activate the selected layer"));
- multikeyShortcut = Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
- tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT);
- multikeyShortcut.setAccelerator(this);
- putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer"));
- }
-
- @Override
- public Shortcut getMultikeyShortcut() {
- return multikeyShortcut;
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- Layer toActivate;
- if (layer != null) {
- toActivate = layer;
- } else {
- toActivate = model.getSelectedLayers().get(0);
- }
- execute(toActivate);
- }
-
- private void execute(Layer layer) {
- // model is going to be updated via LayerChangeListener and PropertyChangeEvents
- Main.map.mapView.setActiveLayer(layer);
- layer.setVisible(true);
- }
-
- protected boolean isActiveLayer(Layer layer) {
- if (!Main.isDisplayingMapView()) return false;
- return Main.map.mapView.getActiveLayer() == layer;
- }
-
- @Override
- public void updateEnabledState() {
- GuiHelper.runInEDTAndWait(new Runnable() {
- @Override
- public void run() {
- if (layer == null) {
- if (getModel().getSelectedLayers().size() != 1) {
- setEnabled(false);
- return;
- }
- Layer selectedLayer = getModel().getSelectedLayers().get(0);
- setEnabled(!isActiveLayer(selectedLayer));
- } else {
- setEnabled(!isActiveLayer(layer));
- }
- }
- });
- }
-
- @Override
- public void activeLayerChange(Layer oldLayer, Layer newLayer) {
- updateEnabledState();
- }
-
- @Override
- public void layerAdded(Layer newLayer) {
- updateEnabledState();
- }
-
- @Override
- public void layerRemoved(Layer oldLayer) {
- updateEnabledState();
- }
-
- @Override
- public void executeMultikeyAction(int index, boolean repeat) {
- Layer l = LayerListDialog.getLayerForIndex(index);
- if (l != null) {
- execute(l);
- }
- }
-
- @Override
- public List<MultikeyInfo> getMultikeyCombinations() {
- return LayerListDialog.getLayerInfoByClass(Layer.class);
- }
-
- @Override
- public MultikeyInfo getLastMultikeyAction() {
- return null; // Repeating action doesn't make much sense for activating
- }
- }
-
- /**
- * The action to merge the currently selected layer into another layer.
- */
- public final class MergeAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, Layer.MultiLayerAction {
- private transient Layer layer;
- private transient List<Layer> layers;
-
- /**
- * Constructs a new {@code MergeAction}.
- * @param layer the layer
- * @throws IllegalArgumentException if {@code layer} is null
- */
- public MergeAction(Layer layer) {
- this(layer, null);
- CheckParameterUtil.ensureParameterNotNull(layer, "layer");
- }
-
- /**
- * Constructs a new {@code MergeAction}.
- * @param layers the layer list
- * @throws IllegalArgumentException if {@code layers} is null
- */
- public MergeAction(List<Layer> layers) {
- this(null, layers);
- CheckParameterUtil.ensureParameterNotNull(layers, "layers");
- }
-
- /**
- * Constructs a new {@code MergeAction}.
- * @param layer the layer (null if layer list if specified)
- * @param layers the layer list (null if a single layer is specified)
- */
- private MergeAction(Layer layer, List<Layer> layers) {
- this.layer = layer;
- this.layers = layers;
- putValue(NAME, tr("Merge"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "mergedown"));
- putValue(SHORT_DESCRIPTION, tr("Merge this layer into another layer"));
- putValue("help", HelpUtil.ht("/Dialog/LayerList#MergeLayer"));
- updateEnabledState();
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- if (layer != null) {
- Main.main.menu.merge.merge(layer);
- } else if (layers != null) {
- Main.main.menu.merge.merge(layers);
- } else {
- if (getModel().getSelectedLayers().size() == 1) {
- Layer selectedLayer = getModel().getSelectedLayers().get(0);
- Main.main.menu.merge.merge(selectedLayer);
- } else {
- Main.main.menu.merge.merge(getModel().getSelectedLayers());
- }
- }
- }
-
- @Override
- public void updateEnabledState() {
- if (layer == null && layers == null) {
- if (getModel().getSelectedLayers().isEmpty()) {
- setEnabled(false);
- } else if (getModel().getSelectedLayers().size() > 1) {
- setEnabled(supportLayers(getModel().getSelectedLayers()));
- } else {
- Layer selectedLayer = getModel().getSelectedLayers().get(0);
- List<Layer> targets = getModel().getPossibleMergeTargets(selectedLayer);
- setEnabled(!targets.isEmpty());
- }
- } else if (layer != null) {
- List<Layer> targets = getModel().getPossibleMergeTargets(layer);
- setEnabled(!targets.isEmpty());
- } else {
- setEnabled(supportLayers(layers));
- }
- }
-
- @Override
- public boolean supportLayers(List<Layer> layers) {
- if (layers.isEmpty()) {
- return false;
- } else {
- final Layer firstLayer = layers.get(0);
- final List<Layer> remainingLayers = layers.subList(1, layers.size());
- return getModel().getPossibleMergeTargets(firstLayer).containsAll(remainingLayers);
- }
- }
-
- @Override
- public Component createMenuComponent() {
- return new JMenuItem(this);
- }
-
- @Override
- public MergeAction getMultiLayerAction(List<Layer> layers) {
- return new MergeAction(layers);
- }
- }
-
- /**
- * The action to merge the currently selected layer into another layer.
- */
- public final class DuplicateAction extends AbstractAction implements IEnabledStateUpdating {
- private transient Layer layer;
-
- /**
- * Constructs a new {@code DuplicateAction}.
- * @param layer the layer
- * @throws IllegalArgumentException if {@code layer} is null
- */
- public DuplicateAction(Layer layer) {
- this();
- CheckParameterUtil.ensureParameterNotNull(layer, "layer");
- this.layer = layer;
- updateEnabledState();
- }
-
- /**
- * Constructs a new {@code DuplicateAction}.
- */
- public DuplicateAction() {
- putValue(NAME, tr("Duplicate"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "duplicatelayer"));
- putValue(SHORT_DESCRIPTION, tr("Duplicate this layer"));
- putValue("help", HelpUtil.ht("/Dialog/LayerList#DuplicateLayer"));
- updateEnabledState();
- }
-
- private void duplicate(Layer layer) {
- if (!Main.isDisplayingMapView())
- return;
-
- List<String> layerNames = new ArrayList<>();
- for (Layer l: Main.map.mapView.getAllLayers()) {
- layerNames.add(l.getName());
- }
- if (layer instanceof OsmDataLayer) {
- OsmDataLayer oldLayer = (OsmDataLayer) layer;
- // Translators: "Copy of {layer name}"
- String newName = tr("Copy of {0}", oldLayer.getName());
- int i = 2;
- while (layerNames.contains(newName)) {
- // Translators: "Copy {number} of {layer name}"
- newName = tr("Copy {1} of {0}", oldLayer.getName(), i);
- i++;
- }
- Main.main.addLayer(new OsmDataLayer(oldLayer.data.clone(), newName, null));
- }
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- if (layer != null) {
- duplicate(layer);
- } else {
- duplicate(getModel().getSelectedLayers().get(0));
- }
- }
-
- @Override
- public void updateEnabledState() {
- if (layer == null) {
- if (getModel().getSelectedLayers().size() == 1) {
- setEnabled(getModel().getSelectedLayers().get(0) instanceof OsmDataLayer);
- } else {
- setEnabled(false);
- }
- } else {
- setEnabled(layer instanceof OsmDataLayer);
- }
- }
- }
-
private static class ActiveLayerCheckBox extends JCheckBox {
ActiveLayerCheckBox() {
setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
@@ -1126,7 +512,8 @@ public class LayerListDialog extends ToggleDialog {
private class LayerNameCellRenderer extends DefaultTableCellRenderer {
protected boolean isActiveLayer(Layer layer) {
- if (!Main.isDisplayingMapView()) return false;
+ if (!Main.isDisplayingMapView())
+ return false;
return Main.map.mapView.getActiveLayer() == layer;
}
@@ -1192,50 +579,6 @@ public class LayerListDialog extends ToggleDialog {
}
/**
- * The action to move up the currently selected entries in the list.
- */
- class MoveUpAction extends AbstractAction implements IEnabledStateUpdating {
- MoveUpAction() {
- putValue(NAME, tr("Move up"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "up"));
- putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row up."));
- updateEnabledState();
- }
-
- @Override
- public void updateEnabledState() {
- setEnabled(model.canMoveUp());
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- model.moveUp();
- }
- }
-
- /**
- * The action to move down the currently selected entries in the list.
- */
- class MoveDownAction extends AbstractAction implements IEnabledStateUpdating {
- MoveDownAction() {
- putValue(NAME, tr("Move down"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "down"));
- putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row down."));
- updateEnabledState();
- }
-
- @Override
- public void updateEnabledState() {
- setEnabled(model.canMoveDown());
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- model.moveDown();
- }
- }
-
- /**
* Observer interface to be implemented by views using {@link LayerListModel}.
*/
public interface LayerListModelListener {
@@ -1302,7 +645,6 @@ public class LayerListDialog extends ToggleDialog {
/**
* removes a listener from this model
* @param listener the listener
- *
*/
public void removeLayerListModelListener(LayerListModelListener listener) {
listeners.remove(listener);
@@ -1420,7 +762,8 @@ public class LayerListDialog extends ToggleDialog {
* @param layer the layer
*/
protected void onAddLayer(Layer layer) {
- if (layer == null) return;
+ if (layer == null)
+ return;
layer.addPropertyChangeListener(this);
fireTableDataChanged();
int idx = getLayers().indexOf(layer);
@@ -1435,7 +778,8 @@ public class LayerListDialog extends ToggleDialog {
* @return the first layer. Null if no layers are present
*/
public Layer getFirstLayer() {
- if (getRowCount() == 0) return null;
+ if (getRowCount() == 0)
+ return null;
return getLayers().get(0);
}
@@ -1467,7 +811,8 @@ public class LayerListDialog extends ToggleDialog {
*
*/
public void moveUp() {
- if (!canMoveUp()) return;
+ if (!canMoveUp())
+ return;
List<Integer> sel = getSelectedRows();
List<Layer> layers = getLayers();
for (int row : sel) {
@@ -1496,10 +841,10 @@ public class LayerListDialog extends ToggleDialog {
/**
* Move down the currently selected layers by one position
- *
*/
public void moveDown() {
- if (!canMoveDown()) return;
+ if (!canMoveDown())
+ return;
List<Integer> sel = getSelectedRows();
Collections.reverse(sel);
List<Layer> layers = getLayers();
@@ -1518,22 +863,21 @@ public class LayerListDialog extends ToggleDialog {
}
/**
- * Make sure the first of the selected layers is visible in the
- * views of this model.
- *
+ * Make sure the first of the selected layers is visible in the views of this model.
*/
protected void ensureSelectedIsVisible() {
int index = selectionModel.getMinSelectionIndex();
- if (index < 0) return;
+ if (index < 0)
+ return;
List<Layer> layers = getLayers();
- if (index >= layers.size()) return;
+ if (index >= layers.size())
+ return;
Layer layer = layers.get(index);
fireMakeVisible(index, layer);
}
/**
- * Replies a list of layers which are possible merge targets
- * for <code>source</code>
+ * Replies a list of layers which are possible merge targets for <code>source</code>
*
* @param source the source layer
* @return a list of layers which are possible merge targets
@@ -1595,8 +939,7 @@ public class LayerListDialog extends ToggleDialog {
* @return the active layer. null, if no active layer is available
*/
protected Layer getActiveLayer() {
- if (!Main.isDisplayingMapView()) return null;
- return Main.map.mapView.getActiveLayer();
+ return Main.isDisplayingMapView() ? Main.map.mapView.getActiveLayer() : null;
}
/**
@@ -1605,8 +948,7 @@ public class LayerListDialog extends ToggleDialog {
* @return the scale layer. null, if no active layer is available
*/
protected NativeScaleLayer getNativeScaleLayer() {
- if (!Main.isDisplayingMapView()) return null;
- return Main.map.mapView.getNativeScaleLayer();
+ return Main.isDisplayingMapView() ? Main.map.mapView.getNativeScaleLayer() : null;
}
/* ------------------------------------------------------------------------------ */
@@ -1616,8 +958,7 @@ public class LayerListDialog extends ToggleDialog {
@Override
public int getRowCount() {
List<Layer> layers = getLayers();
- if (layers == null) return 0;
- return layers.size();
+ return layers == null ? 0 : layers.size();
}
@Override
@@ -1727,7 +1068,8 @@ public class LayerListDialog extends ToggleDialog {
if (evt.getSource() instanceof Layer) {
Layer layer = (Layer) evt.getSource();
final int idx = getLayers().indexOf(layer);
- if (idx < 0) return;
+ if (idx < 0)
+ return;
fireRefresh();
}
}
@@ -1751,56 +1093,51 @@ public class LayerListDialog extends ToggleDialog {
}
/**
- * Creates a {@link ShowHideLayerAction} in the
- * context of this {@link LayerListDialog}.
+ * Creates a {@link ShowHideLayerAction} in the context of this {@link LayerListDialog}.
*
* @return the action
*/
public ShowHideLayerAction createShowHideLayerAction() {
- return new ShowHideLayerAction();
+ return new ShowHideLayerAction(model);
}
/**
- * Creates a {@link DeleteLayerAction} in the
- * context of this {@link LayerListDialog}.
+ * Creates a {@link DeleteLayerAction} in the context of this {@link LayerListDialog}.
*
* @return the action
*/
public DeleteLayerAction createDeleteLayerAction() {
- return new DeleteLayerAction();
+ return new DeleteLayerAction(model);
}
/**
- * Creates a {@link ActivateLayerAction} for <code>layer</code> in the
- * context of this {@link LayerListDialog}.
+ * Creates a {@link ActivateLayerAction} for <code>layer</code> in the context of this {@link LayerListDialog}.
*
* @param layer the layer
* @return the action
*/
public ActivateLayerAction createActivateLayerAction(Layer layer) {
- return new ActivateLayerAction(layer);
+ return new ActivateLayerAction(layer, model);
}
/**
- * Creates a {@link MergeLayerAction} for <code>layer</code> in the
- * context of this {@link LayerListDialog}.
+ * Creates a {@link MergeLayerAction} for <code>layer</code> in the context of this {@link LayerListDialog}.
*
* @param layer the layer
* @return the action
*/
public MergeAction createMergeLayerAction(Layer layer) {
- return new MergeAction(layer);
+ return new MergeAction(layer, model);
}
/**
- * Creates a {@link DuplicateAction} for <code>layer</code> in the
- * context of this {@link LayerListDialog}.
+ * Creates a {@link DuplicateAction} for <code>layer</code> in the context of this {@link LayerListDialog}.
*
* @param layer the layer
* @return the action
*/
public DuplicateAction createDuplicateLayerAction(Layer layer) {
- return new DuplicateAction(layer);
+ return new DuplicateAction(layer, model);
}
/**
@@ -1809,7 +1146,6 @@ public class LayerListDialog extends ToggleDialog {
* @return the layer at given index, or {@code null} if index out of range
*/
public static Layer getLayerForIndex(int index) {
-
if (!Main.isDisplayingMapView())
return null;
@@ -1828,7 +1164,6 @@ public class LayerListDialog extends ToggleDialog {
* @return list of info on all layers assignable from {@code layerClass}
*/
public static List<MultikeyInfo> getLayerInfoByClass(Class<?> layerClass) {
-
List<MultikeyInfo> result = new ArrayList<>();
if (!Main.isDisplayingMapView())
@@ -1853,7 +1188,6 @@ public class LayerListDialog extends ToggleDialog {
* @return {@code true} if layer {@code l} is contained in current layer list
*/
public static boolean isLayerValid(Layer l) {
-
if (l == null || !Main.isDisplayingMapView())
return false;
@@ -1866,7 +1200,6 @@ public class LayerListDialog extends ToggleDialog {
* @return info about layer {@code l}
*/
public static MultikeyInfo getLayerInfo(Layer l) {
-
if (l == null || !Main.isDisplayingMapView())
return null;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
index 8e05b76..0564fcb 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
@@ -571,8 +571,8 @@ public class MapPaintDialog extends ToggleDialog {
final JTabbedPane tabs = new JTabbedPane();
- tabs.add("Info", buildInfoPanel(s));
JLabel lblInfo = new JLabel(tr("Info"));
+ lblInfo.setLabelFor(tabs.add("Info", buildInfoPanel(s)));
lblInfo.setFont(lblInfo.getFont().deriveFont(Font.PLAIN));
tabs.setTabComponentAt(0, lblInfo);
@@ -582,8 +582,8 @@ public class MapPaintDialog extends ToggleDialog {
s.getWarnings(), marktr("Warnings"), 2, ImageProvider.get("warning-small"));
final JPanel pSource = new JPanel(new GridBagLayout());
- tabs.addTab("Source", pSource);
JLabel lblSource = new JLabel(tr("Source"));
+ lblSource.setLabelFor(tabs.add("Source", pSource));
lblSource.setFont(lblSource.getFont().deriveFont(Font.PLAIN));
tabs.setTabComponentAt(3, lblSource);
@@ -614,12 +614,14 @@ public class MapPaintDialog extends ToggleDialog {
tabs.add(title, pErrors);
if (items.isEmpty()) {
JLabel lblErrors = new JLabel(tr(title));
+ lblErrors.setLabelFor(pErrors);
lblErrors.setFont(lblInfo.getFont().deriveFont(Font.PLAIN));
lblErrors.setEnabled(false);
tabs.setTabComponentAt(pos, lblErrors);
tabs.setEnabledAt(pos, false);
} else {
JLabel lblErrors = new JLabel(tr(title), icon, JLabel.HORIZONTAL);
+ lblErrors.setLabelFor(pErrors);
tabs.setTabComponentAt(pos, lblErrors);
}
return pErrors;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
index a67a27c..cc0f2a6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
@@ -56,8 +56,6 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
/** Small icon size for use in graphics calculations */
public static final int ICON_SMALL_SIZE = 16;
- /** Large icon size for use in graphics calculations */
- public static final int ICON_LARGE_SIZE = 24;
/** 24x24 icon for unresolved notes */
public static final ImageIcon ICON_OPEN = ImageProvider.get("dialogs/notes", "note_open");
/** 16x16 icon for unresolved notes */
@@ -147,7 +145,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
closeAction.setEnabled(false);
addCommentAction.setEnabled(false);
reopenAction.setEnabled(false);
- } else if (noteData.getSelectedNote().getState() == State.open) {
+ } else if (noteData.getSelectedNote().getState() == State.OPEN) {
closeAction.setEnabled(true);
addCommentAction.setEnabled(true);
reopenAction.setEnabled(false);
@@ -250,7 +248,7 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
ImageIcon icon;
if (note.getId() < 0) {
icon = ICON_NEW_SMALL;
- } else if (note.getState() == State.closed) {
+ } else if (note.getState() == State.CLOSED) {
icon = ICON_CLOSED_SMALL;
} else {
icon = ICON_OPEN_SMALL;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java b/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
index 3c1e6d0..3f5d33f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
@@ -14,7 +14,7 @@ import java.awt.event.WindowListener;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -213,7 +213,7 @@ public class OsmIdSelectionDialog extends ExtendedDialog implements WindowListen
}
}));
tfId.tryToPasteFrom(parsedText);
- final Set<OsmPrimitiveType> types = new HashSet<>(Utils.transform(ids, new Utils.Function<SimplePrimitiveId, OsmPrimitiveType>() {
+ final Set<OsmPrimitiveType> types = EnumSet.copyOf(Utils.transform(ids, new Utils.Function<SimplePrimitiveId, OsmPrimitiveType>() {
@Override
public OsmPrimitiveType apply(SimplePrimitiveId x) {
return x.getType();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
index 55abfe9..78c95f9 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
@@ -39,7 +39,6 @@ import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JMenu;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JRadioButtonMenuItem;
@@ -446,7 +445,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
destroyComponents(this, false);
}
- private void destroyComponents(Component component, boolean destroyItself) {
+ private static void destroyComponents(Component component, boolean destroyItself) {
if (component instanceof Container) {
for (Component c: ((Container) component).getComponents()) {
destroyComponents(c, true);
@@ -664,7 +663,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
*/
private class DetachedDialog extends JDialog {
DetachedDialog() {
- super(JOptionPane.getFrameForComponent(Main.parent));
+ super(GuiHelper.getFrameForComponent(Main.parent));
getContentPane().add(ToggleDialog.this);
addWindowListener(new WindowAdapter() {
@Override public void windowClosing(WindowEvent e) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
index 993f89f..f6fb6a8 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
@@ -39,13 +39,17 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.AbstractChangesetDownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetContentDownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetHeaderDownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetQueryTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.ChangesetCache;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.dialogs.changeset.query.ChangesetQueryDialog;
-import org.openstreetmap.josm.gui.dialogs.changeset.query.ChangesetQueryTask;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.io.CloseChangesetTask;
@@ -651,9 +655,15 @@ public class ChangesetCacheManager extends JFrame {
*/
public void setSelectedChangesets(Collection<Changeset> changesets) {
model.setSelectedChangesets(changesets);
- int idx = model.getSelectionModel().getMinSelectionIndex();
- if (idx < 0) return;
- tblChangesets.scrollRectToVisible(tblChangesets.getCellRect(idx, 0, true));
+ final int idx = model.getSelectionModel().getMinSelectionIndex();
+ if (idx < 0)
+ return;
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override
+ public void run() {
+ tblChangesets.scrollRectToVisible(tblChangesets.getCellRect(idx, 0, true));
+ }
+ });
repaint();
}
@@ -695,13 +705,14 @@ public class ChangesetCacheManager extends JFrame {
* Runs the given changeset download task.
* @param task The changeset download task to run
*/
- public void runDownloadTask(final ChangesetDownloadTask task) {
- Main.worker.submit(task);
+ public void runDownloadTask(final AbstractChangesetDownloadTask task) {
+ Main.worker.submit(new PostDownloadHandler(task, task.download()));
Main.worker.submit(new Runnable() {
@Override
public void run() {
- if (task.isCanceled() || task.isFailed()) return;
- setSelectedChangesets(task.getDownloadedChangesets());
+ if (task.isCanceled() || task.isFailed())
+ return;
+ setSelectedChangesets(task.getDownloadedData());
}
});
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
deleted file mode 100644
index 0e9a8dc..0000000
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
+++ /dev/null
@@ -1,220 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.changeset;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.Component;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.ChangesetCache;
-import org.openstreetmap.josm.data.osm.ChangesetDataSet;
-import org.openstreetmap.josm.gui.ExceptionDialogUtil;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.io.OsmServerChangesetReader;
-import org.openstreetmap.josm.io.OsmTransferCanceledException;
-import org.openstreetmap.josm.io.OsmTransferException;
-import org.xml.sax.SAXException;
-
-/**
- * This is an asynchronous task for downloading the changeset content of a collection of
- * changesets.
- *
- */
-public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
-
- /** the list of changeset ids to download */
- private final List<Integer> toDownload = new ArrayList<>();
- /** true if the task was canceled */
- private boolean canceled;
- /** keeps the last exception thrown in the task, if any */
- private Exception lastException;
- /** the reader object used to read changesets from the API */
- private OsmServerChangesetReader reader;
- /** the set of downloaded changesets */
- private Set<Changeset> downloadedChangesets;
-
- /**
- * Initialize the task with a collection of changeset ids to download
- *
- * @param ids the collection of ids. May be null.
- */
- protected void init(Collection<Integer> ids) {
- if (ids == null) {
- ids = Collections.emptyList();
- }
- for (Integer id: ids) {
- if (id == null || id <= 0) {
- continue;
- }
- toDownload.add(id);
- }
- downloadedChangesets = new HashSet<>();
- }
-
- /**
- * Creates a download task for a single changeset
- *
- * @param changesetId the changeset id. > 0 required.
- * @throws IllegalArgumentException if changesetId <= 0
- */
- public ChangesetContentDownloadTask(int changesetId) {
- super(tr("Downloading changeset content"), false /* don't ignore exceptions */);
- if (changesetId <= 0)
- throw new IllegalArgumentException(
- MessageFormat.format("Expected integer value > 0 for parameter ''{0}'', got ''{1}''", "changesetId", changesetId));
- init(Collections.singleton(changesetId));
- }
-
- /**
- * Creates a download task for a collection of changesets. null values and id <=0 in
- * the collection are sillently discarded.
- *
- * @param changesetIds the changeset ids. Empty collection assumed, if null.
- */
- public ChangesetContentDownloadTask(Collection<Integer> changesetIds) {
- super(tr("Downloading changeset content"), false /* don't ignore exceptions */);
- init(changesetIds);
- }
-
- /**
- * Creates a download task for a single changeset
- *
- * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}.
- * @param changesetId the changeset id. {@code >0} required.
- * @throws IllegalArgumentException if {@code changesetId <= 0}
- * @throws IllegalArgumentException if parent is {@code null}
- */
- public ChangesetContentDownloadTask(Component parent, int changesetId) {
- super(parent, tr("Downloading changeset content"), false /* don't ignore exceptions */);
- if (changesetId <= 0)
- throw new IllegalArgumentException(
- MessageFormat.format("Expected integer value > 0 for parameter ''{0}'', got ''{1}''", "changesetId", changesetId));
- init(Collections.singleton(changesetId));
- }
-
- /**
- * Creates a download task for a collection of changesets. null values and id <=0 in
- * the collection are sillently discarded.
- *
- * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}.
- * @param changesetIds the changeset ids. Empty collection assumed, if {@code null}.
- * @throws IllegalArgumentException if parent is {@code null}
- */
- public ChangesetContentDownloadTask(Component parent, Collection<Integer> changesetIds) {
- super(parent, tr("Downloading changeset content"), false /* don't ignore exceptions */);
- init(changesetIds);
- }
-
- /**
- * Replies true if the local {@link ChangesetCache} already includes the changeset with
- * id <code>changesetId</code>.
- *
- * @param changesetId the changeset id
- * @return true if the local {@link ChangesetCache} already includes the changeset with
- * id <code>changesetId</code>
- */
- protected boolean isAvailableLocally(int changesetId) {
- return ChangesetCache.getInstance().get(changesetId) != null;
- }
-
- /**
- * Downloads the changeset with id <code>changesetId</code> (only "header"
- * information, no content)
- *
- * @param changesetId the changeset id
- * @throws OsmTransferException if something went wrong
- */
- protected void downloadChangeset(int changesetId) throws OsmTransferException {
- synchronized (this) {
- reader = new OsmServerChangesetReader();
- }
- Changeset cs = reader.readChangeset(changesetId, false, getProgressMonitor().createSubTaskMonitor(0, false));
- synchronized (this) {
- reader = null;
- }
- ChangesetCache.getInstance().update(cs);
- }
-
- @Override
- protected void cancel() {
- canceled = true;
- synchronized (this) {
- if (reader != null) {
- reader.cancel();
- }
- }
- }
-
- @Override
- protected void finish() {
- if (canceled) return;
- if (lastException != null) {
- ExceptionDialogUtil.explainException(lastException);
- }
- }
-
- @Override
- protected void realRun() throws SAXException, IOException, OsmTransferException {
- try {
- getProgressMonitor().setTicksCount(toDownload.size());
- int i = 0;
- for (int id: toDownload) {
- i++;
- if (!isAvailableLocally(id)) {
- getProgressMonitor().setCustomText(tr("({0}/{1}) Downloading changeset {2}...", i, toDownload.size(), id));
- downloadChangeset(id);
- }
- if (canceled) return;
- synchronized (this) {
- reader = new OsmServerChangesetReader();
- }
- getProgressMonitor().setCustomText(tr("({0}/{1}) Downloading content for changeset {2}...", i, toDownload.size(), id));
- ChangesetDataSet ds = reader.downloadChangeset(id, getProgressMonitor().createSubTaskMonitor(0, false));
- synchronized (this) {
- reader = null;
- }
- Changeset cs = ChangesetCache.getInstance().get(id);
- cs.setContent(ds);
- ChangesetCache.getInstance().update(cs);
- downloadedChangesets.add(cs);
- getProgressMonitor().worked(1);
- }
- } catch (OsmTransferCanceledException e) {
- // the download was canceled by the user. This exception is caught if the
- // user canceled the authentication dialog.
- //
- canceled = true;
- return;
- } catch (OsmTransferException e) {
- if (canceled)
- return;
- lastException = e;
- }
- }
-
- /* ------------------------------------------------------------------------------- */
- /* interface ChangesetDownloadTask */
- /* ------------------------------------------------------------------------------- */
- @Override
- public Set<Changeset> getDownloadedChangesets() {
- return downloadedChangesets;
- }
-
- @Override
- public boolean isCanceled() {
- return canceled;
- }
-
- @Override
- public boolean isFailed() {
- return lastException != null;
- }
-}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
index 87d9fc1..149f9e9 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
@@ -33,6 +33,7 @@ import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetContentDownloadTask;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -50,9 +51,9 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
/**
* The panel which displays the content of a changeset in a scrollable table.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
index 5736eb4..2f7c434 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
@@ -28,6 +28,8 @@ import javax.swing.JToolBar;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetHeaderDownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.ChangesetCache;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -297,13 +299,13 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
@Override
public void actionPerformed(ActionEvent evt) {
- if (currentChangeset == null) return;
- Main.worker.submit(
- new ChangesetHeaderDownloadTask(
- ChangesetDetailPanel.this,
- Collections.singleton(currentChangeset.getId())
- )
+ if (currentChangeset == null)
+ return;
+ ChangesetHeaderDownloadTask task = new ChangesetHeaderDownloadTask(
+ ChangesetDetailPanel.this,
+ Collections.singleton(currentChangeset.getId())
);
+ Main.worker.submit(new PostDownloadHandler(task, task.download()));
}
public void initProperties(Changeset cs) {
@@ -312,8 +314,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
}
/**
- * Selects the primitives in the content of this changeset in the current
- * data layer.
+ * Selects the primitives in the content of this changeset in the current data layer.
*
*/
class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
index 1d20e70..92514b7 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
@@ -20,6 +20,8 @@ import javax.swing.JTable;
import javax.swing.JToolBar;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetHeaderDownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.io.OnlineResource;
@@ -67,14 +69,14 @@ public class ChangesetDiscussionPanel extends JPanel implements PropertyChangeLi
@Override
public void actionPerformed(ActionEvent evt) {
- if (current == null) return;
- Main.worker.submit(
- new ChangesetHeaderDownloadTask(
- ChangesetDiscussionPanel.this,
- Collections.singleton(current.getId()),
- true /* include discussion */
- )
+ if (current == null)
+ return;
+ ChangesetHeaderDownloadTask task = new ChangesetHeaderDownloadTask(
+ ChangesetDiscussionPanel.this,
+ Collections.singleton(current.getId()),
+ true /* include discussion */
);
+ Main.worker.submit(new PostDownloadHandler(task, task.download()));
}
public void initProperties(Changeset cs) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java
deleted file mode 100644
index e863aeb..0000000
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.changeset;
-
-import java.util.Set;
-
-import org.openstreetmap.josm.data.osm.Changeset;
-
-public interface ChangesetDownloadTask extends Runnable {
- Set<Changeset> getDownloadedChangesets();
-
- boolean isCanceled();
-
- boolean isFailed();
-}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetContentAction.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetContentAction.java
index 263713b..5f4f47a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetContentAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetContentAction.java
@@ -8,6 +8,7 @@ import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetContentDownloadTask;
import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
index 15dd835..6404cfe 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
@@ -16,6 +16,7 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetContentDownloadTask;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.widgets.ChangesetIdTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
index cdf5093..02a9e5c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
@@ -30,6 +30,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.preferences.server.UserNameValidator;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.BoundingBoxSelectionPanel;
@@ -379,7 +380,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
private JosmTextField tfUid;
private transient UidInputFieldValidator valUid;
private JosmTextField tfUserName;
- private transient UserNameInputValidator valUserName;
+ private transient UserNameValidator valUserName;
private JMultilineLabel lblRestrictedToMyself;
protected JPanel buildUidInputPanel() {
@@ -413,7 +414,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
gc.gridx = 1;
pnl.add(tfUserName = new JosmTextField(10), gc);
SelectAllOnFocusGainedDecorator.decorate(tfUserName);
- valUserName = UserNameInputValidator.decorate(tfUserName);
+ valUserName = new UserNameValidator(tfUserName);
// grab remaining space
gc.gridx = 2;
@@ -1012,31 +1013,6 @@ public class AdvancedChangesetQueryPanel extends JPanel {
}
}
- private static class UserNameInputValidator extends AbstractTextComponentValidator {
- public static UserNameInputValidator decorate(JTextComponent tc) {
- return new UserNameInputValidator(tc);
- }
-
- UserNameInputValidator(JTextComponent tc) {
- super(tc);
- }
-
- @Override
- public boolean isValid() {
- return !getComponent().getText().trim().isEmpty();
- }
-
- @Override
- public void validate() {
- String value = getComponent().getText();
- if (value.trim().isEmpty()) {
- feedbackInvalid(tr("<html>The current value is not a valid user name.<br>Please enter an non-empty user name.</html>"));
- return;
- }
- feedbackValid(tr("Please enter an non-empty user name"));
- }
- }
-
/**
* Validates dates entered as text in a {@link JTextComponent}. Validates the input
* on the fly and gives feedback about whether the date is valid or not.
@@ -1146,7 +1122,6 @@ public class AdvancedChangesetQueryPanel extends JPanel {
@Override
public void validate() {
-
if (!isValid()) {
String msg = "<html>The current value isn't a valid time.<br>" + getStandardTooltipText() + "</html>";
feedbackInvalid(msg);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
deleted file mode 100644
index e771ef7..0000000
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
+++ /dev/null
@@ -1,212 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.changeset.query;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.Component;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.ChangesetCache;
-import org.openstreetmap.josm.data.osm.UserInfo;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetDownloadTask;
-import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.io.ChangesetQuery;
-import org.openstreetmap.josm.io.OsmServerChangesetReader;
-import org.openstreetmap.josm.io.OsmServerUserInfoReader;
-import org.openstreetmap.josm.io.OsmTransferCanceledException;
-import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.ExceptionUtil;
-import org.xml.sax.SAXException;
-
-/**
- * Asynchronous task to send a changeset query to the OSM API.
- * @since 2689
- */
-public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask {
-
- /** the changeset query */
- private ChangesetQuery query;
- /** true if the task was canceled */
- private boolean canceled;
- /** the set of downloaded changesets */
- private Set<Changeset> downloadedChangesets;
- /** the last exception remembered, if any */
- private Exception lastException;
- /** the reader object used to read information about the current user from the API */
- private OsmServerUserInfoReader userInfoReader;
- /** the reader object used to submit the changeset query to the API */
- private OsmServerChangesetReader changesetReader;
-
- /**
- * Creates the task.
- *
- * @param query the query to submit to the OSM server. Must not be null.
- * @throws IllegalArgumentException if query is null.
- */
- public ChangesetQueryTask(ChangesetQuery query) {
- super(tr("Querying and downloading changesets"), false /* don't ignore exceptions */);
- CheckParameterUtil.ensureParameterNotNull(query, "query");
- this.query = query;
- }
-
- /**
- * Creates the task.
- *
- * @param parent the parent component relative to which the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} is displayed.
- * Must not be null.
- * @param query the query to submit to the OSM server. Must not be null.
- * @throws IllegalArgumentException if query is null.
- * @throws IllegalArgumentException if parent is null
- */
- public ChangesetQueryTask(Component parent, ChangesetQuery query) {
- super(parent, tr("Querying and downloading changesets"), false /* don't ignore exceptions */);
- CheckParameterUtil.ensureParameterNotNull(query, "query");
- this.query = query;
- }
-
- @Override
- protected void cancel() {
- canceled = true;
- synchronized (this) {
- if (userInfoReader != null) {
- userInfoReader.cancel();
- }
- }
- synchronized (this) {
- if (changesetReader != null) {
- changesetReader.cancel();
- }
- }
- }
-
- @Override
- protected void finish() {
- if (canceled) return;
- if (lastException != null) {
- GuiHelper.runInEDTAndWait(new Runnable() {
- private final Component parent = progressMonitor != null ? progressMonitor.getWindowParent() : null;
- @Override
- public void run() {
- JOptionPane.showMessageDialog(
- parent != null ? parent : Main.parent,
- ExceptionUtil.explainException(lastException),
- tr("Errors during download"),
- JOptionPane.ERROR_MESSAGE);
- }
- });
- return;
- }
-
- // update the global changeset cache with the downloaded changesets.
- // this will trigger change events which views are listening to. They
- // will update their views accordingly.
- //
- // Run on the EDT because UI updates are triggered.
- //
- Runnable r = new Runnable() {
- @Override public void run() {
- ChangesetCache.getInstance().update(downloadedChangesets);
- }
- };
- if (SwingUtilities.isEventDispatchThread()) {
- r.run();
- } else {
- try {
- SwingUtilities.invokeAndWait(r);
- } catch (InterruptedException e) {
- Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
- } catch (InvocationTargetException e) {
- Throwable t = e.getTargetException();
- if (t instanceof RuntimeException) {
- BugReportExceptionHandler.handleException(t);
- } else if (t instanceof Exception) {
- ExceptionUtil.explainException(e);
- } else {
- BugReportExceptionHandler.handleException(t);
- }
- }
- }
- }
-
- /**
- * Tries to fully identify the current JOSM user
- *
- * @throws OsmTransferException if something went wrong
- */
- protected void fullyIdentifyCurrentUser() throws OsmTransferException {
- getProgressMonitor().indeterminateSubTask(tr("Determine user id for current user..."));
-
- synchronized (this) {
- userInfoReader = new OsmServerUserInfoReader();
- }
- UserInfo info = userInfoReader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
- synchronized (this) {
- userInfoReader = null;
- }
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
- im.setFullyIdentified(im.getUserName(), info);
- }
-
- @Override
- protected void realRun() throws SAXException, IOException, OsmTransferException {
- try {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
- if (query.isRestrictedToPartiallyIdentifiedUser() && im.isCurrentUser(query.getUserName())) {
- // if we query changesets for the current user, make sure we query against
- // its user id, not its user name. If necessary, determine the user id first.
- //
- if (im.isPartiallyIdentified()) {
- fullyIdentifyCurrentUser();
- }
- query = query.forUser(JosmUserIdentityManager.getInstance().getUserId());
- }
- if (canceled) return;
- getProgressMonitor().indeterminateSubTask(tr("Query and download changesets ..."));
- synchronized (this) {
- changesetReader = new OsmServerChangesetReader();
- }
- downloadedChangesets = new HashSet<>();
- downloadedChangesets.addAll(changesetReader.queryChangesets(query, getProgressMonitor().createSubTaskMonitor(0, false)));
- synchronized (this) {
- changesetReader = null;
- }
- } catch (OsmTransferCanceledException e) {
- // thrown if user cancel the authentication dialog
- canceled = true;
- } catch (OsmTransferException e) {
- if (canceled)
- return;
- this.lastException = e;
- }
- }
-
- /* ------------------------------------------------------------------------------- */
- /* interface ChangesetDownloadTask */
- /* ------------------------------------------------------------------------------- */
- @Override
- public Set<Changeset> getDownloadedChangesets() {
- return downloadedChangesets;
- }
-
- @Override
- public boolean isCanceled() {
- return canceled;
- }
-
- @Override
- public boolean isFailed() {
- return lastException != null;
- }
-}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java
new file mode 100644
index 0000000..ad661ea
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java
@@ -0,0 +1,139 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.MultikeyShortcutAction;
+import org.openstreetmap.josm.tools.Shortcut;
+
+/**
+ * The action to activate the currently selected layer
+ */
+public final class ActivateLayerAction extends AbstractAction
+implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction {
+ private transient Layer layer;
+ private transient Shortcut multikeyShortcut;
+ private final LayerListModel model;
+
+ /**
+ * Constructs a new {@code ActivateLayerAction}.
+ * @param layer the layer
+ * @param model layer list model
+ */
+ public ActivateLayerAction(Layer layer, LayerListModel model) {
+ this(model);
+ CheckParameterUtil.ensureParameterNotNull(layer, "layer");
+ this.layer = layer;
+ putValue(NAME, tr("Activate"));
+ updateEnabledState();
+ }
+
+ /**
+ * Constructs a new {@code ActivateLayerAction}.
+ * @param model layer list model
+ */
+ public ActivateLayerAction(LayerListModel model) {
+ this.model = model;
+ putValue(NAME, tr("Activate"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate"));
+ putValue(SHORT_DESCRIPTION, tr("Activate the selected layer"));
+ multikeyShortcut = Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
+ tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT);
+ multikeyShortcut.setAccelerator(this);
+ putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer"));
+ }
+
+ @Override
+ public Shortcut getMultikeyShortcut() {
+ return multikeyShortcut;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Layer toActivate;
+ if (layer != null) {
+ toActivate = layer;
+ } else {
+ toActivate = model.getSelectedLayers().get(0);
+ }
+ execute(toActivate);
+ }
+
+ private void execute(Layer layer) {
+ // model is going to be updated via LayerChangeListener and PropertyChangeEvents
+ Main.map.mapView.setActiveLayer(layer);
+ layer.setVisible(true);
+ }
+
+ protected boolean isActiveLayer(Layer layer) {
+ if (!Main.isDisplayingMapView())
+ return false;
+ return Main.map.mapView.getActiveLayer() == layer;
+ }
+
+ @Override
+ public void updateEnabledState() {
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override
+ public void run() {
+ if (layer == null) {
+ if (model.getSelectedLayers().size() != 1) {
+ setEnabled(false);
+ return;
+ }
+ setEnabled(!isActiveLayer(model.getSelectedLayers().get(0)));
+ } else {
+ setEnabled(!isActiveLayer(layer));
+ }
+ }
+ });
+ }
+
+ @Override
+ public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+ updateEnabledState();
+ }
+
+ @Override
+ public void layerAdded(Layer newLayer) {
+ updateEnabledState();
+ }
+
+ @Override
+ public void layerRemoved(Layer oldLayer) {
+ updateEnabledState();
+ }
+
+ @Override
+ public void executeMultikeyAction(int index, boolean repeat) {
+ Layer l = LayerListDialog.getLayerForIndex(index);
+ if (l != null) {
+ execute(l);
+ }
+ }
+
+ @Override
+ public List<MultikeyInfo> getMultikeyCombinations() {
+ return LayerListDialog.getLayerInfoByClass(Layer.class);
+ }
+
+ @Override
+ public MultikeyInfo getLastMultikeyAction() {
+ return null; // Repeating action doesn't make much sense for activating
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java
new file mode 100644
index 0000000..d59a0c1
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java
@@ -0,0 +1,76 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+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.JMenuItem;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * The action to delete the currently selected layer
+ */
+public final class DeleteLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
+
+ private final LayerListModel model;
+
+ /**
+ * Creates a {@link DeleteLayerAction} which will delete the currently selected layers in the layer dialog.
+ * @param model layer list model
+ */
+ public DeleteLayerAction(LayerListModel model) {
+ this.model = model;
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+ putValue(SHORT_DESCRIPTION, tr("Delete the selected layers."));
+ putValue(NAME, tr("Delete"));
+ putValue("help", HelpUtil.ht("/Dialog/LayerList#DeleteLayer"));
+ updateEnabledState();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ List<Layer> selectedLayers = model.getSelectedLayers();
+ if (selectedLayers.isEmpty())
+ return;
+ if (!Main.saveUnsavedModifications(selectedLayers, false))
+ return;
+ for (Layer l: selectedLayers) {
+ Main.main.removeLayer(l);
+ }
+ }
+
+ @Override
+ public void updateEnabledState() {
+ setEnabled(!model.getSelectedLayers().isEmpty());
+ }
+
+ @Override
+ public Component createMenuComponent() {
+ return new JMenuItem(this);
+ }
+
+ @Override
+ public boolean supportLayers(List<Layer> layers) {
+ return true;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof DeleteLayerAction;
+ }
+
+ @Override
+ public int hashCode() {
+ return getClass().hashCode();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java
new file mode 100644
index 0000000..c7f16d3
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java
@@ -0,0 +1,96 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * The action to merge the currently selected layer into another layer.
+ */
+public final class DuplicateAction extends AbstractAction implements IEnabledStateUpdating {
+ private transient Layer layer;
+ private final LayerListModel model;
+
+ /**
+ * Constructs a new {@code DuplicateAction}.
+ * @param layer the layer
+ * @param model layer list model
+ * @throws IllegalArgumentException if {@code layer} is null
+ */
+ public DuplicateAction(Layer layer, LayerListModel model) {
+ this(model);
+ CheckParameterUtil.ensureParameterNotNull(layer, "layer");
+ this.layer = layer;
+ updateEnabledState();
+ }
+
+ /**
+ * Constructs a new {@code DuplicateAction}.
+ * @param model layer list model
+ */
+ public DuplicateAction(LayerListModel model) {
+ this.model = model;
+ putValue(NAME, tr("Duplicate"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "duplicatelayer"));
+ putValue(SHORT_DESCRIPTION, tr("Duplicate this layer"));
+ putValue("help", HelpUtil.ht("/Dialog/LayerList#DuplicateLayer"));
+ updateEnabledState();
+ }
+
+ private void duplicate(Layer layer) {
+ if (!Main.isDisplayingMapView())
+ return;
+
+ List<String> layerNames = new ArrayList<>();
+ for (Layer l: Main.map.mapView.getAllLayers()) {
+ layerNames.add(l.getName());
+ }
+ if (layer instanceof OsmDataLayer) {
+ OsmDataLayer oldLayer = (OsmDataLayer) layer;
+ // Translators: "Copy of {layer name}"
+ String newName = tr("Copy of {0}", oldLayer.getName());
+ int i = 2;
+ while (layerNames.contains(newName)) {
+ // Translators: "Copy {number} of {layer name}"
+ newName = tr("Copy {1} of {0}", oldLayer.getName(), i);
+ i++;
+ }
+ Main.main.addLayer(new OsmDataLayer(oldLayer.data.clone(), newName, null));
+ }
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (layer != null) {
+ duplicate(layer);
+ } else {
+ duplicate(model.getSelectedLayers().get(0));
+ }
+ }
+
+ @Override
+ public void updateEnabledState() {
+ if (layer == null) {
+ if (model.getSelectedLayers().size() == 1) {
+ setEnabled(model.getSelectedLayers().get(0) instanceof OsmDataLayer);
+ } else {
+ setEnabled(false);
+ }
+ } else {
+ setEnabled(layer instanceof OsmDataLayer);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/IEnabledStateUpdating.java b/src/org/openstreetmap/josm/gui/dialogs/layer/IEnabledStateUpdating.java
new file mode 100644
index 0000000..d27b403
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/IEnabledStateUpdating.java
@@ -0,0 +1,13 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+/**
+ * To be implemented by actions for which their enabled state depends on another model.
+ */
+public interface IEnabledStateUpdating {
+
+ /**
+ * Called after the layer model has changed.
+ */
+ void updateEnabledState();
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
new file mode 100644
index 0000000..1355831
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
@@ -0,0 +1,437 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JSlider;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * This is a menu that includes all settings for the layer visibility. It combines gamma/opacity sliders and the visible-checkbox.
+ *
+ * @author Michael Zangl
+ */
+public final class LayerVisibilityAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
+ protected static final int SLIDER_STEPS = 100;
+ private static final double MAX_SHARPNESS_FACTOR = 2;
+ private static final double MAX_COLORFUL_FACTOR = 2;
+ private final LayerListModel model;
+ private final JPopupMenu popup;
+ private SideButton sideButton;
+ private JCheckBox visibilityCheckbox;
+ final OpacitySlider opacitySlider = new OpacitySlider();
+ private final ArrayList<FilterSlider<?>> sliders = new ArrayList<>();
+
+ /**
+ * Creates a new {@link LayerVisibilityAction}
+ * @param model The list to get the selection from.
+ */
+ public LayerVisibilityAction(LayerListModel model) {
+ this.model = model;
+ popup = new JPopupMenu();
+
+ // just to add a border
+ JPanel content = new JPanel();
+ popup.add(content);
+ content.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ content.setLayout(new GridBagLayout());
+
+ putValue(SMALL_ICON, ImageProvider.get("dialogs/layerlist", "visibility"));
+ putValue(SHORT_DESCRIPTION, tr("Change visibility of the selected layer."));
+
+ visibilityCheckbox = new JCheckBox(tr("Show layer"));
+ visibilityCheckbox.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ setVisibleFlag(visibilityCheckbox.isSelected());
+ }
+ });
+ content.add(visibilityCheckbox, GBC.eop());
+
+ addSlider(content, opacitySlider);
+ addSlider(content, new ColorfulnessSlider());
+ addSlider(content, new GammaFilterSlider());
+ addSlider(content, new SharpnessSlider());
+ }
+
+ private void addSlider(JPanel content, FilterSlider<?> slider) {
+ content.add(new JLabel(slider.getIcon()), GBC.std().span(1, 2).insets(0, 0, 5, 0));
+ content.add(new JLabel(slider.getLabel()), GBC.eol());
+ content.add(slider, GBC.eop());
+ sliders.add(slider);
+ }
+
+ protected void setVisibleFlag(boolean visible) {
+ for (Layer l : model.getSelectedLayers()) {
+ l.setVisible(visible);
+ }
+ updateValues();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ updateValues();
+ if (e.getSource() == sideButton) {
+ popup.show(sideButton, 0, sideButton.getHeight());
+ } else {
+ // Action can be trigger either by opacity button or by popup menu (in case toggle buttons are hidden).
+ // In that case, show it in the middle of screen (because opacityButton is not visible)
+ popup.show(Main.parent, Main.parent.getWidth() / 2, (Main.parent.getHeight() - popup.getHeight()) / 2);
+ }
+ }
+
+ protected void updateValues() {
+ List<Layer> layers = model.getSelectedLayers();
+
+ visibilityCheckbox.setEnabled(!layers.isEmpty());
+ boolean allVisible = true;
+ boolean allHidden = true;
+ for (Layer l : layers) {
+ allVisible &= l.isVisible();
+ allHidden &= !l.isVisible();
+ }
+ // TODO: Indicate tristate.
+ visibilityCheckbox.setSelected(allVisible && !allHidden);
+
+ for (FilterSlider<?> slider : sliders) {
+ slider.updateSlider(layers, allHidden);
+ }
+ }
+
+ @Override
+ public boolean supportLayers(List<Layer> layers) {
+ return !layers.isEmpty();
+ }
+
+ @Override
+ public Component createMenuComponent() {
+ return new JMenuItem(this);
+ }
+
+ @Override
+ public void updateEnabledState() {
+ setEnabled(!model.getSelectedLayers().isEmpty());
+ }
+
+ /**
+ * Sets the corresponding side button.
+ * @param sideButton the corresponding side button
+ */
+ public void setCorrespondingSideButton(SideButton sideButton) {
+ this.sideButton = sideButton;
+ }
+
+ /**
+ * This is a slider for a filter value.
+ * @author Michael Zangl
+ *
+ * @param <T> The layer type.
+ */
+ private abstract class FilterSlider<T extends Layer> extends JSlider {
+ private final double minValue;
+ private final double maxValue;
+ private final Class<T> layerClassFilter;
+
+ /**
+ * Create a new filter slider.
+ * @param minValue The minimum value to map to the left side.
+ * @param maxValue The maximum value to map to the right side.
+ * @param layerClassFilter The type of layer influenced by this filter.
+ */
+ FilterSlider(double minValue, double maxValue, Class<T> layerClassFilter) {
+ super(JSlider.HORIZONTAL);
+ this.minValue = minValue;
+ this.maxValue = maxValue;
+ this.layerClassFilter = layerClassFilter;
+ setMaximum(SLIDER_STEPS);
+ int tick = convertFromRealValue(1);
+ setMinorTickSpacing(tick);
+ setMajorTickSpacing(tick);
+ setPaintTicks(true);
+
+ addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ onStateChanged();
+ }
+ });
+ }
+
+ /**
+ * Called whenever the state of the slider was changed.
+ * @see #getValueIsAdjusting()
+ * @see #getRealValue()
+ */
+ protected void onStateChanged() {
+ Collection<T> layers = filterLayers(model.getSelectedLayers());
+ for (T layer : layers) {
+ applyValueToLayer(layer);
+ }
+ }
+
+ protected void applyValueToLayer(T layer) {
+ }
+
+ protected double getRealValue() {
+ return convertToRealValue(getValue());
+ }
+
+ protected double convertToRealValue(int value) {
+ double s = (double) value / SLIDER_STEPS;
+ return s * maxValue + (1-s) * minValue;
+ }
+
+ protected void setRealValue(double value) {
+ setValue(convertFromRealValue(value));
+ }
+
+ protected int convertFromRealValue(double value) {
+ int i = (int) ((value - minValue) / (maxValue - minValue) * SLIDER_STEPS + .5);
+ if (i < getMinimum()) {
+ return getMinimum();
+ } else if (i > getMaximum()) {
+ return getMaximum();
+ } else {
+ return i;
+ }
+ }
+
+ public abstract ImageIcon getIcon();
+
+ public abstract String getLabel();
+
+ public void updateSlider(List<Layer> layers, boolean allHidden) {
+ Collection<? extends Layer> usedLayers = filterLayers(layers);
+ if (usedLayers.isEmpty() || allHidden) {
+ setEnabled(false);
+ } else {
+ setEnabled(true);
+ updateSliderWhileEnabled(usedLayers, allHidden);
+ }
+ }
+
+ protected Collection<T> filterLayers(List<Layer> layers) {
+ return Utils.filteredCollection(layers, layerClassFilter);
+ }
+
+ protected abstract void updateSliderWhileEnabled(Collection<? extends Layer> usedLayers, boolean allHidden);
+ }
+
+ /**
+ * This slider allows you to change the opacity of a layer.
+ *
+ * @author Michael Zangl
+ * @see Layer#setOpacity(double)
+ */
+ class OpacitySlider extends FilterSlider<Layer> {
+ /**
+ * Creaate a new {@link OpacitySlider}.
+ */
+ OpacitySlider() {
+ super(0, 1, Layer.class);
+ setToolTipText(tr("Adjust opacity of the layer."));
+ }
+
+ @Override
+ protected void onStateChanged() {
+ if (getRealValue() <= 0.001 && !getValueIsAdjusting()) {
+ setVisibleFlag(false);
+ } else {
+ super.onStateChanged();
+ }
+ }
+
+ @Override
+ protected void applyValueToLayer(Layer layer) {
+ layer.setOpacity(getRealValue());
+ }
+
+ @Override
+ protected void updateSliderWhileEnabled(Collection<? extends Layer> usedLayers, boolean allHidden) {
+ double opacity = 0;
+ for (Layer l : usedLayers) {
+ opacity += l.getOpacity();
+ }
+ opacity /= usedLayers.size();
+ if (opacity == 0) {
+ opacity = 1;
+ setVisibleFlag(true);
+ }
+ setRealValue(opacity);
+ }
+
+ @Override
+ public String getLabel() {
+ return tr("Opacity");
+ }
+
+ @Override
+ public ImageIcon getIcon() {
+ return ImageProvider.get("dialogs/layerlist", "transparency");
+ }
+
+ @Override
+ public String toString() {
+ return "OpacitySlider [getRealValue()=" + getRealValue() + "]";
+ }
+ }
+
+ /**
+ * This slider allows you to change the gamma value of a layer.
+ *
+ * @author Michael Zangl
+ * @see ImageryLayer#setGamma(double)
+ */
+ private class GammaFilterSlider extends FilterSlider<ImageryLayer> {
+
+ /**
+ * Create a new {@link GammaFilterSlider}
+ */
+ GammaFilterSlider() {
+ super(-1, 1, ImageryLayer.class);
+ setToolTipText(tr("Adjust gamma value of the layer."));
+ }
+
+ @Override
+ protected void updateSliderWhileEnabled(Collection<? extends Layer> usedLayers, boolean allHidden) {
+ double gamma = ((ImageryLayer) usedLayers.iterator().next()).getGamma();
+ setRealValue(mapGammaToInterval(gamma));
+ }
+
+ @Override
+ protected void applyValueToLayer(ImageryLayer layer) {
+ layer.setGamma(mapIntervalToGamma(getRealValue()));
+ }
+
+ @Override
+ public ImageIcon getIcon() {
+ return ImageProvider.get("dialogs/layerlist", "gamma");
+ }
+
+ @Override
+ public String getLabel() {
+ return tr("Gamma");
+ }
+
+ /**
+ * Maps a number x from the range (-1,1) to a gamma value.
+ * Gamma value is in the range (0, infinity).
+ * Gamma values of 3 and 1/3 have opposite effects, so the mapping
+ * should be symmetric in that sense.
+ * @param x the slider value in the range (-1,1)
+ * @return the gamma value
+ */
+ private double mapIntervalToGamma(double x) {
+ // properties of the mapping:
+ // g(-1) = 0
+ // g(0) = 1
+ // g(1) = infinity
+ // g(-x) = 1 / g(x)
+ return (1 + x) / (1 - x);
+ }
+
+ private double mapGammaToInterval(double gamma) {
+ return (gamma - 1) / (gamma + 1);
+ }
+ }
+
+ /**
+ * This slider allows you to change the sharpness of a layer.
+ *
+ * @author Michael Zangl
+ * @see ImageryLayer#setSharpenLevel(double)
+ */
+ private class SharpnessSlider extends FilterSlider<ImageryLayer> {
+
+ /**
+ * Creates a new {@link SharpnessSlider}
+ */
+ SharpnessSlider() {
+ super(0, MAX_SHARPNESS_FACTOR, ImageryLayer.class);
+ setToolTipText(tr("Adjust sharpness/blur value of the layer."));
+ }
+
+ @Override
+ protected void updateSliderWhileEnabled(Collection<? extends Layer> usedLayers, boolean allHidden) {
+ setRealValue(((ImageryLayer) usedLayers.iterator().next()).getSharpenLevel());
+ }
+
+ @Override
+ protected void applyValueToLayer(ImageryLayer layer) {
+ layer.setSharpenLevel(getRealValue());
+ }
+
+ @Override
+ public ImageIcon getIcon() {
+ return ImageProvider.get("dialogs/layerlist", "sharpness");
+ }
+
+ @Override
+ public String getLabel() {
+ return tr("Sharpness");
+ }
+ }
+
+ /**
+ * This slider allows you to change the colorfulness of a layer.
+ *
+ * @author Michael Zangl
+ * @see ImageryLayer#setColorfulness(double)
+ */
+ private class ColorfulnessSlider extends FilterSlider<ImageryLayer> {
+
+ /**
+ * Create a new {@link ColorfulnessSlider}
+ */
+ ColorfulnessSlider() {
+ super(0, MAX_COLORFUL_FACTOR, ImageryLayer.class);
+ setToolTipText(tr("Adjust colorfulness of the layer."));
+ }
+
+ @Override
+ protected void updateSliderWhileEnabled(Collection<? extends Layer> usedLayers, boolean allHidden) {
+ setRealValue(((ImageryLayer) usedLayers.iterator().next()).getColorfulness());
+ }
+
+ @Override
+ protected void applyValueToLayer(ImageryLayer layer) {
+ layer.setColorfulness(getRealValue());
+ }
+
+ @Override
+ public ImageIcon getIcon() {
+ return ImageProvider.get("dialogs/layerlist", "colorfulness");
+ }
+
+ @Override
+ public String getLabel() {
+ return tr("Colorfulness");
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java
new file mode 100644
index 0000000..9c55240
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java
@@ -0,0 +1,124 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+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.JMenuItem;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * The action to merge the currently selected layer into another layer.
+ */
+public final class MergeAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, Layer.MultiLayerAction {
+ private transient Layer layer;
+ private transient List<Layer> layers;
+ private final LayerListModel model;
+
+ /**
+ * Constructs a new {@code MergeAction}.
+ * @param layer the layer
+ * @param model layer list model
+ * @throws IllegalArgumentException if {@code layer} is null
+ */
+ public MergeAction(Layer layer, LayerListModel model) {
+ this(layer, null, model);
+ CheckParameterUtil.ensureParameterNotNull(layer, "layer");
+ }
+
+ /**
+ * Constructs a new {@code MergeAction}.
+ * @param layers the layer list
+ * @param model layer list model
+ * @throws IllegalArgumentException if {@code layers} is null
+ */
+ public MergeAction(List<Layer> layers, LayerListModel model) {
+ this(null, layers, model);
+ CheckParameterUtil.ensureParameterNotNull(layers, "layers");
+ }
+
+ /**
+ * Constructs a new {@code MergeAction}.
+ * @param layer the layer (null if layer list if specified)
+ * @param layers the layer list (null if a single layer is specified)
+ * @param model layer list model
+ */
+ private MergeAction(Layer layer, List<Layer> layers, LayerListModel model) {
+ this.layer = layer;
+ this.layers = layers;
+ this.model = model;
+ putValue(NAME, tr("Merge"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "mergedown"));
+ putValue(SHORT_DESCRIPTION, tr("Merge this layer into another layer"));
+ putValue("help", HelpUtil.ht("/Dialog/LayerList#MergeLayer"));
+ updateEnabledState();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (layer != null) {
+ Main.main.menu.merge.merge(layer);
+ } else if (layers != null) {
+ Main.main.menu.merge.merge(layers);
+ } else {
+ if (model.getSelectedLayers().size() == 1) {
+ Layer selectedLayer = model.getSelectedLayers().get(0);
+ Main.main.menu.merge.merge(selectedLayer);
+ } else {
+ Main.main.menu.merge.merge(model.getSelectedLayers());
+ }
+ }
+ }
+
+ @Override
+ public void updateEnabledState() {
+ if (layer == null && layers == null) {
+ if (model.getSelectedLayers().isEmpty()) {
+ setEnabled(false);
+ } else if (model.getSelectedLayers().size() > 1) {
+ setEnabled(supportLayers(model.getSelectedLayers()));
+ } else {
+ Layer selectedLayer = model.getSelectedLayers().get(0);
+ List<Layer> targets = model.getPossibleMergeTargets(selectedLayer);
+ setEnabled(!targets.isEmpty());
+ }
+ } else if (layer != null) {
+ List<Layer> targets = model.getPossibleMergeTargets(layer);
+ setEnabled(!targets.isEmpty());
+ } else {
+ setEnabled(supportLayers(layers));
+ }
+ }
+
+ @Override
+ public boolean supportLayers(List<Layer> layers) {
+ if (layers.isEmpty()) {
+ return false;
+ } else {
+ final Layer firstLayer = layers.get(0);
+ final List<Layer> remainingLayers = layers.subList(1, layers.size());
+ return model.getPossibleMergeTargets(firstLayer).containsAll(remainingLayers);
+ }
+ }
+
+ @Override
+ public Component createMenuComponent() {
+ return new JMenuItem(this);
+ }
+
+ @Override
+ public MergeAction getMultiLayerAction(List<Layer> layers) {
+ return new MergeAction(layers, model);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/MoveDownAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/MoveDownAction.java
new file mode 100644
index 0000000..efef0ee
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/MoveDownAction.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * The action to move down the currently selected entries in the list.
+ */
+public class MoveDownAction extends AbstractAction implements IEnabledStateUpdating {
+ private final LayerListModel model;
+
+ /**
+ * Constructs a new {@code MoveDownAction}.
+ * @param model layer list model
+ */
+ public MoveDownAction(LayerListModel model) {
+ this.model = model;
+ putValue(NAME, tr("Move down"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "down"));
+ putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row down."));
+ updateEnabledState();
+ }
+
+ @Override
+ public void updateEnabledState() {
+ setEnabled(model.canMoveDown());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ model.moveDown();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java
new file mode 100644
index 0000000..f0fb14a
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * The action to move up the currently selected entries in the list.
+ */
+public class MoveUpAction extends AbstractAction implements IEnabledStateUpdating {
+ private final LayerListModel model;
+
+ /**
+ * Constructs a new {@code MoveUpAction}.
+ * @param model layer list model
+ */
+ public MoveUpAction(LayerListModel model) {
+ this.model = model;
+ putValue(NAME, tr("Move up"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "up"));
+ putValue(SHORT_DESCRIPTION, tr("Move the selected layer one row up."));
+ updateEnabledState();
+ }
+
+ @Override
+ public void updateEnabledState() {
+ setEnabled(model.canMoveUp());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ model.moveUp();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/ShowHideLayerAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/ShowHideLayerAction.java
new file mode 100644
index 0000000..2b66cf6
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/ShowHideLayerAction.java
@@ -0,0 +1,111 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.JMenuItem;
+
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.MultikeyShortcutAction;
+import org.openstreetmap.josm.tools.Shortcut;
+
+/**
+ * Action which will toggle the visibility of the currently selected layers.
+ */
+public final class ShowHideLayerAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, MultikeyShortcutAction {
+
+ private transient WeakReference<Layer> lastLayer;
+ private final transient Shortcut multikeyShortcut;
+ private final LayerListModel model;
+
+ /**
+ * Creates a {@link ShowHideLayerAction} which will toggle the visibility of the currently selected layers
+ * @param model layer list model
+ */
+ public ShowHideLayerAction(LayerListModel model) {
+ this.model = model;
+ putValue(NAME, tr("Show/hide"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "showhide"));
+ putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer."));
+ putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer"));
+ multikeyShortcut = Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
+ tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT);
+ multikeyShortcut.setAccelerator(this);
+ updateEnabledState();
+ }
+
+ @Override
+ public Shortcut getMultikeyShortcut() {
+ return multikeyShortcut;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ for (Layer l : model.getSelectedLayers()) {
+ l.toggleVisible();
+ }
+ }
+
+ @Override
+ public void executeMultikeyAction(int index, boolean repeat) {
+ Layer l = LayerListDialog.getLayerForIndex(index);
+ if (l != null) {
+ l.toggleVisible();
+ lastLayer = new WeakReference<>(l);
+ } else if (repeat && lastLayer != null) {
+ l = lastLayer.get();
+ if (LayerListDialog.isLayerValid(l)) {
+ l.toggleVisible();
+ }
+ }
+ }
+
+ @Override
+ public void updateEnabledState() {
+ setEnabled(!model.getSelectedLayers().isEmpty());
+ }
+
+ @Override
+ public Component createMenuComponent() {
+ return new JMenuItem(this);
+ }
+
+ @Override
+ public boolean supportLayers(List<Layer> layers) {
+ return true;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof ShowHideLayerAction;
+ }
+
+ @Override
+ public int hashCode() {
+ return getClass().hashCode();
+ }
+
+ @Override
+ public List<MultikeyInfo> getMultikeyCombinations() {
+ return LayerListDialog.getLayerInfoByClass(Layer.class);
+ }
+
+ @Override
+ public MultikeyInfo getLastMultikeyAction() {
+ if (lastLayer != null)
+ return LayerListDialog.getLayerInfo(lastLayer.get());
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/package-info.java b/src/org/openstreetmap/josm/gui/dialogs/layer/package-info.java
new file mode 100644
index 0000000..23f03d9
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Toggle dialog allowing to display the list of layers.
+ */
+package org.openstreetmap.josm.gui.dialogs.layer;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
index 4363997..7eb11e4 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
@@ -30,7 +30,7 @@ public class PropertiesCellRenderer extends DefaultTableCellRenderer {
private final Collection<TableCellRenderer> customRenderer = new CopyOnWriteArrayList<>();
- private void setColors(Component c, String key, boolean isSelected) {
+ private static void setColors(Component c, String key, boolean isSelected) {
UIDefaults defaults = javax.swing.UIManager.getDefaults();
if (OsmPrimitive.getDiscardableKeys().contains(key)) {
if (isSelected) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index a19d093..cd50289 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -229,14 +229,17 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
+ tr("Select objects for which to change tags.") + "</p></html>");
private final transient TaggingPresetHandler presetHandler = new TaggingPresetHandler() {
- @Override public void updateTags(List<Tag> tags) {
+ @Override
+ public void updateTags(List<Tag> tags) {
Command command = TaggingPreset.createCommand(getSelection(), tags);
- if (command != null) Main.main.undoRedo.add(command);
+ if (command != null) {
+ Main.main.undoRedo.add(command);
+ }
}
- @Override public Collection<OsmPrimitive> getSelection() {
- if (Main.main == null) return null;
- return Main.main.getInProgressSelection();
+ @Override
+ public Collection<OsmPrimitive> getSelection() {
+ return Main.main == null ? Collections.<OsmPrimitive>emptyList() : Main.main.getInProgressSelection();
}
};
@@ -565,7 +568,7 @@ implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetLis
).setVisible(true);
}
- private int findViewRow(JTable table, TableModel model, Object value) {
+ private static int findViewRow(JTable table, TableModel model, Object value) {
for (int i = 0; i < model.getRowCount(); i++) {
if (model.getValueAt(i, 0).equals(value))
return table.convertRowIndexToView(i);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java b/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java
index 2492f65..cf83ca8 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java
@@ -25,7 +25,7 @@ class RecentTagCollection {
return size() > capacity;
}
};
- tagsToIgnore = new SearchCompiler.Never();
+ tagsToIgnore = SearchCompiler.Never.INSTANCE;
}
public void loadFromPreference(CollectionProperty property) {
@@ -72,7 +72,7 @@ class RecentTagCollection {
}
public void setTagsToIgnore(SearchAction.SearchSetting tagsToIgnore) throws SearchCompiler.ParseError {
- setTagsToIgnore(tagsToIgnore.text.isEmpty() ? new SearchCompiler.Never() : SearchCompiler.compile(tagsToIgnore));
+ setTagsToIgnore(tagsToIgnore.text.isEmpty() ? SearchCompiler.Never.INSTANCE : SearchCompiler.compile(tagsToIgnore));
}
public SearchAction.SearchSetting ignoreTag(Tag tagToIgnore, SearchAction.SearchSetting settingToUpdate) throws SearchCompiler.ParseError {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
index 4f25573..a926658 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -309,12 +309,12 @@ public class TagEditHelper {
} catch (SearchCompiler.ParseError parseError) {
warnAboutParseError(parseError);
tagsToIgnore = new SearchAction.SearchSetting();
- recentTags.setTagsToIgnore(new SearchCompiler.Never());
+ recentTags.setTagsToIgnore(SearchCompiler.Never.INSTANCE);
}
}
}
- private void warnAboutParseError(SearchCompiler.ParseError parseError) {
+ private static void warnAboutParseError(SearchCompiler.ParseError parseError) {
Main.warn(parseError);
JOptionPane.showMessageDialog(
Main.parent,
@@ -588,7 +588,9 @@ public class TagEditHelper {
Transferable old = Utils.getTransferableContent(sysSel);
cb.requestFocusInWindow();
cb.getEditor().selectAll();
- sysSel.setContents(old, null);
+ if (old != null) {
+ sysSel.setContents(old, null);
+ }
} else {
cb.requestFocusInWindow();
cb.getEditor().selectAll();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index 2e0bc2a..2d7b026 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -10,6 +10,7 @@ import java.awt.FlowLayout;
import java.awt.GraphicsEnvironment;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
@@ -33,13 +34,14 @@ import javax.swing.InputMap;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
-import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JRootPane;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
+import javax.swing.JTable;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
import javax.swing.event.ChangeEvent;
@@ -109,36 +111,48 @@ public class GenericRelationEditor extends RelationEditor {
private final ReferringRelationsBrowser referrerBrowser;
private final ReferringRelationsBrowserModel referrerModel;
- /** the member table */
- private MemberTable memberTable;
+ /** the member table and its model */
+ private final MemberTable memberTable;
private final MemberTableModel memberTableModel;
- /** the model for the selection table */
- private SelectionTable selectionTable;
+ /** the selection table and its model */
+ private final SelectionTable selectionTable;
private final SelectionTableModel selectionTableModel;
- private AutoCompletingTextField tfRole;
+ private final AutoCompletingTextField tfRole;
- /** the menu item in the windows menu. Required to properly
- * hide on dialog close.
+ /**
+ * the menu item in the windows menu. Required to properly hide on dialog close.
*/
private JMenuItem windowMenuItem;
/**
- * Button for performing the {@link org.openstreetmap.josm.gui.dialogs.relation.actions.SortBelowAction}.
+ * The toolbar with the buttons on the left
*/
- private JButton sortBelowButton;
+ private final LeftButtonToolbar leftButtonToolbar;
/**
* Action for performing the {@link RefreshAction}
*/
- private RefreshAction refreshAction;
+ private final RefreshAction refreshAction;
/**
* Action for performing the {@link ApplyAction}
*/
- private ApplyAction applyAction;
+ private final ApplyAction applyAction;
+ /**
+ * Action for performing the {@link DuplicateRelationAction}
+ */
+ private final DuplicateRelationAction duplicateAction;
+ /**
+ * Action for performing the {@link DeleteCurrentRelationAction}
+ */
+ private final DeleteCurrentRelationAction deleteAction;
+ /**
+ * Action for performing the {@link OKAction}
+ */
+ private final OKAction okAction;
/**
* Action for performing the {@link CancelAction}
*/
- private CancelAction cancelAction;
+ private final CancelAction cancelAction;
/**
* Creates a new relation editor for the given relation. The relation will be saved if the user
@@ -183,7 +197,22 @@ public class GenericRelationEditor extends RelationEditor {
populateModels(relation);
tagEditorPanel.getModel().ensureOneTag();
- JSplitPane pane = buildSplitPane();
+ // setting up the member table
+ memberTable = new MemberTable(getLayer(), getRelation(), memberTableModel);
+ memberTable.addMouseListener(new MemberTableDblClickAdapter());
+ memberTableModel.addMemberModelListener(memberTable);
+
+ MemberRoleCellEditor ce = (MemberRoleCellEditor) memberTable.getColumnModel().getColumn(0).getCellEditor();
+ selectionTable = new SelectionTable(selectionTableModel, memberTableModel);
+ selectionTable.setRowHeight(ce.getEditor().getPreferredSize().height);
+
+ leftButtonToolbar = new LeftButtonToolbar(memberTable, memberTableModel, this);
+ tfRole = buildRoleTextField(this);
+
+ JSplitPane pane = buildSplitPane(
+ buildTagEditorPanel(tagEditorPanel),
+ buildMemberEditorPanel(memberTable, memberTableModel, selectionTable, selectionTableModel, this, leftButtonToolbar, tfRole),
+ this);
pane.setPreferredSize(new Dimension(100, 100));
JPanel pnl = new JPanel(new BorderLayout());
@@ -210,9 +239,18 @@ public class GenericRelationEditor extends RelationEditor {
}
);
- getContentPane().add(buildToolBar(), BorderLayout.NORTH);
+ refreshAction = new RefreshAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this);
+ applyAction = new ApplyAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this);
+ duplicateAction = new DuplicateRelationAction(memberTableModel, tagEditorPanel.getModel(), getLayer());
+ deleteAction = new DeleteCurrentRelationAction(getLayer(), this);
+ addPropertyChangeListener(deleteAction);
+
+ okAction = new OKAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole);
+ cancelAction = new CancelAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole);
+
+ getContentPane().add(buildToolBar(refreshAction, applyAction, duplicateAction, deleteAction), BorderLayout.NORTH);
getContentPane().add(tabbedPane, BorderLayout.CENTER);
- getContentPane().add(buildOkCancelButtonPanel(), BorderLayout.SOUTH);
+ getContentPane().add(buildOkCancelButtonPanel(okAction, cancelAction), BorderLayout.SOUTH);
setSize(findMaxDialogSize());
@@ -221,7 +259,7 @@ public class GenericRelationEditor extends RelationEditor {
new WindowAdapter() {
@Override
public void windowOpened(WindowEvent e) {
- cleanSelfReferences();
+ cleanSelfReferences(memberTableModel, getRelation());
}
@Override
@@ -230,11 +268,11 @@ public class GenericRelationEditor extends RelationEditor {
}
}
);
- registerCopyPasteAction(tagEditorPanel.getPasteAction(),
- "PASTE_TAGS",
- // CHECKSTYLE.OFF: LineLength
- Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).getKeyStroke());
- // CHECKSTYLE.ON: LineLength
+ // CHECKSTYLE.OFF: LineLength
+ registerCopyPasteAction(tagEditorPanel.getPasteAction(), "PASTE_TAGS",
+ Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).getKeyStroke(),
+ getRootPane(), memberTable, selectionTable);
+ // CHECKSTYLE.ON: LineLength
registerCopyPasteAction(new PasteMembersAction(memberTableModel, getLayer(), this) {
@Override
@@ -242,10 +280,10 @@ public class GenericRelationEditor extends RelationEditor {
super.actionPerformed(e);
tfRole.requestFocusInWindow();
}
- }, "PASTE_MEMBERS", Shortcut.getPasteKeyStroke());
+ }, "PASTE_MEMBERS", Shortcut.getPasteKeyStroke(), getRootPane(), memberTable, selectionTable);
registerCopyPasteAction(new CopyMembersAction(memberTableModel, getLayer(), this),
- "COPY_MEMBERS", Shortcut.getCopyKeyStroke());
+ "COPY_MEMBERS", Shortcut.getCopyKeyStroke(), getRootPane(), memberTable, selectionTable);
tagEditorPanel.setNextFocusComponent(memberTable);
selectionTable.setFocusable(false);
@@ -292,32 +330,34 @@ public class GenericRelationEditor extends RelationEditor {
/**
* Creates the toolbar
+ * @param refreshAction refresh action
+ * @param applyAction apply action
+ * @param duplicateAction duplicate action
+ * @param deleteAction delete action
*
* @return the toolbar
*/
- protected JToolBar buildToolBar() {
+ protected static JToolBar buildToolBar(RefreshAction refreshAction, ApplyAction applyAction,
+ DuplicateRelationAction duplicateAction, DeleteCurrentRelationAction deleteAction) {
JToolBar tb = new JToolBar();
tb.setFloatable(false);
- refreshAction = new RefreshAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this);
- applyAction = new ApplyAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this);
tb.add(refreshAction);
tb.add(applyAction);
- tb.add(new DuplicateRelationAction(memberTableModel, tagEditorPanel.getModel(), getLayer()));
- DeleteCurrentRelationAction deleteAction = new DeleteCurrentRelationAction(getLayer(), this);
- addPropertyChangeListener(deleteAction);
+ tb.add(duplicateAction);
tb.add(deleteAction);
return tb;
}
/**
* builds the panel with the OK and the Cancel button
+ * @param okAction OK action
+ * @param cancelAction Cancel action
*
* @return the panel with the OK and the Cancel button
*/
- protected JPanel buildOkCancelButtonPanel() {
+ protected static JPanel buildOkCancelButtonPanel(OKAction okAction, CancelAction cancelAction) {
JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
- pnl.add(new SideButton(new OKAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole)));
- cancelAction = new CancelAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole);
+ pnl.add(new SideButton(okAction));
pnl.add(new SideButton(cancelAction));
pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/RelationEditor"))));
return pnl;
@@ -325,10 +365,11 @@ public class GenericRelationEditor extends RelationEditor {
/**
* builds the panel with the tag editor
+ * @param tagEditorPanel tag editor panel
*
* @return the panel with the tag editor
*/
- protected JPanel buildTagEditorPanel() {
+ protected static JPanel buildTagEditorPanel(TagEditorPanel tagEditorPanel) {
JPanel pnl = new JPanel(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
@@ -353,17 +394,52 @@ public class GenericRelationEditor extends RelationEditor {
}
/**
+ * builds the role text field
+ * @param re relation editor
+ * @return the role text field
+ */
+ protected static AutoCompletingTextField buildRoleTextField(final IRelationEditor re) {
+ final AutoCompletingTextField tfRole = new AutoCompletingTextField(10);
+ tfRole.setToolTipText(tr("Enter a role and apply it to the selected relation members"));
+ tfRole.addFocusListener(new FocusAdapter() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ tfRole.selectAll();
+ }
+ });
+ tfRole.setAutoCompletionList(new AutoCompletionList());
+ tfRole.addFocusListener(
+ new FocusAdapter() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ AutoCompletionList list = tfRole.getAutoCompletionList();
+ if (list != null) {
+ list.clear();
+ re.getLayer().data.getAutoCompletionManager().populateWithMemberRoles(list, re.getRelation());
+ }
+ }
+ }
+ );
+ tfRole.setText(Main.pref.get("relation.editor.generic.lastrole", ""));
+ return tfRole;
+ }
+
+ /**
* builds the panel for the relation member editor
+ * @param memberTable member table
+ * @param memberTableModel member table model
+ * @param selectionTable selection table
+ * @param selectionTableModel selection table model
+ * @param re relation editor
+ * @param leftButtonToolbar left button toolbar
+ * @param tfRole role text field
*
* @return the panel for the relation member editor
*/
- protected JPanel buildMemberEditorPanel() {
+ protected static JPanel buildMemberEditorPanel(final MemberTable memberTable, MemberTableModel memberTableModel,
+ SelectionTable selectionTable, SelectionTableModel selectionTableModel, IRelationEditor re,
+ LeftButtonToolbar leftButtonToolbar, final AutoCompletingTextField tfRole) {
final JPanel pnl = new JPanel(new GridBagLayout());
- // setting up the member table
- memberTable = new MemberTable(getLayer(), getRelation(), memberTableModel);
- memberTable.addMouseListener(new MemberTableDblClickAdapter());
- memberTableModel.addMemberModelListener(memberTable);
-
final JScrollPane scrollPane = new JScrollPane(memberTable);
GridBagConstraints gc = new GridBagConstraints();
@@ -384,7 +460,7 @@ public class GenericRelationEditor extends RelationEditor {
gc.anchor = GridBagConstraints.NORTHWEST;
gc.weightx = 0.0;
gc.weighty = 1.0;
- pnl.add(buildLeftButtonPanel(), gc);
+ pnl.add(leftButtonToolbar, gc);
gc.gridx = 1;
gc.gridy = 1;
@@ -398,28 +474,6 @@ public class GenericRelationEditor extends RelationEditor {
// --- role editing
JPanel p3 = new JPanel(new FlowLayout(FlowLayout.LEFT));
p3.add(new JLabel(tr("Apply Role:")));
- tfRole = new AutoCompletingTextField(10);
- tfRole.setToolTipText(tr("Enter a role and apply it to the selected relation members"));
- tfRole.addFocusListener(new FocusAdapter() {
- @Override
- public void focusGained(FocusEvent e) {
- tfRole.selectAll();
- }
- });
- tfRole.setAutoCompletionList(new AutoCompletionList());
- tfRole.addFocusListener(
- new FocusAdapter() {
- @Override
- public void focusGained(FocusEvent e) {
- AutoCompletionList list = tfRole.getAutoCompletionList();
- if (list != null) {
- list.clear();
- getLayer().data.getAutoCompletionManager().populateWithMemberRoles(list, getRelation());
- }
- }
- }
- );
- tfRole.setText(Main.pref.get("relation.editor.generic.lastrole", ""));
p3.add(tfRole);
SetRoleAction setRoleAction = new SetRoleAction(memberTable, memberTableModel, tfRole);
memberTableModel.getSelectionModel().addListSelectionListener(setRoleAction);
@@ -467,27 +521,28 @@ public class GenericRelationEditor extends RelationEditor {
gc.anchor = GridBagConstraints.NORTHWEST;
gc.weightx = 0.0;
gc.weighty = 1.0;
- pnl2.add(buildSelectionControlButtonPanel(), gc);
+ pnl2.add(buildSelectionControlButtonToolbar(memberTable, memberTableModel, selectionTableModel, re), gc);
gc.gridx = 1;
gc.gridy = 1;
gc.weightx = 1.0;
gc.weighty = 1.0;
gc.fill = GridBagConstraints.BOTH;
- pnl2.add(buildSelectionTablePanel(), gc);
+ pnl2.add(buildSelectionTablePanel(selectionTable), gc);
final JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
splitPane.setLeftComponent(pnl);
splitPane.setRightComponent(pnl2);
splitPane.setOneTouchExpandable(false);
- addWindowListener(new WindowAdapter() {
- @Override
- public void windowOpened(WindowEvent e) {
- // has to be called when the window is visible, otherwise
- // no effect
- splitPane.setDividerLocation(0.6);
- }
- });
+ if (re instanceof Window) {
+ ((Window) re).addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowOpened(WindowEvent e) {
+ // has to be called when the window is visible, otherwise no effect
+ splitPane.setDividerLocation(0.6);
+ }
+ });
+ }
JPanel pnl3 = new JPanel(new BorderLayout());
pnl3.add(splitPane, BorderLayout.CENTER);
@@ -497,142 +552,158 @@ public class GenericRelationEditor extends RelationEditor {
/**
* builds the panel with the table displaying the currently selected primitives
+ * @param selectionTable selection table
*
* @return panel with current selection
*/
- protected JPanel buildSelectionTablePanel() {
+ protected static JPanel buildSelectionTablePanel(SelectionTable selectionTable) {
JPanel pnl = new JPanel(new BorderLayout());
- MemberRoleCellEditor ce = (MemberRoleCellEditor) memberTable.getColumnModel().getColumn(0).getCellEditor();
- selectionTable = new SelectionTable(selectionTableModel, new SelectionTableColumnModel(memberTableModel));
- selectionTable.setMemberTableModel(memberTableModel);
- selectionTable.setRowHeight(ce.getEditor().getPreferredSize().height);
pnl.add(new JScrollPane(selectionTable), BorderLayout.CENTER);
return pnl;
}
/**
* builds the {@link JSplitPane} which divides the editor in an upper and a lower half
+ * @param top top panel
+ * @param bottom bottom panel
+ * @param re relation editor
*
* @return the split panel
*/
- protected JSplitPane buildSplitPane() {
+ protected static JSplitPane buildSplitPane(JPanel top, JPanel bottom, IRelationEditor re) {
final JSplitPane pane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
- pane.setTopComponent(buildTagEditorPanel());
- pane.setBottomComponent(buildMemberEditorPanel());
+ pane.setTopComponent(top);
+ pane.setBottomComponent(bottom);
pane.setOneTouchExpandable(true);
- addWindowListener(new WindowAdapter() {
- @Override
- public void windowOpened(WindowEvent e) {
- // has to be called when the window is visible, otherwise no effect
- pane.setDividerLocation(0.3);
- }
- });
+ if (re instanceof Window) {
+ ((Window) re).addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowOpened(WindowEvent e) {
+ // has to be called when the window is visible, otherwise no effect
+ pane.setDividerLocation(0.3);
+ }
+ });
+ }
return pane;
}
/**
- * build the panel with the buttons on the left
- *
- * @return left button panel
+ * The toolbar with the buttons on the left
*/
- protected JToolBar buildLeftButtonPanel() {
- JToolBar tb = new JToolBar();
- tb.setOrientation(JToolBar.VERTICAL);
- tb.setFloatable(false);
-
- // -- move up action
- MoveUpAction moveUpAction = new MoveUpAction(memberTable, memberTableModel, "moveUp");
- memberTableModel.getSelectionModel().addListSelectionListener(moveUpAction);
- tb.add(moveUpAction);
-
- // -- move down action
- MoveDownAction moveDownAction = new MoveDownAction(memberTable, memberTableModel, "moveDown");
- memberTableModel.getSelectionModel().addListSelectionListener(moveDownAction);
- tb.add(moveDownAction);
-
- tb.addSeparator();
-
- // -- edit action
- EditAction editAction = new EditAction(memberTable, memberTableModel, getLayer());
- memberTableModel.getSelectionModel().addListSelectionListener(editAction);
- tb.add(editAction);
-
- // -- delete action
- RemoveAction removeSelectedAction = new RemoveAction(memberTable, memberTableModel, "removeSelected");
- memberTable.getSelectionModel().addListSelectionListener(removeSelectedAction);
- tb.add(removeSelectedAction);
-
- tb.addSeparator();
- // -- sort action
- SortAction sortAction = new SortAction(memberTable, memberTableModel);
- memberTableModel.addTableModelListener(sortAction);
- tb.add(sortAction);
- final SortBelowAction sortBelowAction = new SortBelowAction(memberTable, memberTableModel);
- memberTableModel.addTableModelListener(sortBelowAction);
- memberTableModel.getSelectionModel().addListSelectionListener(sortBelowAction);
- sortBelowButton = tb.add(sortBelowAction);
-
- // -- reverse action
- ReverseAction reverseAction = new ReverseAction(memberTable, memberTableModel);
- memberTableModel.addTableModelListener(reverseAction);
- tb.add(reverseAction);
-
- tb.addSeparator();
-
- // -- download action
- DownloadIncompleteMembersAction downloadIncompleteMembersAction = new DownloadIncompleteMembersAction(
- memberTable, memberTableModel, "downloadIncomplete", getLayer(), this);
- memberTable.getModel().addTableModelListener(downloadIncompleteMembersAction);
- tb.add(downloadIncompleteMembersAction);
-
- // -- download selected action
- DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = new DownloadSelectedIncompleteMembersAction(
- memberTable, memberTableModel, null, getLayer(), this);
- memberTable.getModel().addTableModelListener(downloadSelectedIncompleteMembersAction);
- memberTable.getSelectionModel().addListSelectionListener(downloadSelectedIncompleteMembersAction);
- tb.add(downloadSelectedIncompleteMembersAction);
-
- InputMap inputMap = memberTable.getInputMap(MemberTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
- inputMap.put((KeyStroke) removeSelectedAction.getValue(AbstractAction.ACCELERATOR_KEY), "removeSelected");
- inputMap.put((KeyStroke) moveUpAction.getValue(AbstractAction.ACCELERATOR_KEY), "moveUp");
- inputMap.put((KeyStroke) moveDownAction.getValue(AbstractAction.ACCELERATOR_KEY), "moveDown");
- inputMap.put((KeyStroke) downloadIncompleteMembersAction.getValue(AbstractAction.ACCELERATOR_KEY), "downloadIncomplete");
-
- return tb;
+ static class LeftButtonToolbar extends JToolBar {
+
+ /**
+ * Button for performing the {@link org.openstreetmap.josm.gui.dialogs.relation.actions.SortBelowAction}.
+ */
+ final JButton sortBelowButton;
+
+ /**
+ * Constructs a new {@code LeftButtonToolbar}.
+ * @param memberTable member table
+ * @param memberTableModel member table model
+ * @param re relation editor
+ */
+ LeftButtonToolbar(MemberTable memberTable, MemberTableModel memberTableModel, IRelationEditor re) {
+ setOrientation(JToolBar.VERTICAL);
+ setFloatable(false);
+
+ // -- move up action
+ MoveUpAction moveUpAction = new MoveUpAction(memberTable, memberTableModel, "moveUp");
+ memberTableModel.getSelectionModel().addListSelectionListener(moveUpAction);
+ add(moveUpAction);
+
+ // -- move down action
+ MoveDownAction moveDownAction = new MoveDownAction(memberTable, memberTableModel, "moveDown");
+ memberTableModel.getSelectionModel().addListSelectionListener(moveDownAction);
+ add(moveDownAction);
+
+ addSeparator();
+
+ // -- edit action
+ EditAction editAction = new EditAction(memberTable, memberTableModel, re.getLayer());
+ memberTableModel.getSelectionModel().addListSelectionListener(editAction);
+ add(editAction);
+
+ // -- delete action
+ RemoveAction removeSelectedAction = new RemoveAction(memberTable, memberTableModel, "removeSelected");
+ memberTable.getSelectionModel().addListSelectionListener(removeSelectedAction);
+ add(removeSelectedAction);
+
+ addSeparator();
+ // -- sort action
+ SortAction sortAction = new SortAction(memberTable, memberTableModel);
+ memberTableModel.addTableModelListener(sortAction);
+ add(sortAction);
+ final SortBelowAction sortBelowAction = new SortBelowAction(memberTable, memberTableModel);
+ memberTableModel.addTableModelListener(sortBelowAction);
+ memberTableModel.getSelectionModel().addListSelectionListener(sortBelowAction);
+ sortBelowButton = add(sortBelowAction);
+
+ // -- reverse action
+ ReverseAction reverseAction = new ReverseAction(memberTable, memberTableModel);
+ memberTableModel.addTableModelListener(reverseAction);
+ add(reverseAction);
+
+ addSeparator();
+
+ // -- download action
+ DownloadIncompleteMembersAction downloadIncompleteMembersAction = new DownloadIncompleteMembersAction(
+ memberTable, memberTableModel, "downloadIncomplete", re.getLayer(), re);
+ memberTable.getModel().addTableModelListener(downloadIncompleteMembersAction);
+ add(downloadIncompleteMembersAction);
+
+ // -- download selected action
+ DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = new DownloadSelectedIncompleteMembersAction(
+ memberTable, memberTableModel, null, re.getLayer(), re);
+ memberTable.getModel().addTableModelListener(downloadSelectedIncompleteMembersAction);
+ memberTable.getSelectionModel().addListSelectionListener(downloadSelectedIncompleteMembersAction);
+ add(downloadSelectedIncompleteMembersAction);
+
+ InputMap inputMap = memberTable.getInputMap(MemberTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ inputMap.put((KeyStroke) removeSelectedAction.getValue(AbstractAction.ACCELERATOR_KEY), "removeSelected");
+ inputMap.put((KeyStroke) moveUpAction.getValue(AbstractAction.ACCELERATOR_KEY), "moveUp");
+ inputMap.put((KeyStroke) moveDownAction.getValue(AbstractAction.ACCELERATOR_KEY), "moveDown");
+ inputMap.put((KeyStroke) downloadIncompleteMembersAction.getValue(AbstractAction.ACCELERATOR_KEY), "downloadIncomplete");
+ }
}
/**
- * build the panel with the buttons for adding or removing the current selection
+ * build the toolbar with the buttons for adding or removing the current selection
+ * @param memberTable member table
+ * @param memberTableModel member table model
+ * @param selectionTableModel selection table model
+ * @param re relation editor
*
* @return control buttons panel for selection/members
*/
- protected JToolBar buildSelectionControlButtonPanel() {
+ protected static JToolBar buildSelectionControlButtonToolbar(MemberTable memberTable,
+ MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, IRelationEditor re) {
JToolBar tb = new JToolBar(JToolBar.VERTICAL);
tb.setFloatable(false);
// -- add at start action
AddSelectedAtStartAction addSelectionAction = new AddSelectedAtStartAction(
- memberTableModel, selectionTableModel, this);
+ memberTableModel, selectionTableModel, re);
selectionTableModel.addTableModelListener(addSelectionAction);
tb.add(addSelectionAction);
// -- add before selected action
AddSelectedBeforeSelection addSelectedBeforeSelectionAction = new AddSelectedBeforeSelection(
- memberTableModel, selectionTableModel, this);
+ memberTableModel, selectionTableModel, re);
selectionTableModel.addTableModelListener(addSelectedBeforeSelectionAction);
memberTableModel.getSelectionModel().addListSelectionListener(addSelectedBeforeSelectionAction);
tb.add(addSelectedBeforeSelectionAction);
// -- add after selected action
AddSelectedAfterSelection addSelectedAfterSelectionAction = new AddSelectedAfterSelection(
- memberTableModel, selectionTableModel, this);
+ memberTableModel, selectionTableModel, re);
selectionTableModel.addTableModelListener(addSelectedAfterSelectionAction);
memberTableModel.getSelectionModel().addListSelectionListener(addSelectedAfterSelectionAction);
tb.add(addSelectedAfterSelectionAction);
// -- add at end action
AddSelectedAtEndAction addSelectedAtEndAction = new AddSelectedAtEndAction(
- memberTableModel, selectionTableModel, this);
+ memberTableModel, selectionTableModel, re);
selectionTableModel.addTableModelListener(addSelectedAtEndAction);
tb.add(addSelectedAtEndAction);
@@ -640,21 +711,21 @@ public class GenericRelationEditor extends RelationEditor {
// -- select members action
SelectedMembersForSelectionAction selectMembersForSelectionAction = new SelectedMembersForSelectionAction(
- memberTableModel, selectionTableModel, getLayer());
+ memberTableModel, selectionTableModel, re.getLayer());
selectionTableModel.addTableModelListener(selectMembersForSelectionAction);
memberTableModel.addTableModelListener(selectMembersForSelectionAction);
tb.add(selectMembersForSelectionAction);
// -- select action
SelectPrimitivesForSelectedMembersAction selectAction = new SelectPrimitivesForSelectedMembersAction(
- memberTable, memberTableModel, getLayer());
+ memberTable, memberTableModel, re.getLayer());
memberTable.getSelectionModel().addListSelectionListener(selectAction);
tb.add(selectAction);
tb.addSeparator();
// -- remove selected action
- RemoveSelectedAction removeSelectedAction = new RemoveSelectedAction(memberTableModel, selectionTableModel, getLayer());
+ RemoveSelectedAction removeSelectedAction = new RemoveSelectedAction(memberTableModel, selectionTableModel, re.getLayer());
selectionTableModel.addTableModelListener(removeSelectedAction);
tb.add(removeSelectedAction);
@@ -673,10 +744,10 @@ public class GenericRelationEditor extends RelationEditor {
}
super.setVisible(visible);
if (visible) {
- sortBelowButton.setVisible(ExpertToggleAction.isExpert());
+ leftButtonToolbar.sortBelowButton.setVisible(ExpertToggleAction.isExpert());
RelationDialogManager.getRelationDialogManager().positionOnScreen(this);
if (windowMenuItem == null) {
- addToWindowMenu();
+ windowMenuItem = addToWindowMenu(this, getLayer().getName());
}
tagEditorPanel.requestFocusInWindow();
} else {
@@ -694,32 +765,38 @@ public class GenericRelationEditor extends RelationEditor {
}
}
- /** adds current relation editor to the windows menu (in the "volatile" group) o*/
- protected void addToWindowMenu() {
- String name = getRelation() == null ? tr("New Relation") : getRelation().getLocalName();
- final String tt = tr("Focus Relation Editor with relation ''{0}'' in layer ''{1}''",
- name, getLayer().getName());
- name = tr("Relation Editor: {0}", name == null ? getRelation().getId() : name);
- final JMenu wm = Main.main.menu.windowMenu;
- final JosmAction focusAction = new JosmAction(name, "dialogs/relationlist", tt, null, false, false) {
+ /**
+ * Adds current relation editor to the windows menu (in the "volatile" group)
+ * @param re relation editor
+ * @param layerName layer name
+ * @return created menu item
+ */
+ protected static JMenuItem addToWindowMenu(IRelationEditor re, String layerName) {
+ Relation r = re.getRelation();
+ String name = r == null ? tr("New Relation") : r.getLocalName();
+ JosmAction focusAction = new JosmAction(
+ tr("Relation Editor: {0}", name == null && r != null ? r.getId() : name),
+ "dialogs/relationlist",
+ tr("Focus Relation Editor with relation ''{0}'' in layer ''{1}''", name, layerName),
+ null, false, false) {
@Override
public void actionPerformed(ActionEvent e) {
- final RelationEditor r = (RelationEditor) getValue("relationEditor");
- r.setVisible(true);
+ ((RelationEditor) getValue("relationEditor")).setVisible(true);
}
};
- focusAction.putValue("relationEditor", this);
- windowMenuItem = MainMenu.add(wm, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+ focusAction.putValue("relationEditor", re);
+ return MainMenu.add(Main.main.menu.windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
}
/**
* checks whether the current relation has members referring to itself. If so,
* warns the users and provides an option for removing these members.
- *
+ * @param memberTableModel member table model
+ * @param relation relation
*/
- protected void cleanSelfReferences() {
+ protected static void cleanSelfReferences(MemberTableModel memberTableModel, Relation relation) {
List<OsmPrimitive> toCheck = new ArrayList<>();
- toCheck.add(getRelation());
+ toCheck.add(relation);
if (memberTableModel.hasMembersReferringTo(toCheck)) {
int ret = ConditionalOptionPaneUtil.showOptionDialog(
"clean_relation_self_references",
@@ -746,23 +823,23 @@ public class GenericRelationEditor extends RelationEditor {
}
}
- private void registerCopyPasteAction(AbstractAction action, Object actionName, KeyStroke shortcut) {
+ private static void registerCopyPasteAction(AbstractAction action, Object actionName, KeyStroke shortcut,
+ JRootPane rootPane, JTable... tables) {
int mods = shortcut.getModifiers();
int code = shortcut.getKeyCode();
if (code != KeyEvent.VK_INSERT && (mods == 0 || mods == InputEvent.SHIFT_DOWN_MASK)) {
Main.info(tr("Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"), shortcut);
return;
}
- getRootPane().getActionMap().put(actionName, action);
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcut, actionName);
+ rootPane.getActionMap().put(actionName, action);
+ rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcut, actionName);
// Assign also to JTables because they have their own Copy&Paste implementation
// (which is disabled in this case but eats key shortcuts anyway)
- memberTable.getInputMap(JComponent.WHEN_FOCUSED).put(shortcut, actionName);
- memberTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(shortcut, actionName);
- memberTable.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcut, actionName);
- selectionTable.getInputMap(JComponent.WHEN_FOCUSED).put(shortcut, actionName);
- selectionTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(shortcut, actionName);
- selectionTable.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcut, actionName);
+ for (JTable table : tables) {
+ table.getInputMap(JComponent.WHEN_FOCUSED).put(shortcut, actionName);
+ table.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(shortcut, actionName);
+ table.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcut, actionName);
+ }
}
/**
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/IRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/IRelationEditor.java
index 13c6380..049504b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/IRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/IRelationEditor.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.gui.dialogs.relation;
import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
/**
* Super interface of relation editors.
@@ -44,4 +45,11 @@ public interface IRelationEditor {
* Reloads data from relation.
*/
void reloadDataFromRelation();
+
+ /**
+ * Replies the {@link OsmDataLayer} in whose context this relation editor is open
+ *
+ * @return the {@link OsmDataLayer} in whose context this relation editor is open
+ */
+ OsmDataLayer getLayer();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
index 74247cb..253cb90 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.gui.dialogs.relation;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.Container;
import java.awt.Dimension;
import java.awt.GraphicsEnvironment;
import java.awt.event.ActionEvent;
@@ -16,7 +15,6 @@ import javax.swing.AbstractAction;
import javax.swing.DropMode;
import javax.swing.JPopupMenu;
import javax.swing.JTable;
-import javax.swing.JViewport;
import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
@@ -94,16 +92,7 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
@Override
public Dimension getPreferredSize() {
- Container c = getParent();
- while (c != null && !(c instanceof JViewport)) {
- c = c.getParent();
- }
- if (c != null) {
- Dimension d = super.getPreferredSize();
- d.width = c.getSize().width;
- return d;
- }
- return super.getPreferredSize();
+ return getPreferredFullWidthSize();
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java
index f578531..35a08ca 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java
@@ -2,7 +2,6 @@
package org.openstreetmap.josm.gui.dialogs.relation;
import java.awt.Color;
-import java.awt.Component;
import javax.swing.JLabel;
import javax.swing.JTable;
@@ -18,10 +17,8 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
*
*/
public abstract class MemberTableCellRenderer extends JLabel implements TableCellRenderer {
- public static final Color BGCOLOR_EMPTY_ROW = new Color(234, 234, 234);
public static final Color BGCOLOR_IN_JOSM_SELECTION = new Color(235, 255, 177);
- public static final Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255, 197, 197);
public static final Color BGCOLOR_DOUBLE_ENTRY = new Color(254, 226, 214);
/**
@@ -55,10 +52,6 @@ public abstract class MemberTableCellRenderer extends JLabel implements TableCel
GuiHelper.setBackgroundReadable(this, bgc);
}
- @Override
- public abstract Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
- boolean hasFocus, int row, int column);
-
/**
* replies the model
* @param table the table
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java
index d580884..75ae1ed 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java
@@ -20,6 +20,7 @@ public class MemberTableMemberCellRenderer extends MemberTableCellRenderer {
*/
public MemberTableMemberCellRenderer() {
super();
+ // Explicit default constructor is needed for intantiation via reflection
}
protected void renderPrimitive(OsmPrimitive primitive, Dimension cellSize) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
index 4581cc1..40abb45 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
@@ -86,11 +86,17 @@ implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPri
return layer;
}
+ /**
+ * Registers listeners (selection change and dataset change).
+ */
public void register() {
DataSet.addSelectionListener(this);
getLayer().data.addDataSetListener(this);
}
+ /**
+ * Unregisters listeners (selection change and dataset change).
+ */
public void unregister() {
DataSet.removeSelectionListener(this);
getLayer().data.removeDataSetListener(this);
@@ -189,6 +195,10 @@ implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPri
}
}
+ /**
+ * Populates this model from the given relation.
+ * @param relation relation
+ */
public void populate(Relation relation) {
members.clear();
if (relation != null) {
@@ -347,6 +357,10 @@ implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPri
fireTableDataChanged();
}
+ /**
+ * Applies this member model to the given relation.
+ * @param relation relation
+ */
public void applyToRelation(Relation relation) {
relation.setMembers(members);
}
@@ -459,13 +473,15 @@ implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPri
return new RelationMember(role == null ? "" : role, primitive);
}
- void addMembersAtIndex(final Iterable<RelationMember> newMembers, final int index) {
+ void addMembersAtIndexKeepingOldSelection(final Iterable<RelationMember> newMembers, final int index) {
int idx = index;
for (RelationMember member : newMembers) {
members.add(idx++, member);
}
invalidateConnectionType();
+ final List<Integer> selection = getSelectedIndices();
fireTableRowsInserted(index, idx - 1);
+ setSelectedMembersIdx(selection);
}
public void addMembersAtBeginning(List<? extends OsmPrimitive> primitives) {
@@ -675,7 +691,7 @@ implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPri
}
/**
- * Selects all mebers which refer to {@link OsmPrimitive}s in the collections
+ * Selects all members which refer to {@link OsmPrimitive}s in the collections
* <code>primitmives</code>. Does nothing is primitives is null.
*
* @param primitives the collection of primitives
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java
index 7119731..653911c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java
@@ -106,7 +106,7 @@ class MemberTransferHandler extends TransferHandler {
membersToAdd.add(member);
}
}
- destination.getMemberTableModel().addMembersAtIndex(membersToAdd, insertRow);
+ destination.getMemberTableModel().addMembersAtIndexKeepingOldSelection(membersToAdd, insertRow);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
index 0f96507..57443ff 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
@@ -11,7 +11,6 @@ import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.DataSource;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.DataSetMerger;
import org.openstreetmap.josm.data.osm.Relation;
@@ -164,12 +163,9 @@ public class ParentRelationLoadingTask extends PleaseWaitRunnable {
visitor.merge();
// copy the merged layer's data source info
- for (DataSource src : referrers.dataSources) {
- getLayer().data.dataSources.add(src);
- }
+ getLayer().data.dataSources.addAll(referrers.dataSources);
// FIXME: this is necessary because there are dialogs listening
- // for DataChangeEvents which manipulate Swing components on this
- // thread.
+ // for DataChangeEvents which manipulate Swing components on this thread.
//
SwingUtilities.invokeLater(
new Runnable() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
index 2aca342..21308a0 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
@@ -104,8 +103,7 @@ public abstract class RelationEditor extends ExtendedDialog implements IRelation
Method m = e.getMethod("canEdit", Relation.class);
Boolean canEdit = (Boolean) m.invoke(null, r);
if (canEdit) {
- Constructor<RelationEditor> con = e.getConstructor(Relation.class, Collection.class);
- return con.newInstance(layer, r, selectedMembers);
+ return e.getConstructor(Relation.class, Collection.class).newInstance(layer, r, selectedMembers);
}
} catch (Exception ex) {
Main.warn(ex);
@@ -150,12 +148,8 @@ public abstract class RelationEditor extends ExtendedDialog implements IRelation
updateTitle();
}
- /**
- * Replies the {@link OsmDataLayer} in whose context this relation editor is open
- *
- * @return the {@link OsmDataLayer} in whose context this relation editor is open
- */
- protected final OsmDataLayer getLayer() {
+ @Override
+ public final OsmDataLayer getLayer() {
return layer;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java
deleted file mode 100644
index eb3467a..0000000
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.relation;
-
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-
-public abstract class RunnableAction extends AbstractAction implements Runnable {
-
- @Override
- public abstract void run();
-
- @Override
- public void actionPerformed(ActionEvent arg0) {
- run();
- }
-}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java
index 38b05fb..277e911 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java
@@ -9,26 +9,30 @@ import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-
+/**
+ * Selection table of relation editor.
+ * @since 2563
+ */
public class SelectionTable extends JTable {
private final SelectionTableModel model;
- private MemberTableModel memberTableModel;
-
- protected void build() {
- setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- addMouseListener(new DoubleClickAdapter());
- }
-
- public SelectionTable(SelectionTableModel model, SelectionTableColumnModel columnModel) {
- super(model, columnModel);
+ private final MemberTableModel memberTableModel;
+
+ /**
+ * Constructs a new {@code SelectionTable}.
+ * @param model table model
+ * @param memberTableModel member table model
+ */
+ public SelectionTable(SelectionTableModel model, MemberTableModel memberTableModel) {
+ super(model, new SelectionTableColumnModel(memberTableModel));
this.model = model;
+ this.memberTableModel = memberTableModel;
build();
}
- public void setMemberTableModel(MemberTableModel memberTableModel) {
- this.memberTableModel = memberTableModel;
+ protected void build() {
+ setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ addMouseListener(new DoubleClickAdapter());
}
class DoubleClickAdapter extends MouseAdapter {
@@ -37,8 +41,7 @@ public class SelectionTable extends JTable {
if (!(SwingUtilities.isLeftMouseButton(evt) && evt.getClickCount() > 1))
return;
int row = rowAtPoint(evt.getPoint());
- OsmPrimitive primitive = model.getPrimitive(row);
- memberTableModel.selectMembersReferringTo(Collections.singleton(primitive));
+ memberTableModel.selectMembersReferringTo(Collections.singleton(model.getPrimitive(row)));
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
index 7e4c542..73391b3 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
@@ -2,54 +2,37 @@
package org.openstreetmap.josm.gui.dialogs.relation;
import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import javax.swing.JLabel;
import javax.swing.JTable;
import javax.swing.UIManager;
import javax.swing.table.TableCellRenderer;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.tools.ImageProvider;
/**
* This is the {@link TableCellRenderer} used in {@link SelectionTable}.
- *
+ * @since 1806
*/
-public class SelectionTableCellRenderer extends JLabel implements TableCellRenderer {
- public static final Color BGCOLOR_DOUBLE_ENTRY = new Color(254, 226, 214);
- public static final Color BGCOLOR_SINGLE_ENTRY = new Color(235, 255, 177);
+public class SelectionTableCellRenderer extends MemberTableMemberCellRenderer {
+ public static final Color BGCOLOR_SINGLE_ENTRY = BGCOLOR_IN_JOSM_SELECTION;
/**
* reference to the member table model; required, in order to check whether a
- * selected primitive is already used in the member list of the currently edited
- * relation
+ * selected primitive is already used in the member list of the currently edited relation
*/
- private MemberTableModel model;
+ private final MemberTableModel model;
/**
* constructor
+ * @param model member table model
*/
- public SelectionTableCellRenderer() {
- setIcon(null);
- setOpaque(true);
- }
-
- /**
- * reset the renderer
- */
- protected void reset() {
- setBackground(UIManager.getColor("Table.background"));
- setForeground(UIManager.getColor("Table.foreground"));
- setBorder(null);
- setIcon(null);
- setToolTipText(null);
+ public SelectionTableCellRenderer(MemberTableModel model) {
+ this.model = model;
}
- protected void renderBackground(OsmPrimitive primitive) {
+ @Override
+ protected void renderBackgroundForeground(MemberTableModel model, OsmPrimitive primitive, boolean isSelected) {
Color bgc = UIManager.getColor("Table.background");
if (primitive != null && model != null && model.getNumMembersWithPrimitive(primitive) == 1) {
bgc = BGCOLOR_SINGLE_ENTRY;
@@ -59,29 +42,8 @@ public class SelectionTableCellRenderer extends JLabel implements TableCellRende
GuiHelper.setBackgroundReadable(this, bgc);
}
- protected void renderPrimitive(OsmPrimitive primitive, Dimension cellSize) {
- int size = Math.min(cellSize.width, cellSize.height);
- setIcon(ImageProvider.getPadded(primitive, new Dimension(size, size)));
- setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
- setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(primitive));
- }
-
@Override
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
- int row, int column) {
-
- reset();
- if (value == null)
- return this;
-
- Dimension cellSize = table.getCellRect(row, column, false).getSize();
-
- renderBackground((OsmPrimitive) value);
- renderPrimitive((OsmPrimitive) value, cellSize);
- return this;
- }
-
- public void setMemberTableModel(MemberTableModel model) {
- this.model = model;
+ protected MemberTableModel getModel(JTable table) {
+ return model;
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java
index b430c2f..8cebfc6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java
@@ -5,18 +5,24 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
+/**
+ * This is the {@link TableColumnModel} used in {@link SelectionTable}.
+ * @since 1790
+ */
public class SelectionTableColumnModel extends DefaultTableColumnModel {
- public SelectionTableColumnModel(MemberTableModel model) {
- TableColumn col = null;
- SelectionTableCellRenderer renderer = new SelectionTableCellRenderer();
- renderer.setMemberTableModel(model);
+ /**
+ * Constructs a new {@code SelectionTableColumnModel}.
+ * @param model member table model
+ */
+ public SelectionTableColumnModel(MemberTableModel model) {
// column 0 - the member role
- col = new TableColumn(0);
+ TableColumn col = new TableColumn(0);
col.setHeaderValue(tr("Selection"));
col.setMinWidth(200);
- col.setCellRenderer(renderer);
+ col.setCellRenderer(new SelectionTableCellRenderer(model));
addColumn(col);
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
index 3076979..fe71e33 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
@@ -34,11 +34,17 @@ public class SelectionTableModel extends AbstractTableModel implements Selection
populateSelectedPrimitives(layer);
}
+ /**
+ * Registers listeners (selection change and layer change).
+ */
public void register() {
DataSet.addSelectionListener(this);
MapView.addLayerChangeListener(this);
}
+ /**
+ * Unregisters listeners (selection change and layer change).
+ */
public void unregister() {
DataSet.removeSelectionListener(this);
MapView.removeLayerChangeListener(this);
@@ -115,7 +121,8 @@ public class SelectionTableModel extends AbstractTableModel implements Selection
* Replies the primitive at row <code>row</code> in this model
*
* @param row the row
- * @return the primitive at row <code>row</code> in this model
+ * @return the primitive at row <code>row</code> in this model
+ * @throws ArrayIndexOutOfBoundsException if index is invalid
*/
public OsmPrimitive getPrimitive(int row) {
return cache.get(row);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java
index d2c5a34..052cf46 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java
@@ -8,7 +8,6 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
@@ -21,7 +20,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* Apply the current updates.
* @since 9496
*/
-public class ApplyAction extends SavingAction implements PropertyChangeListener, TableModelListener {
+public class ApplyAction extends SavingAction implements PropertyChangeListener {
/**
* Constructs a new {@code ApplyAction}.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java
index 4913e11..df947c5 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java
@@ -8,9 +8,9 @@ import java.awt.event.ActionEvent;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.io.OnlineResource;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -32,8 +32,6 @@ public class DownloadSelectedIncompleteMembersAction extends AbstractRelationEdi
public DownloadSelectedIncompleteMembersAction(MemberTable memberTable, MemberTableModel memberTableModel, String actionMapKey,
OsmDataLayer layer, IRelationEditor editor) {
super(memberTable, memberTableModel, actionMapKey, layer, editor);
- // Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),
- // KeyEvent.VK_K, Shortcut.ALT)
putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
putValue(NAME, tr("Download Members"));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java
index a0eec79..12cdd59 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java
@@ -25,7 +25,6 @@ public class ReverseAction extends AbstractRelationEditorAction {
putValue(SHORT_DESCRIPTION, tr("Reverse the order of the relation members"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "reverse"));
putValue(NAME, tr("Reverse"));
- // Shortcut.register Shortcut("relationeditor:reverse", tr("Relation Editor: Reverse"), KeyEvent.VK_END, Shortcut.ALT)
updateEnabledState();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
index 1cc838d..51d835d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
@@ -279,7 +279,7 @@ public class RelationNodeMap {
return j;
}
- private Integer findAdjacentWay(NodesWays nw, Node n) {
+ private static Integer findAdjacentWay(NodesWays nw, Node n) {
Set<Integer> adj = nw.nodes.get(n);
if (adj == null || adj.isEmpty()) return null;
return adj.iterator().next();
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 e3bf380..1ee7def 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
@@ -211,8 +211,8 @@ public class WayConnectionTypeCalculator {
return dir;
}
- private Direction determineDirection(int ref_i, Direction ref_direction, int k) {
- return determineDirection(ref_i, ref_direction, k, false);
+ private Direction determineDirection(int refI, Direction refDirection, int k) {
+ return determineDirection(refI, refDirection, k, false);
}
/**
@@ -224,46 +224,46 @@ public class WayConnectionTypeCalculator {
* Else the direction is given as follows:
* Let the relation be a route of oneway streets, and someone travels them in the given order.
* Direction is FORWARD if it is legal and BACKWARD if it is illegal to do so for the given way.
- * @param ref_i way key
- * @param ref_direction direction of ref_i
+ * @param refI way key
+ * @param refDirection direction of ref_i
* @param k successor of ref_i
* @param reversed if {@code true} determine reverse direction
* @return direction of way {@code k}
*/
- private Direction determineDirection(int ref_i, final Direction ref_direction, int k, boolean reversed) {
- if (ref_i < 0 || k < 0 || ref_i >= members.size() || k >= members.size())
+ private Direction determineDirection(int refI, final Direction refDirection, int k, boolean reversed) {
+ if (refI < 0 || k < 0 || refI >= members.size() || k >= members.size())
return NONE;
- if (ref_direction == NONE)
+ if (refDirection == NONE)
return NONE;
- final RelationMember m_ref = members.get(ref_i);
+ final RelationMember mRef = members.get(refI);
final RelationMember m = members.get(k);
- Way way_ref = null;
+ Way wayRef = null;
Way way = null;
- if (m_ref.isWay()) {
- way_ref = m_ref.getWay();
+ if (mRef.isWay()) {
+ wayRef = mRef.getWay();
}
if (m.isWay()) {
way = m.getWay();
}
- if (way_ref == null || way == null)
+ if (wayRef == null || way == null)
return NONE;
/** the list of nodes the way k can dock to */
List<Node> refNodes = new ArrayList<>();
- switch (ref_direction) {
+ switch (refDirection) {
case FORWARD:
- refNodes.add(way_ref.lastNode());
+ refNodes.add(wayRef.lastNode());
break;
case BACKWARD:
- refNodes.add(way_ref.firstNode());
+ refNodes.add(wayRef.firstNode());
break;
case ROUNDABOUT_LEFT:
case ROUNDABOUT_RIGHT:
- refNodes = way_ref.getNodes();
+ refNodes = wayRef.getNodes();
break;
}
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index 6c2c0e4..2e1ebad 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
@@ -40,6 +40,7 @@ import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.OnlineResource;
import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.tools.GBC;
@@ -228,7 +229,7 @@ public class DownloadDialog extends JDialog {
* @param helpTopic the help topic to assign
*/
public DownloadDialog(Component parent, String helpTopic) {
- super(JOptionPane.getFrameForComponent(parent), tr("Download"), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(parent), tr("Download"), ModalityType.DOCUMENT_MODAL);
HelpUtil.setHelpContext(getRootPane(), helpTopic);
getContentPane().setLayout(new BorderLayout());
getContentPane().add(buildMainPanel(), BorderLayout.CENTER);
diff --git a/src/org/openstreetmap/josm/gui/help/HelpContentReader.java b/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
index 1f63e56..83639ef 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
@@ -50,13 +50,9 @@ public class HelpContentReader extends WikiReader {
return prepareHelpContent(in, dotest, u);
}
} catch (MalformedURLException e) {
- throw new HelpContentReaderException(e);
+ throw new HelpContentReaderException(e, 0);
} catch (IOException e) {
- HelpContentReaderException ex = new HelpContentReaderException(e);
- if (con != null) {
- ex.setResponseCode(con.getResponseCode());
- }
- throw ex;
+ throw new HelpContentReaderException(e, con != null ? con.getResponseCode() : 0);
}
}
@@ -80,7 +76,7 @@ public class HelpContentReader extends WikiReader {
try {
s = readFromTrac(in, url);
} catch (IOException e) {
- throw new HelpContentReaderException(e);
+ throw new HelpContentReaderException(e, 0);
}
if (dotest && s.isEmpty())
throw new MissingHelpContentException(s);
diff --git a/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java b/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java
index c9efd47..a82d5b8 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java
@@ -1,19 +1,33 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.help;
+/**
+ * Exception thrown when a problem occurs during help contents fetching.
+ * @since 2308
+ */
public class HelpContentReaderException extends Exception {
- private int responseCode;
- public HelpContentReaderException(String message, Throwable cause) {
- super(message, cause);
- }
+ private final int responseCode;
- public HelpContentReaderException(String message) {
+ /**
+ * Constructs a new {@code HelpContentReaderException}.
+ * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
+ * @param responseCode HTTP response code related to the wiki access exception (0 if not applicable)
+ */
+ public HelpContentReaderException(String message, int responseCode) {
super(message);
+ this.responseCode = responseCode;
}
- public HelpContentReaderException(Throwable cause) {
+ /**
+ * Constructs a new {@code HelpContentReaderException}.
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or unknown.)
+ * @param responseCode HTTP response code related to the wiki access exception (0 if not applicable)
+ */
+ public HelpContentReaderException(Throwable cause, int responseCode) {
super(cause);
+ this.responseCode = responseCode;
}
/**
@@ -22,16 +36,7 @@ public class HelpContentReaderException extends Exception {
*
* @return the http response code
*/
- public int getResponseCode() {
+ public final int getResponseCode() {
return responseCode;
}
-
- /**
- * Sets the HTTP response code
- *
- * @param responseCode the response code
- */
- public void setResponseCode(int responseCode) {
- this.responseCode = responseCode;
- }
}
diff --git a/src/org/openstreetmap/josm/gui/help/Helpful.java b/src/org/openstreetmap/josm/gui/help/Helpful.java
index bd7c5c1..c3bf92a 100644
--- a/src/org/openstreetmap/josm/gui/help/Helpful.java
+++ b/src/org/openstreetmap/josm/gui/help/Helpful.java
@@ -1,6 +1,15 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.help;
+/**
+ * Anything on which we can provide help.
+ * @since 2252
+ */
public interface Helpful {
+
+ /**
+ * Returns the help topic on JOSM wiki for this feature.
+ * @return the help topic on JOSM wiki for this feature
+ */
String helpTopic();
}
diff --git a/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java b/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java
index 83cca1b..1773d12 100644
--- a/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java
+++ b/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java
@@ -1,17 +1,17 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.help;
+/**
+ * Exception thrown when help content is missing.
+ * @since 2308
+ */
public class MissingHelpContentException extends HelpContentReaderException {
- public MissingHelpContentException(String message, Throwable cause) {
- super(message, cause);
- }
-
+ /**
+ * Constructs a new {@code MissingHelpContentException}.
+ * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
+ */
public MissingHelpContentException(String message) {
- super(message);
- }
-
- public MissingHelpContentException(Throwable cause) {
- super(cause);
+ super(message, 0);
}
}
diff --git a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
index 653ee0e..51acde3 100644
--- a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
@@ -12,6 +12,7 @@ import java.util.Observer;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
+import javax.swing.UIManager;
import org.openstreetmap.gui.jmapviewer.JMapViewer;
import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
@@ -21,6 +22,7 @@ import org.openstreetmap.josm.data.osm.history.HistoryNode;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Pair;
@@ -107,7 +109,6 @@ public class CoordinateInfoViewer extends JPanel {
gc.fill = GridBagConstraints.BOTH;
gc.weightx = 1.0;
gc.weighty = 1.0;
- gc.insets = new Insets(5, 5, 5, 5);
add(mapViewer = new MapViewer(model), gc);
mapViewer.setZoomContolsVisible(false);
}
@@ -189,6 +190,16 @@ public class CoordinateInfoViewer extends JPanel {
mapViewer.setDisplayToFitMapMarkers();
}
+ private static JosmTextArea newTextArea() {
+ JosmTextArea area = new JosmTextArea();
+ GuiHelper.setBackgroundReadable(area, Color.WHITE);
+ area.setEditable(false);
+ area.setOpaque(true);
+ area.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ area.setFont(UIManager.getFont("Label.font"));
+ return area;
+ }
+
private static class Updater {
private final HistoryBrowserModel model;
private final PointInTimeType role;
@@ -220,18 +231,15 @@ public class CoordinateInfoViewer extends JPanel {
return Pair.create(node.getCoords(), oppositeNode.getCoords());
}
-
}
/**
- * A UI widgets which displays the Lan/Lon-coordinates of a
- * {@link HistoryNode}.
- *
+ * A UI widgets which displays the Lan/Lon-coordinates of a {@link HistoryNode}.
*/
private static class LatLonViewer extends JPanel implements Observer {
- private JLabel lblLat;
- private JLabel lblLon;
+ private final JosmTextArea lblLat = newTextArea();
+ private final JosmTextArea lblLon = newTextArea();
private final Updater updater;
private final Color modifiedColor;
@@ -254,10 +262,7 @@ public class CoordinateInfoViewer extends JPanel {
gc.gridy = 0;
gc.fill = GridBagConstraints.HORIZONTAL;
gc.weightx = 1.0;
- add(lblLat = new JLabel(), gc);
- GuiHelper.setBackgroundReadable(lblLat, Color.WHITE);
- lblLat.setOpaque(true);
- lblLat.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ add(lblLat, gc);
// --------
gc.gridx = 0;
@@ -272,14 +277,11 @@ public class CoordinateInfoViewer extends JPanel {
gc.gridy = 1;
gc.fill = GridBagConstraints.HORIZONTAL;
gc.weightx = 1.0;
- add(lblLon = new JLabel(), gc);
- GuiHelper.setBackgroundReadable(lblLon, Color.WHITE);
- lblLon.setOpaque(true);
- lblLon.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ add(lblLon, gc);
}
/**
- *
+ * Constructs a new {@code LatLonViewer}.
* @param model a model
* @param role the role for this viewer.
*/
@@ -357,7 +359,7 @@ public class CoordinateInfoViewer extends JPanel {
private static class DistanceViewer extends JPanel implements Observer {
- private JLabel lblDistance;
+ private final JosmTextArea lblDistance = newTextArea();
private final Updater updater;
DistanceViewer(HistoryBrowserModel model) {
@@ -384,10 +386,7 @@ public class CoordinateInfoViewer extends JPanel {
gc.gridy = 0;
gc.fill = GridBagConstraints.HORIZONTAL;
gc.weightx = 1.0;
- add(lblDistance = new JLabel(), gc);
- GuiHelper.setBackgroundReadable(lblDistance, Color.WHITE);
- lblDistance.setOpaque(true);
- lblDistance.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ add(lblDistance, gc);
}
protected void refresh() {
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
index 3546f32..146460b 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
@@ -16,7 +16,6 @@ import javax.swing.AbstractAction;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.KeyStroke;
@@ -28,6 +27,7 @@ import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ImageProvider;
/**
@@ -48,7 +48,7 @@ public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListe
* @param history the history to be displayed
*/
public HistoryBrowserDialog(History history) {
- super(JOptionPane.getFrameForComponent(Main.parent), false);
+ super(GuiHelper.getFrameForComponent(Main.parent), false);
build();
setHistory(history);
setTitle(buildTitle(history));
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
index cde8498..71cc67c 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
@@ -23,10 +23,10 @@ import org.openstreetmap.josm.data.osm.history.History;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.Predicate;
import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
/**
* Manager allowing to show/hide history dialogs.
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
index 0c2bcfd..353bca4 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
@@ -241,7 +241,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
/**
- * replies the tag table model for the respective point in time
+ * Replies the tag table model for the respective point in time.
*
* @param pointInTimeType the type of the point in time (must not be null)
* @return the tag table model
@@ -251,33 +251,38 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
return currentTagTableModel;
- else if (pointInTimeType.equals(PointInTimeType.REFERENCE_POINT_IN_TIME))
+ else // REFERENCE_POINT_IN_TIME
return referenceTagTableModel;
-
- // should not happen
- return null;
}
+ /**
+ * Replies the node list table model for the respective point in time.
+ *
+ * @param pointInTimeType the type of the point in time (must not be null)
+ * @return the node list table model
+ * @throws IllegalArgumentException if pointInTimeType is null
+ */
public DiffTableModel getNodeListTableModel(PointInTimeType pointInTimeType) {
CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
return currentNodeListTableModel;
- else if (pointInTimeType.equals(PointInTimeType.REFERENCE_POINT_IN_TIME))
+ else // REFERENCE_POINT_IN_TIME
return referenceNodeListTableModel;
-
- // should not happen
- return null;
}
+ /**
+ * Replies the relation member table model for the respective point in time.
+ *
+ * @param pointInTimeType the type of the point in time (must not be null)
+ * @return the relation member table model
+ * @throws IllegalArgumentException if pointInTimeType is null
+ */
public DiffTableModel getRelationMemberTableModel(PointInTimeType pointInTimeType) {
CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
return currentRelationMemberTableModel;
- else if (pointInTimeType.equals(PointInTimeType.REFERENCE_POINT_IN_TIME))
+ else // REFERENCE_POINT_IN_TIME
return referenceRelationMemberTableModel;
-
- // should not happen
- return null;
}
/**
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
index a2558d9..d245b84 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
@@ -6,21 +6,21 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.io.IOException;
-import java.text.MessageFormat;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
import org.openstreetmap.josm.data.osm.history.History;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
import org.openstreetmap.josm.gui.ExceptionDialogUtil;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.ChangesetQuery;
import org.openstreetmap.josm.io.OsmServerChangesetReader;
import org.openstreetmap.josm.io.OsmServerHistoryReader;
@@ -29,29 +29,27 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.xml.sax.SAXException;
/**
- * Loads the object history of an collection of objects from the
- * server.
+ * Loads the object history of a collection of objects from the server.
*
* It provides a fluent API for configuration.
*
* Sample usage:
*
* <pre>
- * HistoryLoadTask task = new HistoryLoadTask()
- * .add(1, OsmPrimitiveType.NODE)
- * .add(1233, OsmPrimitiveType.WAY)
- * .add(37234, OsmPrimitveType.RELATION)
+ * HistoryLoadTask task = new HistoryLoadTask()
+ * .add(node)
+ * .add(way)
+ * .add(relation)
* .add(aHistoryItem);
*
* Main.worker.execute(task);
- *
* </pre>
*/
public class HistoryLoadTask extends PleaseWaitRunnable {
private boolean canceled;
private Exception lastException;
- private final Set<PrimitiveId> toLoad;
+ private final Set<PrimitiveId> toLoad = new HashSet<>();
private HistoryDataSet loadedData;
private OsmServerHistoryReader reader;
@@ -60,7 +58,6 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
*/
public HistoryLoadTask() {
super(tr("Load history"), true);
- toLoad = new HashSet<>();
}
/**
@@ -74,23 +71,6 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
public HistoryLoadTask(Component parent) {
super(parent, tr("Load history"), true);
CheckParameterUtil.ensureParameterNotNull(parent, "parent");
- toLoad = new HashSet<>();
- }
-
- /**
- * Adds an object whose history is to be loaded.
- *
- * @param id the object id
- * @param type the object type
- * @return this task
- */
- public HistoryLoadTask add(long id, OsmPrimitiveType type) {
- if (id <= 0)
- throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got {1}.", "id", id));
- CheckParameterUtil.ensureParameterNotNull(type, "type");
- SimplePrimitiveId pid = new SimplePrimitiveId(id, type);
- toLoad.add(pid);
- return this;
}
/**
@@ -114,8 +94,7 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
*/
public HistoryLoadTask add(HistoryOsmPrimitive primitive) {
CheckParameterUtil.ensureParameterNotNull(primitive, "primitive");
- toLoad.add(primitive.getPrimitiveId());
- return this;
+ return add(primitive.getPrimitiveId());
}
/**
@@ -127,8 +106,7 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
*/
public HistoryLoadTask add(History history) {
CheckParameterUtil.ensureParameterNotNull(history, "history");
- toLoad.add(history.getPrimitiveId());
- return this;
+ return add(history.getPrimitiveId());
}
/**
@@ -141,8 +119,7 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
*/
public HistoryLoadTask add(OsmPrimitive primitive) {
CheckParameterUtil.ensureValidPrimitiveId(primitive, "primitive");
- toLoad.add(primitive.getPrimitiveId());
- return this;
+ return add(primitive.getPrimitiveId());
}
/**
@@ -193,24 +170,13 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
if (canceled) {
break;
}
- String msg = "";
- switch(pid.getType()) {
- case NODE: msg = marktr("Loading history for node {0}"); break;
- case WAY: msg = marktr("Loading history for way {0}"); break;
- case RELATION: msg = marktr("Loading history for relation {0}"); break;
- }
- progressMonitor.indeterminateSubTask(tr(msg,
- Long.toString(pid.getUniqueId())));
+ String msg = getLoadingMessage(pid);
+ progressMonitor.indeterminateSubTask(tr(msg, Long.toString(pid.getUniqueId())));
reader = null;
- HistoryDataSet ds = null;
+ HistoryDataSet ds;
try {
reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
- ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
- // load corresponding changesets (mostly for changeset comment)
- for (final Changeset i : new OsmServerChangesetReader().queryChangesets(
- new ChangesetQuery().forChangesetIds(ds.getChangesetIds()), progressMonitor.createSubTaskMonitor(1, false))) {
- ds.putChangeset(i);
- }
+ ds = loadHistory(reader, progressMonitor);
} catch (OsmTransferException e) {
if (canceled)
return;
@@ -224,10 +190,51 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
}
}
+ protected static HistoryDataSet loadHistory(OsmServerHistoryReader reader, ProgressMonitor progressMonitor) throws OsmTransferException {
+ HistoryDataSet ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
+ if (ds != null) {
+ // load corresponding changesets (mostly for changeset comment)
+ OsmServerChangesetReader changesetReader = new OsmServerChangesetReader();
+ List<Long> changesetIds = new ArrayList<>(ds.getChangesetIds());
+
+ // query changesets 100 by 100 (OSM API limit)
+ int n = ChangesetQuery.MAX_CHANGESETS_NUMBER;
+ for (int i = 0; i < changesetIds.size(); i += n) {
+ for (Changeset c : changesetReader.queryChangesets(
+ new ChangesetQuery().forChangesetIds(changesetIds.subList(i, Math.min(i + n, changesetIds.size()))),
+ progressMonitor.createSubTaskMonitor(1, false))) {
+ ds.putChangeset(c);
+ }
+ }
+ }
+ return ds;
+ }
+
+ protected static String getLoadingMessage(PrimitiveId pid) {
+ switch (pid.getType()) {
+ case NODE:
+ return marktr("Loading history for node {0}");
+ case WAY:
+ return marktr("Loading history for way {0}");
+ case RELATION:
+ return marktr("Loading history for relation {0}");
+ default:
+ return "";
+ }
+ }
+
+ /**
+ * Determines if this task has ben canceled.
+ * @return {@code true} if this task has ben canceled
+ */
public boolean isCanceled() {
return canceled;
}
+ /**
+ * Returns the last exception that occured during loading, if any.
+ * @return the last exception that occured during loading, or {@code null}
+ */
public Exception getLastException() {
return lastException;
}
diff --git a/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
index 35a312c..73ef511 100644
--- a/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
@@ -54,7 +54,9 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRender
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
- renderNode((TwoColumnDiff.Item) value, isSelected);
+ if (value != null) {
+ renderNode((TwoColumnDiff.Item) value, isSelected);
+ }
return this;
}
}
diff --git a/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
index bada571..8bc0b50 100644
--- a/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
@@ -25,11 +25,6 @@ import org.openstreetmap.josm.tools.ImageProvider;
*/
public class RelationMemberListTableCellRenderer extends JLabel implements TableCellRenderer {
- public static final Color BGCOLOR_EMPTY_ROW = new Color(234, 234, 234);
- public static final Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255, 197, 197);
- public static final Color BGCOLOR_IN_OPPOSITE = new Color(255, 234, 213);
- public static final Color BGCOLOR_SELECTED = new Color(143, 170, 255);
-
private final transient Map<OsmPrimitiveType, ImageIcon> icons;
/**
@@ -83,6 +78,7 @@ public class RelationMemberListTableCellRenderer extends JLabel implements Table
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
+ if (value == null) return this;
Item member = (TwoColumnDiff.Item) value;
renderIcon((RelationMemberData) member.value);
switch(column) {
diff --git a/src/org/openstreetmap/josm/gui/history/VersionTable.java b/src/org/openstreetmap/josm/gui/history/VersionTable.java
index 5347e62..fa1dcf2 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionTable.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionTable.java
@@ -318,6 +318,11 @@ public class VersionTable extends JTable implements Observer {
setHorizontalAlignment(hAlignment);
}
+ // for unit tests
+ private AlignedRenderer() {
+ this(SwingConstants.LEFT);
+ }
+
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java b/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
index 4b74774..a86c237 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
@@ -14,10 +14,15 @@ import javax.swing.table.TableColumnModel;
*/
public class VersionTableColumnModel extends DefaultTableColumnModel {
+ /** Column index for version */
public static final int COL_VERSION = 0;
+ /** Column index for reference */
public static final int COL_REFERENCE = 1;
+ /** Column index for current */
public static final int COL_CURRENT = 2;
+ /** Column index for date */
public static final int COL_DATE = 3;
+ /** Column index for user */
public static final int COL_USER = 4;
protected void createColumns() {
@@ -25,33 +30,33 @@ public class VersionTableColumnModel extends DefaultTableColumnModel {
VersionTable.RadioButtonRenderer bRenderer = new VersionTable.RadioButtonRenderer();
// column 0 - Version
- col = new TableColumn(0);
+ col = new TableColumn(COL_VERSION);
/* translation note: 3 letter abbr. for "Version" */
col.setHeaderValue(tr("Ver"));
col.setCellRenderer(new VersionTable.AlignedRenderer(SwingConstants.CENTER));
col.setResizable(false);
addColumn(col);
// column 1 - Reference
- col = new TableColumn(1);
+ col = new TableColumn(COL_REFERENCE);
col.setHeaderValue(tr("A"));
col.setCellRenderer(bRenderer);
col.setCellEditor(new VersionTable.RadioButtonEditor());
col.setResizable(false);
addColumn(col);
// column 2 - Current
- col = new TableColumn(2);
+ col = new TableColumn(COL_CURRENT);
col.setHeaderValue(tr("B"));
col.setCellRenderer(bRenderer);
col.setCellEditor(new VersionTable.RadioButtonEditor());
col.setResizable(false);
addColumn(col);
// column 3 - Date
- col = new TableColumn(3);
+ col = new TableColumn(COL_DATE);
col.setHeaderValue(tr("Date"));
col.setResizable(false);
addColumn(col);
// column 4 - User
- col = new TableColumn(4);
+ col = new TableColumn(COL_USER);
col.setHeaderValue(tr("User"));
col.setResizable(false);
addColumn(col);
diff --git a/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java b/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java
index 699687c..0fcd6ba 100644
--- a/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java
+++ b/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java
@@ -88,12 +88,6 @@ public abstract class AbstractIOTask implements Runnable {
}
/**
- * Runs the task
- */
- @Override
- public abstract void run();
-
- /**
* Cancel the task
*/
public abstract void cancel();
diff --git a/src/org/openstreetmap/josm/gui/io/AbstractPrimitiveTask.java b/src/org/openstreetmap/josm/gui/io/AbstractPrimitiveTask.java
new file mode 100644
index 0000000..8862e83
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/io/AbstractPrimitiveTask.java
@@ -0,0 +1,196 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.io;
+
+import static org.openstreetmap.josm.tools.CheckParameterUtil.ensureParameterNotNull;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.ExceptionDialogUtil;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
+import org.openstreetmap.josm.io.OsmServerObjectReader;
+import org.openstreetmap.josm.io.OsmTransferException;
+import org.xml.sax.SAXException;
+
+/**
+ * Abstract superclass of download/update primitives tasks.
+ * @since 10129
+ */
+public abstract class AbstractPrimitiveTask extends PleaseWaitRunnable {
+
+ protected final DataSet ds = new DataSet();
+ protected boolean canceled;
+ protected Exception lastException;
+ private Set<PrimitiveId> missingPrimitives;
+
+ protected final OsmDataLayer layer;
+ protected MultiFetchServerObjectReader multiObjectReader;
+ protected OsmServerObjectReader objectReader;
+
+ private boolean zoom;
+ private boolean downloadRelations;
+ private boolean fullRelation;
+
+ protected AbstractPrimitiveTask(String title, OsmDataLayer layer) {
+ this(title, new PleaseWaitProgressMonitor(title), layer);
+ }
+
+ protected AbstractPrimitiveTask(String title, ProgressMonitor progressMonitor, OsmDataLayer layer) {
+ super(title, progressMonitor, false);
+ ensureParameterNotNull(layer, "layer");
+ this.layer = layer;
+ }
+
+ protected abstract void initMultiFetchReader(MultiFetchServerObjectReader reader);
+
+ /**
+ * Sets whether the map view should zoom to impacted primitives at the end.
+ * @param zoom {@code true} if the map view should zoom to impacted primitives at the end
+ * @return {@code this}
+ */
+ public final AbstractPrimitiveTask setZoom(boolean zoom) {
+ this.zoom = zoom;
+ return this;
+ }
+
+ /**
+ * Sets whether .
+ * @param downloadRelations {@code true} if
+ * @param fullRelation {@code true} if a full download is required,
+ * i.e., a download including the immediate children of a relation.
+ * @return {@code this}
+ */
+ public final AbstractPrimitiveTask setDownloadRelations(boolean downloadRelations, boolean fullRelation) {
+ this.downloadRelations = downloadRelations;
+ this.fullRelation = fullRelation;
+ return this;
+ }
+
+ /**
+ * Replies the set of ids of all primitives for which a fetch request to the
+ * server was submitted but which are not available from the server (the server
+ * replied a return code of 404)
+ *
+ * @return the set of ids of missing primitives
+ */
+ public Set<PrimitiveId> getMissingPrimitives() {
+ return missingPrimitives;
+ }
+
+ @Override
+ protected void realRun() throws SAXException, IOException, OsmTransferException {
+ DataSet theirDataSet;
+ try {
+ synchronized (this) {
+ if (canceled)
+ return;
+ multiObjectReader = MultiFetchServerObjectReader.create();
+ }
+ initMultiFetchReader(multiObjectReader);
+ theirDataSet = multiObjectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+ missingPrimitives = multiObjectReader.getMissingPrimitives();
+ synchronized (this) {
+ multiObjectReader = null;
+ }
+ new DataSetMerger(ds, theirDataSet).merge();
+
+ if (downloadRelations) {
+ loadIncompleteRelationMembers();
+ }
+
+ loadIncompleteNodes();
+ } catch (Exception e) {
+ if (canceled)
+ return;
+ lastException = e;
+ }
+ }
+
+ protected void loadIncompleteRelationMembers() throws OsmTransferException {
+ // if incomplete relation members exist, download them too
+ for (Relation r : ds.getRelations()) {
+ if (canceled)
+ return;
+ // Relations may be incomplete in case of nested relations if child relations are accessed before their parent
+ // (it may happen because "relations" has no deterministic sort order, see #10388)
+ if (r.isIncomplete() || r.hasIncompleteMembers()) {
+ synchronized (this) {
+ if (canceled)
+ return;
+ objectReader = new OsmServerObjectReader(r.getId(), OsmPrimitiveType.RELATION, fullRelation);
+ }
+ DataSet theirDataSet = objectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+ synchronized (this) {
+ objectReader = null;
+ }
+ new DataSetMerger(ds, theirDataSet).merge();
+ }
+ }
+ }
+
+ protected void loadIncompleteNodes() throws OsmTransferException {
+ // a way loaded with MultiFetch may have incomplete nodes because at least one of its
+ // nodes isn't present in the local data set. We therefore fully load all ways with incomplete nodes.
+ for (Way w : ds.getWays()) {
+ if (canceled)
+ return;
+ if (w.hasIncompleteNodes()) {
+ synchronized (this) {
+ if (canceled)
+ return;
+ objectReader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */);
+ }
+ DataSet theirDataSet = objectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+ synchronized (this) {
+ objectReader = null;
+ }
+ new DataSetMerger(ds, theirDataSet).merge();
+ }
+ }
+ }
+
+ @Override
+ protected void cancel() {
+ canceled = true;
+ synchronized (this) {
+ if (multiObjectReader != null) {
+ multiObjectReader.cancel();
+ }
+ if (objectReader != null) {
+ objectReader.cancel();
+ }
+ }
+ }
+
+ @Override
+ protected void finish() {
+ if (canceled)
+ return;
+ if (lastException != null) {
+ ExceptionDialogUtil.explainException(lastException);
+ return;
+ }
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override
+ public void run() {
+ layer.mergeFrom(ds);
+ if (zoom && Main.map != null)
+ AutoScaleAction.zoomTo(ds.allPrimitives());
+ layer.onPostDownloadFromServer();
+ }
+ });
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java b/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
index 83702a0..350f923 100644
--- a/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
@@ -21,7 +21,6 @@ import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JList;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.KeyStroke;
@@ -31,6 +30,7 @@ import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -110,7 +110,7 @@ public class CloseChangesetDialog extends JDialog {
* Constructs a new {@code CloseChangesetDialog}.
*/
public CloseChangesetDialog() {
- super(JOptionPane.getFrameForComponent(Main.parent), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(Main.parent), ModalityType.DOCUMENT_MODAL);
build();
}
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
index e500d29..0f327ca 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
@@ -17,6 +17,7 @@ import org.openstreetmap.josm.data.osm.UserInfo;
import org.openstreetmap.josm.gui.ExceptionDialogUtil;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.ChangesetQuery;
import org.openstreetmap.josm.io.OsmServerChangesetReader;
import org.openstreetmap.josm.io.OsmServerUserInfoReader;
@@ -58,7 +59,7 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
protected void finish() {
if (JosmUserIdentityManager.getInstance().isAnonymous()) {
JOptionPane.showMessageDialog(
- JOptionPane.getFrameForComponent(parent),
+ GuiHelper.getFrameForComponent(parent),
"<html>" + tr("Could not retrieve the list of your open changesets because<br>"
+ "JOSM does not know your identity.<br>"
+ "You have either chosen to work anonymously or you are not entitled<br>"
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java b/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
index bf3fefe..691c0a1 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
@@ -1,49 +1,26 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.io;
-import static org.openstreetmap.josm.tools.CheckParameterUtil.ensureParameterNotNull;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.io.IOException;
import java.util.List;
-import java.util.Set;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AutoScaleAction;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSetMerger;
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.PrimitiveId;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.ExceptionDialogUtil;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
-import org.openstreetmap.josm.io.OsmServerObjectReader;
-import org.openstreetmap.josm.io.OsmTransferException;
-import org.xml.sax.SAXException;
/**
* Task downloading a set of OSM primitives.
* @since 4081
*/
-public class DownloadPrimitivesTask extends PleaseWaitRunnable {
- private DataSet ds;
- private boolean canceled;
- private Exception lastException;
- private final List<PrimitiveId> ids;
-
- private Set<PrimitiveId> missingPrimitives;
+public class DownloadPrimitivesTask extends AbstractPrimitiveTask {
- private final OsmDataLayer layer;
- private final boolean fullRelation;
- private MultiFetchServerObjectReader multiObjectReader;
- private OsmServerObjectReader objectReader;
+ private final List<PrimitiveId> ids;
/**
* Constructs a new {@code DownloadPrimitivesTask}.
@@ -72,45 +49,13 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable {
*/
public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation,
ProgressMonitor progressMonitor) {
- super(tr("Download objects"), progressMonitor, false /* don't ignore exception */);
- ensureParameterNotNull(layer, "layer");
+ super(tr("Download objects"), progressMonitor, layer);
this.ids = ids;
- this.layer = layer;
- this.fullRelation = fullRelation;
- }
-
- @Override
- protected void cancel() {
- canceled = true;
- synchronized (this) {
- if (multiObjectReader != null) {
- multiObjectReader.cancel();
- }
- if (objectReader != null) {
- objectReader.cancel();
- }
- }
+ setZoom(true);
+ setDownloadRelations(true, fullRelation);
}
@Override
- protected void finish() {
- if (canceled)
- return;
- if (lastException != null) {
- ExceptionDialogUtil.explainException(lastException);
- return;
- }
- GuiHelper.runInEDTAndWait(new Runnable() {
- @Override
- public void run() {
- layer.mergeFrom(ds);
- if (Main.map != null)
- AutoScaleAction.zoomTo(ds.allPrimitives());
- layer.onPostDownloadFromServer();
- }
- });
- }
-
protected void initMultiFetchReader(MultiFetchServerObjectReader reader) {
getProgressMonitor().indeterminateSubTask(tr("Initializing nodes to download ..."));
for (PrimitiveId id : ids) {
@@ -132,79 +77,4 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable {
reader.append(osm);
}
}
-
- @Override
- protected void realRun() throws SAXException, IOException, OsmTransferException {
- this.ds = new DataSet();
- DataSet theirDataSet;
- try {
- synchronized (this) {
- if (canceled) return;
- multiObjectReader = MultiFetchServerObjectReader.create();
- }
- initMultiFetchReader(multiObjectReader);
- theirDataSet = multiObjectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
- missingPrimitives = multiObjectReader.getMissingPrimitives();
- synchronized (this) {
- multiObjectReader = null;
- }
- DataSetMerger merger = new DataSetMerger(ds, theirDataSet);
- merger.merge();
-
- // if incomplete relation members exist, download them too
- for (Relation r : ds.getRelations()) {
- if (canceled) return;
- // Relations may be incomplete in case of nested relations if child relations are accessed before their parent
- // (it may happen because "relations" has no deterministic sort order, see #10388)
- if (r.isIncomplete() || r.hasIncompleteMembers()) {
- synchronized (this) {
- if (canceled) return;
- objectReader = new OsmServerObjectReader(r.getId(), OsmPrimitiveType.RELATION, fullRelation);
- }
- theirDataSet = objectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
- synchronized (this) {
- objectReader = null;
- }
- merger = new DataSetMerger(ds, theirDataSet);
- merger.merge();
- }
- }
-
- // a way loaded with MultiFetch may have incomplete nodes because at least one of its
- // nodes isn't present in the local data set. We therefore fully load all
- // ways with incomplete nodes.
- //
- for (Way w : ds.getWays()) {
- if (canceled) return;
- if (w.hasIncompleteNodes()) {
- synchronized (this) {
- if (canceled) return;
- objectReader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */);
- }
- theirDataSet = objectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
- synchronized (this) {
- objectReader = null;
- }
- merger = new DataSetMerger(ds, theirDataSet);
- merger.merge();
- }
- }
-
- } catch (Exception e) {
- if (canceled) return;
- lastException = e;
- }
- }
-
- /**
- * replies the set of ids of all primitives for which a fetch request to the
- * server was submitted but which are not available from the server (the server
- * replied a return code of 404)
- *
- * @return the set of ids of missing primitives
- */
- public Set<PrimitiveId> getMissingPrimitives() {
- return missingPrimitives;
- }
-
}
diff --git a/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java b/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
index 0be164e..5bde926 100644
--- a/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
+++ b/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
@@ -84,6 +84,7 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column) {
removeAll();
+ if (value == null) return this;
SaveLayerInfo info = (SaveLayerInfo) value;
StringBuilder sb = new StringBuilder();
sb.append("<html>")
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
index 87587d9..4a7b7c7 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
@@ -139,7 +139,7 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
}
public SaveLayersDialog(Component parent) {
- super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
build();
}
diff --git a/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java b/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
index fb02571..f8991b4 100644
--- a/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
+++ b/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
@@ -1,45 +1,28 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.io;
-import static org.openstreetmap.josm.tools.CheckParameterUtil.ensureParameterNotNull;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSetMerger;
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.Relation;
import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.ExceptionDialogUtil;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
-import org.openstreetmap.josm.io.OsmServerObjectReader;
-import org.openstreetmap.josm.io.OsmTransferException;
-import org.xml.sax.SAXException;
/**
* The asynchronous task for updating a collection of objects using multi fetch.
- *
+ * @since 2599
*/
-public class UpdatePrimitivesTask extends PleaseWaitRunnable {
- private DataSet ds;
- private boolean canceled;
- private Exception lastException;
+public class UpdatePrimitivesTask extends AbstractPrimitiveTask {
+
private final Collection<? extends OsmPrimitive> toUpdate;
- private final OsmDataLayer layer;
- private MultiFetchServerObjectReader multiObjectReader;
- private OsmServerObjectReader objectReader;
/**
- * Creates the task
+ * Constructs a new {@code UpdatePrimitivesTask}.
*
* @param layer the layer in which primitives are updated. Must not be null.
* @param toUpdate a collection of primitives to update from the server. Set to
@@ -47,43 +30,8 @@ public class UpdatePrimitivesTask extends PleaseWaitRunnable {
* @throws IllegalArgumentException if layer is null.
*/
public UpdatePrimitivesTask(OsmDataLayer layer, Collection<? extends OsmPrimitive> toUpdate) {
- super(tr("Update objects"), false /* don't ignore exception */);
- ensureParameterNotNull(layer, "layer");
- if (toUpdate == null) {
- toUpdate = Collections.emptyList();
- }
- this.layer = layer;
- this.toUpdate = toUpdate;
- }
-
- @Override
- protected void cancel() {
- canceled = true;
- synchronized (this) {
- if (multiObjectReader != null) {
- multiObjectReader.cancel();
- }
- if (objectReader != null) {
- objectReader.cancel();
- }
- }
- }
-
- @Override
- protected void finish() {
- if (canceled)
- return;
- if (lastException != null) {
- ExceptionDialogUtil.explainException(lastException);
- return;
- }
- GuiHelper.runInEDTAndWait(new Runnable() {
- @Override
- public void run() {
- layer.mergeFrom(ds);
- layer.onPostDownloadFromServer();
- }
- });
+ super(tr("Update objects"), layer);
+ this.toUpdate = toUpdate != null ? toUpdate : Collections.<OsmPrimitive>emptyList();
}
protected void initMultiFetchReaderWithNodes(MultiFetchServerObjectReader reader) {
@@ -116,46 +64,9 @@ public class UpdatePrimitivesTask extends PleaseWaitRunnable {
}
@Override
- protected void realRun() throws SAXException, IOException, OsmTransferException {
- this.ds = new DataSet();
- DataSet theirDataSet;
- try {
- synchronized (this) {
- if (canceled) return;
- multiObjectReader = MultiFetchServerObjectReader.create();
- }
- initMultiFetchReaderWithNodes(multiObjectReader);
- initMultiFetchReaderWithWays(multiObjectReader);
- initMultiFetchReaderWithRelations(multiObjectReader);
- theirDataSet = multiObjectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
- synchronized (this) {
- multiObjectReader = null;
- }
- DataSetMerger merger = new DataSetMerger(ds, theirDataSet);
- merger.merge();
- // a way loaded with MultiFetch may have incomplete nodes because at least one of its
- // nodes isn't present in the local data set. We therefore fully load all
- // ways with incomplete nodes.
- //
- for (Way w : ds.getWays()) {
- if (canceled) return;
- if (w.hasIncompleteNodes()) {
- synchronized (this) {
- if (canceled) return;
- objectReader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */);
- }
- theirDataSet = objectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
- synchronized (this) {
- objectReader = null;
- }
- merger = new DataSetMerger(ds, theirDataSet);
- merger.merge();
- }
- }
- } catch (Exception e) {
- if (canceled)
- return;
- lastException = e;
- }
+ protected void initMultiFetchReader(MultiFetchServerObjectReader reader) {
+ initMultiFetchReaderWithNodes(reader);
+ initMultiFetchReaderWithWays(reader);
+ initMultiFetchReaderWithRelations(reader);
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java b/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
index 2a55dc0..381d186 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
@@ -16,9 +16,9 @@ import org.openstreetmap.josm.gui.progress.ProgressRenderer;
class UploadAndSaveProgressRenderer extends JPanel implements ProgressRenderer, PropertyChangeListener {
- private JLabel lblTaskTitle;
- private JLabel lblCustomText;
- private JProgressBar progressBar;
+ private final JLabel lblTaskTitle = new JLabel("");
+ private final JLabel lblCustomText = new JLabel("");
+ private final JProgressBar progressBar = new JProgressBar(JProgressBar.HORIZONTAL);
/**
* Constructs a new {@code UploadAndSaveProgressRenderer}.
@@ -38,23 +38,15 @@ class UploadAndSaveProgressRenderer extends JPanel implements ProgressRenderer,
gc.weightx = 1.0;
gc.weighty = 0.0;
gc.insets = new Insets(5, 0, 0, 5);
- add(lblTaskTitle = new JLabel(""), gc);
+ add(lblTaskTitle, gc);
+ lblTaskTitle.setLabelFor(lblCustomText);
- gc.gridx = 0;
gc.gridy = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- gc.weighty = 0.0;
- gc.insets = new Insets(5, 0, 0, 5);
- add(lblCustomText = new JLabel(""), gc);
+ add(lblCustomText, gc);
+ lblCustomText.setLabelFor(progressBar);
- gc.gridx = 0;
gc.gridy = 2;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- gc.weighty = 0.0;
- gc.insets = new Insets(5, 0, 0, 5);
- add(progressBar = new JProgressBar(JProgressBar.HORIZONTAL), gc);
+ add(progressBar, gc);
}
@Override
@@ -90,11 +82,7 @@ class UploadAndSaveProgressRenderer extends JPanel implements ProgressRenderer,
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
- Mode mode = (Mode) evt.getNewValue();
- switch(mode) {
- case EDITING_DATA: setVisible(false); break;
- case UPLOADING_AND_SAVING: setVisible(true); break;
- }
+ setVisible(Mode.UPLOADING_AND_SAVING.equals(evt.getNewValue()));
}
getParent().validate();
}
diff --git a/src/org/openstreetmap/josm/gui/io/UploadDialog.java b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
index 3046df0..537077b 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
@@ -17,6 +17,7 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.lang.Character.UnicodeBlock;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -50,6 +51,7 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageOverlay;
@@ -100,7 +102,7 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
* Constructs a new {@code UploadDialog}.
*/
public UploadDialog() {
- super(JOptionPane.getFrameForComponent(Main.parent), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(Main.parent), ModalityType.DOCUMENT_MODAL);
build();
}
@@ -501,9 +503,23 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
);
}
+ static boolean isUploadCommentTooShort(String comment) {
+ String s = comment.trim();
+ boolean result = true;
+ if (!s.isEmpty()) {
+ UnicodeBlock block = Character.UnicodeBlock.of(s.charAt(0));
+ if (block != null && block.toString().contains("CJK")) {
+ result = s.length() < 4;
+ } else {
+ result = s.length() < 10;
+ }
+ }
+ return result;
+ }
+
@Override
public void actionPerformed(ActionEvent e) {
- if (dialog.getUploadComment().trim().length() < 10 && warnUploadComment()) {
+ if (isUploadCommentTooShort(dialog.getUploadComment()) && warnUploadComment()) {
// abort for missing comment
dialog.handleMissingComment();
return;
diff --git a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
index e4456f8..dcf421e 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
@@ -117,6 +117,7 @@ public class UploadParameterSummaryPanel extends JPanel implements HyperlinkList
add(jepMessage, BorderLayout.CENTER);
lblWarning = new JLabel("");
lblWarning.setVisible(false);
+ lblWarning.setLabelFor(jepMessage);
lblWarning.setIcon(ImageProvider.get("warning-small"));
lblWarning.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
JPanel pnl = new JPanel(new BorderLayout());
diff --git a/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java b/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
index 304a748..831e419 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
@@ -261,7 +261,9 @@ public class UploadPrimitivesTask extends AbstractUploadTask {
//
recoverFromGoneOnServer(e, getProgressMonitor());
} catch (ChangesetClosedException e) {
- processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
+ if (writer != null) {
+ processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
+ }
changeset.setOpen(false);
switch(e.getSource()) {
case UNSPECIFIED:
diff --git a/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java b/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
index 6337765..b76c1c4 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
@@ -23,7 +23,6 @@ import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JList;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
@@ -40,6 +39,7 @@ import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -60,7 +60,7 @@ public class UploadSelectionDialog extends JDialog {
* Constructs a new {@code UploadSelectionDialog}.
*/
public UploadSelectionDialog() {
- super(JOptionPane.getFrameForComponent(Main.parent), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(Main.parent), ModalityType.DOCUMENT_MODAL);
build();
}
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java b/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java
new file mode 100644
index 0000000..7d249cf
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java
@@ -0,0 +1,43 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * This class implements the invalidation listener mechanism suggested by {@link MapViewPaintable}.
+ *
+ * @author Michael Zangl
+ * @since 10031
+ */
+public abstract class AbstractMapViewPaintable implements MapViewPaintable {
+
+ /**
+ * A list of invalidation listeners to call when this layer is invalidated.
+ */
+ private final CopyOnWriteArrayList<PaintableInvalidationListener> invalidationListeners = new CopyOnWriteArrayList<>();
+
+ /**
+ * Adds a new paintable invalidation listener.
+ * @param l The listener to add.
+ */
+ public void addInvalidationListener(PaintableInvalidationListener l) {
+ invalidationListeners.add(l);
+ }
+
+ /**
+ * Removes an added paintable invalidation listener.
+ * @param l The listener to remove.
+ */
+ public void removeInvalidationListener(PaintableInvalidationListener l) {
+ invalidationListeners.remove(l);
+ }
+
+ /**
+ * This needs to be called whenever the content of this view was invalidated.
+ */
+ public void invalidate() {
+ for (PaintableInvalidationListener l : invalidationListeners) {
+ l.paintablInvalidated(new PaintableInvalidationEvent(this));
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index dec57af..b934223 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -258,6 +258,18 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener {
redraw();
}
+ @Override
+ public void setSharpenLevel(double sharpenLevel) {
+ super.setSharpenLevel(sharpenLevel);
+ redraw();
+ }
+
+ @Override
+ public void setColorfulness(double colorfulness) {
+ super.setColorfulness(colorfulness);
+ redraw();
+ }
+
/**
* Marks layer as needing redraw on offset change
*/
@@ -1012,15 +1024,15 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener {
double imageXScaling = sourceImg.getWidth(this) / source.getWidth();
// How many pixels into the 'source' rectangle are we drawing?
- int screen_x_offset = target.x - source.x;
- int screen_y_offset = target.y - source.y;
+ int screenXoffset = target.x - source.x;
+ int screenYoffset = target.y - source.y;
// And how many pixels into the image itself does that correlate to?
- int img_x_offset = (int) (screen_x_offset * imageXScaling + 0.5);
- int img_y_offset = (int) (screen_y_offset * imageYScaling + 0.5);
+ 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 img_x_end = img_x_offset + (int) (target.getWidth() * imageXScaling + 0.5);
- int img_y_end = img_y_offset + (int) (target.getHeight() * imageYScaling + 0.5);
+ 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);
@@ -1028,8 +1040,8 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener {
g.drawImage(sourceImg,
target.x, target.y,
target.x + target.width, target.y + target.height,
- img_x_offset, img_y_offset,
- img_x_end, img_y_end,
+ imgXoffset, imgYoffset,
+ imgXend, imgYend,
this);
if (PROP_FADE_AMOUNT.get() != 0) {
// dimm by painting opaque rect...
@@ -1210,6 +1222,14 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener {
y0 = t1.getYIndex();
x1 = t2.getXIndex();
y1 = t2.getYIndex();
+ double centerLon = Main.getProjection().eastNorth2latlon(Main.map.mapView.getCenter()).lon();
+
+ if (topLeft.lon() > centerLon) {
+ x0 = tileSource.getTileXMin(zoom);
+ }
+ if (botRight.lon() < centerLon) {
+ x1 = tileSource.getTileXMax(zoom);
+ }
if (x0 > x1) {
int tmp = x0;
diff --git a/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java b/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
index be00593..ae6a88c 100644
--- a/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
+++ b/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
@@ -60,7 +60,7 @@ public class AlignImageryPanel extends JPanel {
if (Main.isDisplayingMapView()) {
Main.map.removeTopPanel(AlignImageryPanel.class);
if (doNotShowAgain.isSelected()) {
- showAgain.put(false);
+ showAgain.put(Boolean.FALSE);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
index 6bdf88a..f18ad59 100644
--- a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
@@ -134,7 +134,7 @@ public class GpxLayer extends Layer {
@Override
public Object getInfoComponent() {
- StringBuilder info = new StringBuilder(48);
+ StringBuilder info = new StringBuilder(48).append("<html>");
if (data.attr.containsKey("name")) {
info.append(tr("Name: {0}", data.get(GpxConstants.META_NAME))).append("<br>");
@@ -176,7 +176,8 @@ public class GpxLayer extends Layer {
info.append(tr("Length: {0}", SystemOfMeasurement.getSystemOfMeasurement().getDistText(data.length()))).append("<br>")
.append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())).append(
- trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br>");
+ trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br>")
+ .append("</html>");
final JScrollPane sp = new JScrollPane(new HtmlPanel(info.toString()));
sp.setPreferredSize(new Dimension(sp.getPreferredSize().width+20, 370));
@@ -384,4 +385,8 @@ public class GpxLayer extends Layer {
return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), GpxImporter.getFileFilter());
}
+ @Override
+ public LayerPositionStrategy getDefaultLayerPosition() {
+ return LayerPositionStrategy.AFTER_LAST_DATA_LAYER;
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index 6cf89da..37ca1ec 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -7,27 +7,24 @@ import static org.openstreetmap.josm.tools.I18n.trc;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Font;
-import java.awt.Graphics2D;
import java.awt.GridBagLayout;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
import java.awt.Transparency;
import java.awt.event.ActionEvent;
-import java.awt.font.FontRenderContext;
-import java.awt.font.LineBreakMeasurer;
-import java.awt.font.TextAttribute;
-import java.awt.font.TextLayout;
+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.ConvolveOp;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
import java.awt.image.Kernel;
import java.awt.image.LookupOp;
import java.awt.image.ShortLookupTable;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.swing.AbstractAction;
import javax.swing.Icon;
@@ -79,6 +76,8 @@ public abstract class ImageryLayer extends Layer {
protected double dy;
protected GammaImageProcessor gammaImageProcessor = new GammaImageProcessor();
+ protected SharpenImageProcessor sharpenImageProcessor = new SharpenImageProcessor();
+ protected ColorfulImageProcessor collorfulnessImageProcessor = new ColorfulImageProcessor();
private final ImageryAdjustAction adjustAction = new ImageryAdjustAction(this);
@@ -96,8 +95,10 @@ public abstract class ImageryLayer extends Layer {
if (icon == null) {
icon = ImageProvider.get("imagery_small");
}
- addImageProcessor(createSharpener(PROP_SHARPEN_LEVEL.get()));
+ addImageProcessor(collorfulnessImageProcessor);
addImageProcessor(gammaImageProcessor);
+ addImageProcessor(sharpenImageProcessor);
+ sharpenImageProcessor.setSharpenLevel(1 + PROP_SHARPEN_LEVEL.get() / 2f);
}
public double getPPD() {
@@ -242,19 +243,6 @@ public abstract class ImageryLayer extends Layer {
return hasBookmarks ? subMenu : adjustMenuItem;
}
- public ImageProcessor createSharpener(int sharpenLevel) {
- final Kernel kernel;
- if (sharpenLevel == 1) {
- kernel = new Kernel(3, 3, new float[]{-0.25f, -0.5f, -0.25f, -0.5f, 4, -0.5f, -0.25f, -0.5f, -0.25f});
- } else if (sharpenLevel == 2) {
- kernel = new Kernel(3, 3, new float[]{-0.5f, -1, -0.5f, -1, 7, -1, -0.5f, -1, -0.5f});
- } else {
- return null;
- }
- BufferedImageOp op = new ConvolveOp(kernel, ConvolveOp.EDGE_NO_OP, null);
- return createImageProcessor(op, false);
- }
-
/**
* An image processor which adjusts the gamma value of an image.
*/
@@ -310,6 +298,258 @@ public abstract class ImageryLayer extends Layer {
}
/**
+ * Sharpens or blurs the image, depending on the sharpen value.
+ * <p>
+ * A positive sharpen level means that we sharpen the image.
+ * <p>
+ * A negative sharpen level let's us blur the image. -1 is the most useful value there.
+ *
+ * @author Michael Zangl
+ */
+ public static class SharpenImageProcessor implements ImageProcessor {
+ private float sharpenLevel = 0;
+ private ConvolveOp op;
+
+ private static float[] KERNEL_IDENTITY = new float[] {
+ 0, 0, 0,
+ 0, 1, 0,
+ 0, 0, 0
+ };
+
+ private static float[] KERNEL_BLUR = new float[] {
+ 1f / 16, 2f / 16, 1f / 16,
+ 2f / 16, 4f / 16, 2f / 16,
+ 1f / 16, 2f / 16, 1f / 16
+ };
+
+ private static float[] KERNEL_SHARPEN = new float[] {
+ -.5f, -1f, -.5f,
+ -1f, 7, -1f,
+ -.5f, -1f, -.5f
+ };
+
+ /**
+ * Gets the current sharpen level.
+ * @return The level.
+ */
+ public float getSharpenLevel() {
+ return sharpenLevel;
+ }
+
+ /**
+ * Sets the sharpening level.
+ * @param sharpenLevel The level. Clamped to be positive or 0.
+ */
+ public void setSharpenLevel(float sharpenLevel) {
+ if (sharpenLevel < 0) {
+ this.sharpenLevel = 0;
+ } else {
+ this.sharpenLevel = sharpenLevel;
+ }
+
+ if (this.sharpenLevel < 0.95) {
+ op = generateMixed(this.sharpenLevel, KERNEL_IDENTITY, KERNEL_BLUR);
+ } else if (this.sharpenLevel > 1.05) {
+ op = generateMixed(this.sharpenLevel - 1, KERNEL_SHARPEN, KERNEL_IDENTITY);
+ } else {
+ op = null;
+ }
+ }
+
+ private ConvolveOp generateMixed(float aFactor, float[] a, float[] b) {
+ if (a.length != 9 || b.length != 9) {
+ throw new IllegalArgumentException("Illegal kernel array length.");
+ }
+ float[] values = new float[9];
+ for (int i = 0; i < values.length; i++) {
+ values[i] = aFactor * a[i] + (1 - aFactor) * b[i];
+ }
+ return new ConvolveOp(new Kernel(3, 3, values), ConvolveOp.EDGE_NO_OP, null);
+ }
+
+ @Override
+ public BufferedImage process(BufferedImage image) {
+ if (op != null) {
+ return op.filter(image, null);
+ } else {
+ return image;
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "SharpenImageProcessor [sharpenLevel=" + sharpenLevel + "]";
+ }
+ }
+
+ /**
+ * Adds or removes the colorfulness of the image.
+ *
+ * @author Michael Zangl
+ */
+ public static class ColorfulImageProcessor implements ImageProcessor {
+ private ColorfulFilter op = null;
+ private double colorfulness = 1;
+
+ /**
+ * Gets the colorfulness value.
+ * @return The value
+ */
+ public double getColorfulness() {
+ return colorfulness;
+ }
+
+ /**
+ * Sets the colorfulness value. Clamps it to 0+
+ * @param colorfulness The value
+ */
+ public void setColorfulness(double colorfulness) {
+ if (colorfulness < 0) {
+ this.colorfulness = 0;
+ } else {
+ this.colorfulness = colorfulness;
+ }
+
+ if (this.colorfulness < .95 || this.colorfulness > 1.05) {
+ op = new ColorfulFilter(this.colorfulness);
+ } else {
+ op = null;
+ }
+ }
+
+ @Override
+ public BufferedImage process(BufferedImage image) {
+ if (op != null) {
+ return op.filter(image, null);
+ } else {
+ return image;
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "ColorfulImageProcessor [colorfulness=" + colorfulness + "]";
+ }
+ }
+
+ private 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 dest) {
+ if (src.getWidth() == 0 || src.getHeight() == 0) {
+ return src;
+ }
+
+ if (dest == null) {
+ dest = 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, greenOffset, blueOffset, 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;
+ float luminosity = r * .21f + g * .72f + b * .07f;
+ 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, float 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;
+ }
+
+ }
+
+ /**
* Returns the currently set gamma value.
* @return the currently set gamma value
*/
@@ -326,6 +566,44 @@ public abstract class ImageryLayer extends Layer {
}
/**
+ * Gets the current sharpen level.
+ * @return The sharpen level.
+ */
+ public double getSharpenLevel() {
+ return sharpenImageProcessor.getSharpenLevel();
+ }
+
+ /**
+ * Sets the sharpen level for the layer.
+ * <code>1</code> means no change in sharpness.
+ * Values in range 0..1 blur the image.
+ * Values above 1 are used to sharpen the image.
+ * @param sharpenLevel The sharpen level.
+ */
+ public void setSharpenLevel(double sharpenLevel) {
+ sharpenImageProcessor.setSharpenLevel((float) sharpenLevel);
+ }
+
+ /**
+ * Gets the colorfulness of this image.
+ * @return The colorfulness
+ */
+ public double getColorfulness() {
+ return collorfulnessImageProcessor.getColorfulness();
+ }
+
+ /**
+ * Sets the colorfulness of this image.
+ * 0 means grayscale.
+ * 1 means normal colorfulness.
+ * Values greater than 1 are allowed.
+ * @param colorfulness The colorfulness.
+ */
+ public void setColorfulness(double colorfulness) {
+ collorfulnessImageProcessor.setColorfulness(colorfulness);
+ }
+
+ /**
* This method adds the {@link ImageProcessor} to this Layer if it is not {@code null}.
*
* @param processor that processes the image
@@ -386,62 +664,6 @@ public abstract class ImageryLayer extends Layer {
return img;
}
- /**
- * Draws a red error tile when imagery tile cannot be fetched.
- * @param img The buffered image
- * @param message Additional error message to display
- */
- public void drawErrorTile(BufferedImage img, String message) {
- Graphics2D g = (Graphics2D) img.getGraphics();
- g.setColor(Color.RED);
- g.fillRect(0, 0, img.getWidth(), img.getHeight());
- g.setFont(g.getFont().deriveFont(Font.PLAIN).deriveFont(24.0f));
- g.setColor(Color.BLACK);
-
- String text = tr("ERROR");
- g.drawString(text, (img.getWidth() - g.getFontMetrics().stringWidth(text)) / 2, g.getFontMetrics().getHeight()+5);
- if (message != null) {
- float drawPosY = 2.5f*g.getFontMetrics().getHeight()+10;
- if (!message.contains(" ")) {
- g.setFont(g.getFont().deriveFont(Font.PLAIN).deriveFont(18.0f));
- g.drawString(message, 5, (int) drawPosY);
- } else {
- // Draw message on several lines
- Map<TextAttribute, Object> map = new HashMap<>();
- map.put(TextAttribute.FAMILY, "Serif");
- map.put(TextAttribute.SIZE, new Float(18.0));
- AttributedString vanGogh = new AttributedString(message, map);
- // Create a new LineBreakMeasurer from the text
- AttributedCharacterIterator paragraph = vanGogh.getIterator();
- int paragraphStart = paragraph.getBeginIndex();
- int paragraphEnd = paragraph.getEndIndex();
- FontRenderContext frc = g.getFontRenderContext();
- LineBreakMeasurer lineMeasurer = new LineBreakMeasurer(paragraph, frc);
- // Set break width to width of image with some margin
- float breakWidth = img.getWidth()-10;
- // Set position to the index of the first character in the text
- lineMeasurer.setPosition(paragraphStart);
- // Get lines until the entire paragraph has been displayed
- while (lineMeasurer.getPosition() < paragraphEnd) {
- // Retrieve next layout
- TextLayout layout = lineMeasurer.nextLayout(breakWidth);
-
- // Compute pen x position
- float drawPosX = layout.isLeftToRight() ? 0 : breakWidth - layout.getAdvance();
-
- // Move y-coordinate by the ascent of the layout
- drawPosY += layout.getAscent();
-
- // Draw the TextLayout at (drawPosX, drawPosY)
- layout.draw(g, drawPosX, drawPosY);
-
- // Move y-coordinate in preparation for next layout
- drawPosY += layout.getDescent() + layout.getLeading();
- }
- }
- }
- }
-
@Override
public void destroy() {
super.destroy();
diff --git a/src/org/openstreetmap/josm/gui/layer/Layer.java b/src/org/openstreetmap/josm/gui/layer/Layer.java
index 26842aa..e52e429 100644
--- a/src/org/openstreetmap/josm/gui/layer/Layer.java
+++ b/src/org/openstreetmap/josm/gui/layer/Layer.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Graphics2D;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
@@ -23,11 +22,9 @@ import org.openstreetmap.josm.actions.GpxExportAction;
import org.openstreetmap.josm.actions.SaveAction;
import org.openstreetmap.josm.actions.SaveActionBase;
import org.openstreetmap.josm.actions.SaveAsAction;
-import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
-import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
@@ -47,7 +44,7 @@ import org.openstreetmap.josm.tools.Utils;
*
* @author imi
*/
-public abstract class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener {
+public abstract class Layer extends AbstractMapViewPaintable implements Destroyable, ProjectionChangeListener {
/**
* Action related to a single layer.
@@ -187,13 +184,6 @@ public abstract class Layer implements Destroyable, MapViewPaintable, Projection
}
/**
- * Paint the dataset using the engine set.
- * @param mv The object that can translate GeoPoints to screen coordinates.
- */
- @Override
- public abstract void paint(Graphics2D g, MapView mv, Bounds box);
-
- /**
* Return a representative small image for this layer. The image must not
* be larger than 64 pixel in any dimension.
* @return layer icon
@@ -360,10 +350,19 @@ public abstract class Layer implements Destroyable, MapViewPaintable, Projection
return visible && opacity != 0;
}
+ /**
+ * Gets the opacity of the layer, in range 0...1
+ * @return The opacity
+ */
public double getOpacity() {
return opacity;
}
+ /**
+ * Sets the opacity of the layer, in range 0...1
+ * @param opacity The opacity
+ * @throws IllegalArgumentException if the opacity is out of range
+ */
public void setOpacity(double opacity) {
if (!(opacity >= 0 && opacity <= 1))
throw new IllegalArgumentException("Opacity value must be between 0 and 1");
@@ -580,4 +579,17 @@ public abstract class Layer implements Destroyable, MapViewPaintable, Projection
protected long estimateMemoryUsage() {
return 0;
}
+
+ /**
+ * Gets the strategy that specifies where this layer should be inserted in a layer list.
+ * @return That strategy.
+ * @since 10008
+ */
+ public LayerPositionStrategy getDefaultLayerPosition() {
+ if (isBackgroundLayer()) {
+ return LayerPositionStrategy.BEFORE_FIRST_BACKGROUND_LAYER;
+ } else {
+ return LayerPositionStrategy.AFTER_LAST_VALIDATION_LAYER;
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java b/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java
new file mode 100644
index 0000000..46d88d4
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java
@@ -0,0 +1,113 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import java.util.List;
+
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Predicates;
+
+/**
+ * This class defines a position to insert a given layer in the list of layers.
+ * @author Michael Zangl
+ * @since 10008
+ */
+public abstract class LayerPositionStrategy {
+
+ /**
+ * always inserts at the front of the stack.
+ */
+ public static final LayerPositionStrategy IN_FRONT = new LayerPositionStrategy() {
+ @Override
+ public int getPosition(MapView manager) {
+ return 0;
+ }
+ };
+
+ /**
+ * A GPX layer is added below the lowest data layer.
+ */
+ public static final LayerPositionStrategy AFTER_LAST_DATA_LAYER = afterLast(new Predicate<Layer>() {
+ @Override
+ public boolean evaluate(Layer object) {
+ return object instanceof OsmDataLayer || object instanceof ValidatorLayer;
+ }
+ });
+
+ /**
+ * A normal layer is added after all validation layers.
+ */
+ public static final LayerPositionStrategy AFTER_LAST_VALIDATION_LAYER = afterLast(new Predicate<Layer>() {
+ @Override
+ public boolean evaluate(Layer object) {
+ return object instanceof ValidatorLayer;
+ }
+ });
+
+ /**
+ * The default for background layers: They are added before the first background layer in the list.
+ * If there is none, they are added at the end of the list.
+ */
+ public static final LayerPositionStrategy BEFORE_FIRST_BACKGROUND_LAYER = inFrontOfFirst(new Predicate<Layer>() {
+ @Override
+ public boolean evaluate(Layer object) {
+ return object.isBackgroundLayer();
+ }
+ });
+
+ /**
+ * Gets a {@link LayerPositionStrategy} that inserts this layer in front of a given layer
+ * @param other The layer before which to insert this layer
+ * @return The strategy
+ */
+ public static LayerPositionStrategy inFrontOf(Layer other) {
+ return inFrontOfFirst(Predicates.equalTo(other));
+ }
+
+ /**
+ * Gets a {@link LayerPositionStrategy} that inserts the layer in front of the first layer that matches a condition.
+ * @param what The condition to match.
+ * @return The strategy.
+ */
+ public static LayerPositionStrategy inFrontOfFirst(final Predicate<Layer> what) {
+ return new LayerPositionStrategy() {
+ @Override
+ public int getPosition(MapView manager) {
+ List<Layer> layers = manager.getAllLayersAsList();
+ for (int i = 0; i < layers.size(); i++) {
+ if (what.evaluate(layers.get(i))) {
+ return i;
+ }
+ }
+ return layers.size();
+ }
+ };
+ }
+
+ /**
+ * Creates a strategy that places the layer after the last layer of a given kind or at the beginning of the list if no such layer exists.
+ * @param what what to search for
+ * @return The strategy.
+ */
+ public static LayerPositionStrategy afterLast(final Predicate<Layer> what) {
+ return new LayerPositionStrategy() {
+ @Override
+ public int getPosition(MapView manager) {
+ List<Layer> layers = manager.getAllLayersAsList();
+ for (int i = layers.size() - 1; i >= 0; i--) {
+ if (what.evaluate(layers.get(i))) {
+ return i + 1;
+ }
+ }
+ return 0;
+ }
+ };
+ }
+
+ /**
+ * Gets the position where the layer should be inserted
+ * @param manager The layer manager to insert the layer in.
+ * @return The position in the range 0...layers.size
+ */
+ public abstract int getPosition(MapView manager);
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java b/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
index fa0fc7b..9eab095 100644
--- a/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
+++ b/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
@@ -6,9 +6,61 @@ import java.awt.Graphics2D;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.gui.MapView;
+/**
+ * This is a component that can be painted on the map view.
+ * <p>
+ * You might want to extend {@link AbstractMapViewPaintable} to ease implementation of this.
+ * <p>
+ * That class allows you to listen to paintable change events. Those methods may be moved here some time in the future.
+ */
public interface MapViewPaintable {
/**
+ * This event is fired whenever the paintable got invalidated and needs repainting some time in the future.
+ * <p>
+ * Note: We might add an area in the future.
+ *
+ * @author Michael Zangl
+ */
+ class PaintableInvalidationEvent {
+ private final MapViewPaintable paintable;
+
+ /**
+ * Creates a new {@link PaintableInvalidationEvent}
+ * @param paintable The paintable that is invalidated.
+ */
+ public PaintableInvalidationEvent(MapViewPaintable paintable) {
+ super();
+ this.paintable = paintable;
+ }
+
+ /**
+ * Gets the layer that was invalidated.
+ * @return The layer.
+ */
+ public MapViewPaintable getLayer() {
+ return paintable;
+ }
+
+ @Override
+ public String toString() {
+ return "LayerInvalidationEvent [layer=" + paintable + "]";
+ }
+ }
+
+ /**
+ * This is a listener that listens to {@link PaintableInvalidationEvent}s
+ * @author Michael Zangl
+ */
+ interface PaintableInvalidationListener {
+ /**
+ * Called whenever a {@link PaintableInvalidationEvent} is fired. This might be called from any thread.
+ * @param event The event
+ */
+ void paintablInvalidated(PaintableInvalidationEvent event);
+ }
+
+ /**
* Paint the dataset using the engine set.
* @param g Graphics
* @param mv The object that can translate GeoPoints to screen coordinates.
diff --git a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
index 5087941..62aee54 100644
--- a/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
@@ -47,7 +47,7 @@ import org.openstreetmap.josm.tools.date.DateUtils;
* A layer to hold Note objects.
* @since 7522
*/
-public class NoteLayer extends AbstractModifiableLayer implements MouseListener, UploadToServer, SaveToFile {
+public class NoteLayer extends AbstractModifiableLayer implements MouseListener {
private final NoteData noteData;
@@ -112,7 +112,7 @@ public class NoteLayer extends AbstractModifiableLayer implements MouseListener,
ImageIcon icon = null;
if (note.getId() < 0) {
icon = NotesDialog.ICON_NEW_SMALL;
- } else if (note.getState() == State.closed) {
+ } else if (note.getState() == State.CLOSED) {
icon = NotesDialog.ICON_CLOSED_SMALL;
} else {
icon = NotesDialog.ICON_OPEN_SMALL;
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 55d352b..20e49e2 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -108,7 +108,7 @@ import org.openstreetmap.josm.tools.date.DateUtils;
* @author imi
* @since 17
*/
-public class OsmDataLayer extends AbstractModifiableLayer implements Listener, SelectionChangedListener, UploadToServer, SaveToFile {
+public class OsmDataLayer extends AbstractModifiableLayer implements Listener, SelectionChangedListener {
/** 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";
/** Property used to know if this layer has to be uploaded */
@@ -916,14 +916,20 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
@Override
public void processDatasetEvent(AbstractDatasetChangedEvent event) {
- isChanged = true;
+ invalidate();
setRequiresSaveToFile(true);
setRequiresUploadToServer(true);
}
@Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+ invalidate();
+ }
+
+ @Override
+ public void invalidate() {
isChanged = true;
+ super.invalidate();
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java b/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
index 1f0c0be..82c57d6 100644
--- a/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
@@ -159,4 +159,9 @@ public class ValidatorLayer extends Layer implements LayerChangeListener {
OsmValidator.errorLayer = null;
}
}
+
+ @Override
+ public LayerPositionStrategy getDefaultLayerPosition() {
+ return LayerPositionStrategy.IN_FRONT;
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
index f7cbb7f..dff61c2 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
@@ -43,9 +43,6 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<TemplatedWMSTileSour
/** should WMS layer autozoom in default mode */
public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty(PREFERENCE_PREFIX + "default_autozoom", true);
- /** limit of concurrent connections to WMS tile source (per source) */
- public static final IntegerProperty THREAD_LIMIT = new IntegerProperty(PREFERENCE_PREFIX + "simultaneousConnections", 3);
-
private static final String CACHE_REGION_NAME = "WMS";
private final Set<String> supportedProjections;
diff --git a/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
index e728960..c61ee95 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
@@ -29,7 +29,7 @@ public class WMTSLayer extends AbstractCachedTileSourceLayer<WMTSTileSource> imp
/**
* default setting of autozoom per layer
*/
- public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty("imagery.wmts.default_autozoom", true);
+ public static final BooleanProperty PROP_DEFAULT_AUTOZOOM_WMTS = new BooleanProperty("imagery.wmts.default_autozoom", true);
private static final String CACHE_REGION_NAME = "WMTS";
/**
@@ -38,7 +38,7 @@ public class WMTSLayer extends AbstractCachedTileSourceLayer<WMTSTileSource> imp
*/
public WMTSLayer(ImageryInfo info) {
super(info);
- autoZoom = PROP_DEFAULT_AUTOZOOM.get();
+ autoZoom = PROP_DEFAULT_AUTOZOOM_WMTS.get();
}
@Override
@@ -62,11 +62,10 @@ public class WMTSLayer extends AbstractCachedTileSourceLayer<WMTSTileSource> imp
if (!Main.isDisplayingMapView())
return 0;
ScaleList scaleList = getNativeScales();
- Scale snap = null;
if (scaleList == null) {
return getMaxZoomLvl();
}
- snap = scaleList.getSnapScale(Main.map.mapView.getScale(), false);
+ Scale snap = scaleList.getSnapScale(Main.map.mapView.getScale(), false);
return Math.max(
getMinZoomLvl(),
Math.min(
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
index 26b2a63..c0deb62 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
@@ -839,8 +839,8 @@ public class CorrelateGpxWithImages extends AbstractAction {
if (selGpx == null)
return tr("No gpx selected");
- final long offset_ms = ((long) (timezone.getHours() * 3600 * 1000)) + delta.getMilliseconds(); // in milliseconds
- lastNumMatched = matchGpxTrack(dateImgLst, selGpx.data, offset_ms);
+ final long offsetMs = ((long) (timezone.getHours() * 3600 * 1000)) + delta.getMilliseconds(); // in milliseconds
+ lastNumMatched = matchGpxTrack(dateImgLst, selGpx.data, offsetMs);
return trn("<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>",
"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>",
@@ -1390,7 +1390,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
} catch (NumberFormatException nfe) {
// Invalid timezone
- throw new ParseException(error, 0);
+ throw (ParseException) new ParseException(error, 0).initCause(nfe);
}
if (h > 12 || m > 59)
@@ -1458,7 +1458,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
return Offset.milliseconds(Math.round(Double.parseDouble(offset) * 1000));
} catch (NumberFormatException nfe) {
- throw new ParseException(error, 0);
+ throw (ParseException) new ParseException(error, 0).initCause(nfe);
}
} else {
return Offset.ZERO;
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index 48b494d..4286aab 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -55,11 +55,11 @@ import org.openstreetmap.josm.gui.NavigatableComponent;
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.AbstractModifiableLayer;
import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToMarkerLayer;
import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToNextMarker;
import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToPreviousMarker;
-import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.JpgImporter;
@@ -969,7 +969,7 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
public void updateBufferAndRepaint() {
updateOffscreenBuffer = true;
- Main.map.mapView.repaint();
+ invalidate();
}
/**
@@ -977,14 +977,7 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
* @return List of images in layer
*/
public List<ImageEntry> getImages() {
- if (data == null) {
- return Collections.emptyList();
- }
- List<ImageEntry> copy = new ArrayList<>(data.size());
- for (ImageEntry ie : data) {
- copy.add(ie);
- }
- return copy;
+ return data == null ? Collections.<ImageEntry>emptyList() : new ArrayList<>(data);
}
/**
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
index 4438d78..8a57ab9 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
@@ -90,21 +90,21 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
btnPrevious.setPreferredSize(buttonDim);
Shortcut scPrev = Shortcut.registerShortcut(
"geoimage:previous", tr("Geoimage: {0}", tr("Show previous Image")), KeyEvent.VK_PAGE_UP, Shortcut.DIRECT);
- final String APREVIOUS = "Previous Image";
+ final String previousImage = "Previous Image";
Main.registerActionShortcut(prevAction, scPrev);
- btnPrevious.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scPrev.getKeyStroke(), APREVIOUS);
- btnPrevious.getActionMap().put(APREVIOUS, prevAction);
+ btnPrevious.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scPrev.getKeyStroke(), previousImage);
+ btnPrevious.getActionMap().put(previousImage, prevAction);
btnPrevious.setEnabled(false);
- final String DELETE_TEXT = tr("Remove photo from layer");
- ImageAction delAction = new ImageAction(COMMAND_REMOVE, ImageProvider.get("dialogs", "delete"), DELETE_TEXT);
+ final String removePhoto = tr("Remove photo from layer");
+ ImageAction delAction = new ImageAction(COMMAND_REMOVE, ImageProvider.get("dialogs", "delete"), removePhoto);
JButton btnDelete = new JButton(delAction);
btnDelete.setPreferredSize(buttonDim);
Shortcut scDelete = Shortcut.registerShortcut(
"geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo from layer")), KeyEvent.VK_DELETE, Shortcut.SHIFT);
Main.registerActionShortcut(delAction, scDelete);
- btnDelete.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDelete.getKeyStroke(), DELETE_TEXT);
- btnDelete.getActionMap().put(DELETE_TEXT, delAction);
+ btnDelete.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDelete.getKeyStroke(), removePhoto);
+ btnDelete.getActionMap().put(removePhoto, delAction);
ImageAction delFromDiskAction = new ImageAction(COMMAND_REMOVE_FROM_DISK,
ImageProvider.get("dialogs", "geoimage/deletefromdisk"), tr("Delete image file from disk"));
@@ -112,30 +112,30 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
btnDeleteFromDisk.setPreferredSize(buttonDim);
Shortcut scDeleteFromDisk = Shortcut.registerShortcut(
"geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete File from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT);
- final String ADELFROMDISK = "Delete image file from disk";
+ final String deleteImage = "Delete image file from disk";
Main.registerActionShortcut(delFromDiskAction, scDeleteFromDisk);
- btnDeleteFromDisk.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDeleteFromDisk.getKeyStroke(), ADELFROMDISK);
- btnDeleteFromDisk.getActionMap().put(ADELFROMDISK, delFromDiskAction);
+ btnDeleteFromDisk.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDeleteFromDisk.getKeyStroke(), deleteImage);
+ btnDeleteFromDisk.getActionMap().put(deleteImage, delFromDiskAction);
ImageAction copyPathAction = new ImageAction(COMMAND_COPY_PATH, ImageProvider.get("copy"), tr("Copy image path"));
JButton btnCopyPath = new JButton(copyPathAction);
btnCopyPath.setPreferredSize(buttonDim);
Shortcut scCopyPath = Shortcut.registerShortcut(
"geoimage:copypath", tr("Geoimage: {0}", tr("Copy image path")), KeyEvent.VK_C, Shortcut.ALT_CTRL_SHIFT);
- final String ACOPYPATH = "Copy image path";
+ final String copyImage = "Copy image path";
Main.registerActionShortcut(copyPathAction, scCopyPath);
- btnCopyPath.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scCopyPath.getKeyStroke(), ACOPYPATH);
- btnCopyPath.getActionMap().put(ACOPYPATH, copyPathAction);
+ btnCopyPath.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scCopyPath.getKeyStroke(), copyImage);
+ btnCopyPath.getActionMap().put(copyImage, copyPathAction);
ImageAction nextAction = new ImageAction(COMMAND_NEXT, ImageProvider.get("dialogs", "next"), tr("Next"));
btnNext = new JButton(nextAction);
btnNext.setPreferredSize(buttonDim);
Shortcut scNext = Shortcut.registerShortcut(
"geoimage:next", tr("Geoimage: {0}", tr("Show next Image")), KeyEvent.VK_PAGE_DOWN, Shortcut.DIRECT);
- final String ANEXT = "Next Image";
+ final String nextImage = "Next Image";
Main.registerActionShortcut(nextAction, scNext);
- btnNext.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scNext.getKeyStroke(), ANEXT);
- btnNext.getActionMap().put(ANEXT, nextAction);
+ btnNext.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scNext.getKeyStroke(), nextImage);
+ btnNext.getActionMap().put(nextImage, nextAction);
btnNext.setEnabled(false);
Main.registerActionShortcut(
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
index 3c38e41..60bfc8b 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
@@ -92,13 +92,13 @@ public class DownloadAlongTrackAction extends DownloadAlongAction {
* soon as you touch any built-up area, that kind of bounding box will download forever
* and then stop because it has more than 50k nodes.
*/
- final double buffer_dist = panel.getDistance();
- final double max_area = panel.getArea() / 10000.0 / scale;
- final double buffer_y = buffer_dist / 100000.0;
- final double buffer_x = buffer_y / scale;
+ final double bufferDist = panel.getDistance();
+ final double maxArea = panel.getArea() / 10000.0 / scale;
+ final double bufferY = bufferDist / 100000.0;
+ final double bufferX = bufferY / scale;
final int totalTicks = latcnt;
// guess if a progress bar might be useful.
- final boolean displayProgress = totalTicks > 2000 && buffer_y < 0.01;
+ final boolean displayProgress = totalTicks > 2000 && bufferY < 0.01;
class CalculateDownloadArea extends PleaseWaitRunnable {
@@ -125,7 +125,7 @@ public class DownloadAlongTrackAction extends DownloadAlongAction {
if (cancel) {
return;
}
- confirmAndDownloadAreas(a, max_area, panel.isDownloadOsmData(), panel.isDownloadGpxData(),
+ confirmAndDownloadAreas(a, maxArea, panel.isDownloadOsmData(), panel.isDownloadGpxData(),
tr("Download from OSM along this track"), progressMonitor);
}
@@ -146,9 +146,9 @@ public class DownloadAlongTrackAction extends DownloadAlongAction {
private LatLon calcAreaForWayPoint(WayPoint p, LatLon previous) {
tick();
LatLon c = p.getCoor();
- if (previous == null || c.greatCircleDistance(previous) > buffer_dist) {
+ if (previous == null || c.greatCircleDistance(previous) > bufferDist) {
// we add a buffer around the point.
- r.setRect(c.lon() - buffer_x, c.lat() - buffer_y, 2 * buffer_x, 2 * buffer_y);
+ r.setRect(c.lon() - bufferX, c.lat() - bufferY, 2 * bufferX, 2 * bufferY);
a.add(new Area(r));
return c;
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
index 9fbf5e2..872fb78 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
@@ -4,33 +4,27 @@ package org.openstreetmap.josm.gui.layer.gpx;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.GraphicsEnvironment;
-import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.swing.AbstractAction;
-import javax.swing.JLabel;
import javax.swing.JOptionPane;
-import javax.swing.JPanel;
import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AbstractMergeAction.LayerListCellRenderer;
+import org.openstreetmap.josm.actions.AbstractMergeAction;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.GpxTrack;
import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
import org.openstreetmap.josm.gui.progress.ProgressTaskId;
import org.openstreetmap.josm.gui.progress.ProgressTaskIds;
-import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.xml.sax.SAXException;
@@ -128,24 +122,10 @@ public class DownloadWmsAlongTrackAction extends AbstractAction {
}
return null;
}
- JosmComboBox<AbstractTileSourceLayer> layerList = new JosmComboBox<>(targetLayers.toArray(new AbstractTileSourceLayer[0]));
- layerList.setRenderer(new LayerListCellRenderer());
- layerList.setSelectedIndex(0);
- JPanel pnl = new JPanel(new GridBagLayout());
- pnl.add(new JLabel(tr("Please select the imagery layer.")), GBC.eol());
- pnl.add(layerList, GBC.eol());
- if (GraphicsEnvironment.isHeadless()) {
- // return first layer in headless mode, for unit tests
- return targetLayers.get(0);
- }
- ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Select imagery layer"), new String[]{tr("Download"), tr("Cancel")});
- ed.setButtonIcons(new String[]{"dialogs/down", "cancel"});
- ed.setContent(pnl);
- ed.showDialog();
- if (ed.getValue() != 1) {
- return null;
- }
- return (AbstractTileSourceLayer) layerList.getSelectedItem();
+ return AbstractMergeAction.askTargetLayer(targetLayers.toArray(new AbstractTileSourceLayer[0]),
+ tr("Please select the imagery layer."),
+ tr("Select imagery layer"),
+ tr("Download"), "dialogs/down");
}
protected void warnNoImageryLayers() {
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
index e62d62b..4236d95 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
@@ -93,15 +93,15 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
for (WayPoint wpt : indata.waypoints) {
/* calculate time differences in waypoints */
double time = wpt.time;
- boolean wpt_has_link = wpt.attr.containsKey(GpxConstants.META_LINKS);
- if (firstTime < 0 && wpt_has_link) {
+ boolean wptHasLink = wpt.attr.containsKey(GpxConstants.META_LINKS);
+ if (firstTime < 0 && wptHasLink) {
firstTime = time;
for (GpxLink oneLink : wpt.<GpxLink>getCollection(GpxConstants.META_LINKS)) {
lastLinkedFile = oneLink.uri;
break;
}
}
- if (wpt_has_link) {
+ if (wptHasLink) {
for (GpxLink oneLink : wpt.<GpxLink>getCollection(GpxConstants.META_LINKS)) {
String uri = oneLink.uri;
if (uri != null) {
@@ -157,7 +157,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
return;
mousePressed = true;
if (isVisible()) {
- Main.map.mapView.repaint();
+ invalidate();
}
}
@@ -175,7 +175,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
}
}
}
- Main.map.mapView.repaint();
+ invalidate();
}
});
}
@@ -190,8 +190,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
@Override
public Color getColor(boolean ignoreCustom) {
- String name = getName();
- return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, DEFAULT_COLOR);
+ return Main.pref.getColor(marktr("gps marker"), "layer "+getName(), DEFAULT_COLOR);
}
/* for preferences */
@@ -222,7 +221,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
@Override
public String getToolTipText() {
- return data.size()+' '+trn("marker", "markers", data.size());
+ return data.size()+" "+trn("marker", "markers", data.size());
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/mappaint/Cascade.java b/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
index 2bd51aa..3c61ae5 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
@@ -19,8 +19,6 @@ import org.openstreetmap.josm.tools.Utils;
*/
public final class Cascade implements Cloneable {
- public static final Cascade EMPTY_CASCADE = new Cascade();
-
private Map<String, Object> prop = new HashMap<>();
private boolean defaultSelectedHandling = true;
@@ -91,7 +89,7 @@ public final class Cascade implements Cloneable {
if (klass == double.class || klass == Double.class) {
o = toFloat(o);
if (o != null) {
- o = new Double((Float) o);
+ o = Double.valueOf((Float) o);
}
return (T) o;
}
@@ -114,7 +112,6 @@ public final class Cascade implements Cloneable {
if (alpha != 255)
return (T) String.format("#%06x%02x", ((Color) o).getRGB() & 0x00ffffff, alpha);
return (T) String.format("#%06x", ((Color) o).getRGB() & 0x00ffffff);
-
}
return (T) o.toString();
diff --git a/src/org/openstreetmap/josm/gui/mappaint/DividedScale.java b/src/org/openstreetmap/josm/gui/mappaint/DividedScale.java
index 4406051..50f6002 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/DividedScale.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/DividedScale.java
@@ -117,7 +117,7 @@ public class DividedScale<T> {
* @param lower lower bound
* @param upper upper bound
*/
- protected void putImpl(T o, double lower, double upper) {
+ private void putImpl(T o, double lower, double upper) {
int i = 0;
while (bd.get(i) < lower) {
++i;
@@ -163,6 +163,10 @@ public class DividedScale<T> {
}
}
+ /**
+ * Runs a consistency test.
+ * @throws AssertionError When an invariant is broken.
+ */
public void consistencyTest() {
if (bd.size() < 2) throw new AssertionError(bd);
if (data.isEmpty()) throw new AssertionError(data);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
index 8fa8b8e..3c640ec 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
@@ -8,6 +8,8 @@ import org.openstreetmap.josm.tools.Pair;
/**
* Caches styles for a single primitive.
+ * <p>
+ * This object is immutable.
*/
public final class StyleCache {
@@ -30,16 +32,22 @@ public final class StyleCache {
private StyleCache() {
}
+ /**
+ * Creates a new copy of this style cache with a new entry added.
+ * @param o The style to cache.
+ * @param r The range the style is for.
+ * @param selected The style list we should use (selected/unselected)
+ * @return The new object.
+ */
public StyleCache put(StyleElementList o, Range r, boolean selected) {
StyleCache s = new StyleCache(this);
int idx = getIndex(selected);
DividedScale<StyleElementList> ds = s.states[idx];
if (ds == null) {
- ds = s.states[idx] = new DividedScale<>();
+ ds = new DividedScale<>();
}
- ds.putImpl(o, r.getLower(), r.getUpper());
- ds.consistencyTest();
+ s.states[idx] = ds.put(o, r);
s.intern();
return s;
}
@@ -52,7 +60,7 @@ public final class StyleCache {
return states[idx].getWithRange(scale);
}
- private int getIndex(boolean selected) {
+ private static int getIndex(boolean selected) {
return selected ? SELECTED : PLAIN;
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
index 4caaa97..4c658a7 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
@@ -8,7 +8,7 @@ import java.util.Map;
public final class CSSColors {
private static final Map<String, Color> CSS_COLORS = new HashMap<>();
static {
- Object[][] CSSCOLORS_INIT = new Object[][] {
+ for (Object[] pair : new Object[][] {
{"aliceblue", 0xf0f8ff},
{"antiquewhite", 0xfaebd7},
{"aqua", 0x00ffff},
@@ -156,8 +156,7 @@ public final class CSSColors {
{"whitesmoke", 0xf5f5f5},
{"yellow", 0xffff00},
{"yellowgreen", 0x9acd32}
- };
- for (Object[] pair : CSSCOLORS_INIT) {
+ }) {
CSS_COLORS.put((String) pair[0], new Color((Integer) pair[1]));
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
index 7feadd2..e08b72b 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
@@ -148,23 +148,23 @@ public abstract class Condition {
return testString != null && testString.contains(prototypeString);
}
- float test_float;
+ float testFloat;
try {
- test_float = Float.parseFloat(testString);
+ testFloat = Float.parseFloat(testString);
} catch (NumberFormatException e) {
return false;
}
- float prototype_float = Float.parseFloat(prototypeString);
+ float prototypeFloat = Float.parseFloat(prototypeString);
switch (this) {
case GREATER_OR_EQUAL:
- return test_float >= prototype_float;
+ return testFloat >= prototypeFloat;
case GREATER:
- return test_float > prototype_float;
+ return testFloat > prototypeFloat;
case LESS_OR_EQUAL:
- return test_float <= prototype_float;
+ return testFloat <= prototypeFloat;
case LESS:
- return test_float < prototype_float;
+ return testFloat < prototypeFloat;
default:
throw new AssertionError();
}
@@ -522,7 +522,7 @@ public abstract class Condition {
* @param e MapCSS environment
* @return {@code true} if the way is closed or the relation is a closed multipolygon
*/
- static boolean closed(Environment e) {
+ 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())
@@ -536,7 +536,7 @@ public abstract class Condition {
* @return {@code true} if the object has been modified
* @see OsmPrimitive#isModified()
*/
- static boolean modified(Environment e) {
+ static boolean modified(Environment e) { // NO_UCD (unused code)
return e.osm.isModified() || e.osm.isNewOrUndeleted();
}
@@ -546,7 +546,7 @@ public abstract class Condition {
* @return {@code true} if the object is new
* @see OsmPrimitive#isNew()
*/
- static boolean _new(Environment e) {
+ static boolean _new(Environment e) { // NO_UCD (unused code)
return e.osm.isNew();
}
@@ -556,7 +556,7 @@ public abstract class Condition {
* @return {@code true} if the object is a connection node
* @see Node#isConnectionNode()
*/
- static boolean connection(Environment e) {
+ static boolean connection(Environment e) { // NO_UCD (unused code)
return e.osm instanceof Node && e.osm.getDataSet() != null && ((Node) e.osm).isConnectionNode();
}
@@ -566,7 +566,7 @@ public abstract class Condition {
* @return {@code true} if the object is tagged
* @see OsmPrimitive#isTagged()
*/
- static boolean tagged(Environment e) {
+ static boolean tagged(Environment e) { // NO_UCD (unused code)
return e.osm.isTagged();
}
@@ -576,7 +576,7 @@ public abstract class Condition {
* @return {@code true} if the object has the same tags as its child/parent
* @see OsmPrimitive#hasSameInterestingTags(OsmPrimitive)
*/
- static boolean sameTags(Environment e) {
+ static boolean sameTags(Environment e) { // NO_UCD (unused code)
return e.osm.hasSameInterestingTags(Utils.firstNonNull(e.child, e.parent));
}
@@ -586,7 +586,7 @@ public abstract class Condition {
* @return {@code true} if the object has an area style
* @see ElemStyles#hasAreaElemStyle(OsmPrimitive, boolean)
*/
- static boolean areaStyle(Environment e) {
+ static boolean areaStyle(Environment e) { // NO_UCD (unused code)
// only for validator
return ElemStyles.hasAreaElemStyle(e.osm, false);
}
@@ -596,7 +596,7 @@ public abstract class Condition {
* @param e MapCSS environment
* @return {@code true} if the object is a unconnected node
*/
- static boolean unconnected(Environment e) {
+ static boolean unconnected(Environment e) { // NO_UCD (unused code)
return e.osm instanceof Node && OsmPrimitive.getFilteredList(e.osm.getReferrers(), Way.class).isEmpty();
}
@@ -606,7 +606,7 @@ public abstract class Condition {
* @return {@code true} if there is right-hand traffic at the current location
* @see ExpressionFactory.Functions#is_right_hand_traffic(Environment)
*/
- static boolean righthandtraffic(Environment e) {
+ static boolean righthandtraffic(Environment e) { // NO_UCD (unused code)
return ExpressionFactory.Functions.is_right_hand_traffic(e);
}
@@ -617,7 +617,7 @@ public abstract class Condition {
* @return {@code true} if the way clockwise
* @see ExpressionFactory.Functions#is_clockwise(Environment)
*/
- static boolean clockwise(Environment e) {
+ static boolean clockwise(Environment e) { // NO_UCD (unused code)
return ExpressionFactory.Functions.is_clockwise(e);
}
@@ -628,7 +628,7 @@ public abstract class Condition {
* @return {@code true} if the way clockwise
* @see ExpressionFactory.Functions#is_anticlockwise(Environment)
*/
- static boolean anticlockwise(Environment e) {
+ static boolean anticlockwise(Environment e) { // NO_UCD (unused code)
return ExpressionFactory.Functions.is_anticlockwise(e);
}
@@ -637,7 +637,7 @@ public abstract class Condition {
* @param e MapCSS environment
* @return {@code true} if the object is an unclosed multipolygon
*/
- static boolean unclosed_multipolygon(Environment e) {
+ static boolean unclosed_multipolygon(Environment e) { // NO_UCD (unused code)
return e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() &&
!e.osm.isIncomplete() && !((Relation) e.osm).hasIncompleteMembers() &&
!MultipolygonCache.getInstance().get(Main.map.mapView, (Relation) e.osm).getOpenEnds().isEmpty();
@@ -651,11 +651,11 @@ public abstract class Condition {
* @return {@code true} if the object is within source area ("downloaded area")
* @see InDataSourceArea
*/
- static boolean inDownloadedArea(Environment e) {
+ static boolean inDownloadedArea(Environment e) { // NO_UCD (unused code)
return IN_DOWNLOADED_AREA.evaluate(e.osm);
}
- static boolean completely_downloaded(Environment e) {
+ static boolean completely_downloaded(Environment e) { // NO_UCD (unused code)
if (e.osm instanceof Relation) {
return !((Relation) e.osm).hasIncompleteMembers();
} else {
@@ -663,7 +663,7 @@ public abstract class Condition {
}
}
- static boolean closed2(Environment e) {
+ static boolean closed2(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())
@@ -671,7 +671,7 @@ public abstract class Condition {
return false;
}
- static boolean selected(Environment e) {
+ static boolean selected(Environment e) { // NO_UCD (unused code)
Cascade c = e.mc.getCascade(e.layer);
c.setDefaultSelectedHandling(false);
return e.osm.isSelected();
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index 09e20cc..a90ee7b 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -121,7 +121,7 @@ public final class ExpressionFactory {
* @param o any object
* @return {@code o} unchanged
*/
- public static Object eval(Object o) {
+ public static Object eval(Object o) { // NO_UCD (unused code)
return o;
}
@@ -130,7 +130,7 @@ public final class ExpressionFactory {
* @param args arguments
* @return Sum of arguments
*/
- public static float plus(float... args) {
+ public static float plus(float... args) { // NO_UCD (unused code)
float res = 0;
for (float f : args) {
res += f;
@@ -143,7 +143,7 @@ public final class ExpressionFactory {
* @param args arguments
* @return Substraction of arguments
*/
- public static Float minus(float... args) {
+ public static Float minus(float... args) { // NO_UCD (unused code)
if (args.length == 0) {
return 0.0F;
}
@@ -162,7 +162,7 @@ public final class ExpressionFactory {
* @param args arguments
* @return Multiplication of arguments
*/
- public static float times(float... args) {
+ public static float times(float... args) { // NO_UCD (unused code)
float res = 1;
for (float f : args) {
res *= f;
@@ -175,7 +175,7 @@ public final class ExpressionFactory {
* @param args arguments
* @return Division of arguments
*/
- public static Float divided_by(float... args) {
+ public static Float divided_by(float... args) { // NO_UCD (unused code)
if (args.length == 0) {
return 1.0F;
}
@@ -195,7 +195,7 @@ public final class ExpressionFactory {
* @return list of values
* @see Arrays#asList(Object[])
*/
- public static List<Object> list(Object... args) {
+ public static List<Object> list(Object... args) { // NO_UCD (unused code)
return Arrays.asList(args);
}
@@ -204,7 +204,7 @@ public final class ExpressionFactory {
* @param lst the list
* @return length of the list
*/
- public static Integer count(List<?> lst) {
+ public static Integer count(List<?> lst) { // NO_UCD (unused code)
return lst.size();
}
@@ -216,7 +216,7 @@ public final class ExpressionFactory {
* @see Utils#firstNonNull(Object[])
*/
@NullableArguments
- public static Object any(Object... args) {
+ public static Object any(Object... args) { // NO_UCD (unused code)
return Utils.firstNonNull(args);
}
@@ -227,7 +227,7 @@ public final class ExpressionFactory {
* @return {@code n}th element of the list, or {@code null} if index out of range
* @since 5699
*/
- public static Object get(List<?> lst, float n) {
+ public static Object get(List<?> lst, float n) { // NO_UCD (unused code)
int idx = Math.round(n);
if (idx >= 0 && idx < lst.size()) {
return lst.get(idx);
@@ -243,7 +243,7 @@ public final class ExpressionFactory {
* @see String#split(String)
* @since 5699
*/
- public static List<String> split(String sep, String toSplit) {
+ public static List<String> split(String sep, String toSplit) { // NO_UCD (unused code)
return Arrays.asList(toSplit.split(Pattern.quote(sep), -1));
}
@@ -255,7 +255,7 @@ public final class ExpressionFactory {
* @return color matching the given components
* @see Color#Color(float, float, float)
*/
- public static Color rgb(float r, float g, float b) {
+ public static Color rgb(float r, float g, float b) { // NO_UCD (unused code)
try {
return new Color(r, g, b);
} catch (IllegalArgumentException e) {
@@ -273,7 +273,7 @@ public final class ExpressionFactory {
* @return color matching the given components
* @see Color#Color(float, float, float, float)
*/
- public static Color rgba(float r, float g, float b, float alpha) {
+ public static Color rgba(float r, float g, float b, float alpha) { // NO_UCD (unused code)
try {
return new Color(r, g, b, alpha);
} catch (IllegalArgumentException e) {
@@ -288,7 +288,7 @@ public final class ExpressionFactory {
* @param b brightness
* @return the corresponding color
*/
- public static Color hsb_color(float h, float s, float b) {
+ public static Color hsb_color(float h, float s, float b) { // NO_UCD (unused code)
try {
return Color.getHSBColor(h, s, b);
} catch (IllegalArgumentException e) {
@@ -301,7 +301,7 @@ public final class ExpressionFactory {
* @param html HTML notation
* @return color matching the given notation
*/
- public static Color html2color(String html) {
+ public static Color html2color(String html) { // NO_UCD (unused code)
return ColorHelper.html2color(html);
}
@@ -310,7 +310,7 @@ public final class ExpressionFactory {
* @param c color
* @return HTML notation matching the given color
*/
- public static String color2html(Color c) {
+ public static String color2html(Color c) { // NO_UCD (unused code)
return ColorHelper.color2html(c);
}
@@ -320,7 +320,7 @@ public final class ExpressionFactory {
* @return the red color channel in the range [0;1]
* @see java.awt.Color#getRed()
*/
- public static float red(Color c) {
+ public static float red(Color c) { // NO_UCD (unused code)
return Utils.color_int2float(c.getRed());
}
@@ -330,7 +330,7 @@ public final class ExpressionFactory {
* @return the green color channel in the range [0;1]
* @see java.awt.Color#getGreen()
*/
- public static float green(Color c) {
+ public static float green(Color c) { // NO_UCD (unused code)
return Utils.color_int2float(c.getGreen());
}
@@ -340,7 +340,7 @@ public final class ExpressionFactory {
* @return the blue color channel in the range [0;1]
* @see java.awt.Color#getBlue()
*/
- public static float blue(Color c) {
+ public static float blue(Color c) { // NO_UCD (unused code)
return Utils.color_int2float(c.getBlue());
}
@@ -350,7 +350,7 @@ public final class ExpressionFactory {
* @return the alpha channel in the range [0;1]
* @see java.awt.Color#getAlpha()
*/
- public static float alpha(Color c) {
+ public static float alpha(Color c) { // NO_UCD (unused code)
return Utils.color_int2float(c.getAlpha());
}
@@ -361,7 +361,7 @@ public final class ExpressionFactory {
* @see Utils#join
*/
@NullableArguments
- public static String concat(Object... args) {
+ public static String concat(Object... args) { // NO_UCD (unused code)
return Utils.join("", Arrays.asList(args));
}
@@ -372,7 +372,7 @@ public final class ExpressionFactory {
* @see Utils#join
*/
@NullableArguments
- public static String join(String... args) {
+ public static String join(String... args) { // NO_UCD (unused code)
return Utils.join(args[0], Arrays.asList(args).subList(1, args.length));
}
@@ -383,7 +383,7 @@ public final class ExpressionFactory {
* @return assembled string
* @see Utils#join
*/
- public static String join_list(final String separator, final List<String> values) {
+ public static String join_list(final String separator, final List<String> values) { // NO_UCD (unused code)
return Utils.join(separator, values);
}
@@ -393,7 +393,7 @@ public final class ExpressionFactory {
* @param key the property key
* @return the property value
*/
- public static Object prop(final Environment env, String key) {
+ public static Object prop(final Environment env, String key) { // NO_UCD (unused code)
return prop(env, key, null);
}
@@ -414,7 +414,7 @@ public final class ExpressionFactory {
* @param key the property key
* @return {@code true} if the property is set, {@code false} otherwise
*/
- public static Boolean is_prop_set(final Environment env, String key) {
+ public static Boolean is_prop_set(final Environment env, String key) { // NO_UCD (unused code)
return is_prop_set(env, key, null);
}
@@ -435,7 +435,7 @@ public final class ExpressionFactory {
* @param key the OSM key
* @return the value for given key
*/
- public static String tag(final Environment env, String key) {
+ public static String tag(final Environment env, String key) { // NO_UCD (unused code)
return env.osm == null ? null : env.osm.get(key);
}
@@ -445,7 +445,7 @@ public final class ExpressionFactory {
* @param key the OSM key
* @return first non-null value of the key {@code key} from the object's parent(s)
*/
- public static String parent_tag(final Environment env, String key) {
+ public static String parent_tag(final Environment env, String key) { // NO_UCD (unused code)
if (env.parent == null) {
if (env.osm != null) {
// we don't have a matched parent, so just search all referrers
@@ -469,7 +469,7 @@ public final class ExpressionFactory {
* @param key the OSM key
* @return a list of non-null values of the key {@code key} from the object's parent(s)
*/
- public static List<String> parent_tags(final Environment env, String key) {
+ public static List<String> parent_tags(final Environment env, String key) { // NO_UCD (unused code)
if (env.parent == null) {
if (env.osm != null) {
final Collection<String> tags = new TreeSet<>(AlphanumComparator.getInstance());
@@ -493,7 +493,7 @@ public final class ExpressionFactory {
* @param key the OSM key
* @return the value of the key {@code key} from the object's child, or {@code null} if there is no child
*/
- public static String child_tag(final Environment env, String key) {
+ public static String child_tag(final Environment env, String key) { // NO_UCD (unused code)
return env.child == null ? null : env.child.get(key);
}
@@ -503,7 +503,7 @@ public final class ExpressionFactory {
* @param key the OSM key
* @return {@code true} if the object has a tag with the given key, {@code false} otherwise
*/
- public static boolean has_tag_key(final Environment env, String key) {
+ public static boolean has_tag_key(final Environment env, String key) { // NO_UCD (unused code)
return env.osm.hasKey(key);
}
@@ -512,11 +512,11 @@ public final class ExpressionFactory {
* @param env the environment
* @return the index as float. Starts at 1
*/
- public static Float index(final Environment env) {
+ public static Float index(final Environment env) { // NO_UCD (unused code)
if (env.index == null) {
return null;
}
- return new Float(env.index + 1);
+ return Float.valueOf(env.index + 1f);
}
/**
@@ -525,7 +525,7 @@ public final class ExpressionFactory {
* @return role of current object in parent relation, or role of child if current object is a relation
* @see Environment#getRole()
*/
- public static String role(final Environment env) {
+ public static String role(final Environment env) { // NO_UCD (unused code)
return env.getRole();
}
@@ -535,7 +535,7 @@ public final class ExpressionFactory {
* @return the area of a closed way or multipolygon in square meters or {@code null}
* @see Geometry#computeArea(OsmPrimitive)
*/
- public static Float areasize(final Environment env) {
+ public static Float areasize(final Environment env) { // NO_UCD (unused code)
final Double area = Geometry.computeArea(env.osm);
return area == null ? null : area.floatValue();
}
@@ -546,7 +546,7 @@ public final class ExpressionFactory {
* @return the length of the way in metres or {@code null}.
* @see Way#getLength()
*/
- public static Float waylength(final Environment env) {
+ public static Float waylength(final Environment env) { // NO_UCD (unused code)
if (env.osm instanceof Way) {
return (float) ((Way) env.osm).getLength();
} else {
@@ -559,7 +559,7 @@ public final class ExpressionFactory {
* @param b boolean value
* @return {@code true} if {@code !b}
*/
- public static boolean not(boolean b) {
+ public static boolean not(boolean b) { // NO_UCD (unused code)
return !b;
}
@@ -569,7 +569,7 @@ public final class ExpressionFactory {
* @param b second value
* @return {@code true} if {@code a >= b}
*/
- public static boolean greater_equal(float a, float b) {
+ public static boolean greater_equal(float a, float b) { // NO_UCD (unused code)
return a >= b;
}
@@ -579,7 +579,7 @@ public final class ExpressionFactory {
* @param b second value
* @return {@code true} if {@code a <= b}
*/
- public static boolean less_equal(float a, float b) {
+ public static boolean less_equal(float a, float b) { // NO_UCD (unused code)
return a <= b;
}
@@ -589,7 +589,7 @@ public final class ExpressionFactory {
* @param b second value
* @return {@code true} if {@code a > b}
*/
- public static boolean greater(float a, float b) {
+ public static boolean greater(float a, float b) { // NO_UCD (unused code)
return a > b;
}
@@ -599,7 +599,7 @@ public final class ExpressionFactory {
* @param b second value
* @return {@code true} if {@code a < b}
*/
- public static boolean less(float a, float b) {
+ public static boolean less(float a, float b) { // NO_UCD (unused code)
return a < b;
}
@@ -609,7 +609,7 @@ public final class ExpressionFactory {
* @return the angle in radians
* @see Math#toRadians(double)
*/
- public static double degree_to_radians(double degree) {
+ public static double degree_to_radians(double degree) { // NO_UCD (unused code)
return Math.toRadians(degree);
}
@@ -622,7 +622,7 @@ public final class ExpressionFactory {
* @return the angle in radians
* @see RotationAngle#parseCardinalRotation(String)
*/
- public static Double cardinal_to_radians(String cardinal) {
+ public static Double cardinal_to_radians(String cardinal) { // NO_UCD (unused code)
try {
return RotationAngle.parseCardinalRotation(cardinal);
} catch (IllegalArgumentException ignore) {
@@ -650,7 +650,7 @@ public final class ExpressionFactory {
* @return {@code false} if objects are equal, {@code true} otherwise
* @see Object#equals(Object)
*/
- public static boolean not_equal(Object a, Object b) {
+ public static boolean not_equal(Object a, Object b) { // NO_UCD (unused code)
return !equal(a, b);
}
@@ -661,7 +661,7 @@ public final class ExpressionFactory {
* @return {@code true} if the JOSM search with {@code searchStr} applies to the object
* @see SearchCompiler
*/
- public static Boolean JOSM_search(final Environment env, String searchStr) {
+ public static Boolean JOSM_search(final Environment env, String searchStr) { // NO_UCD (unused code)
Match m;
try {
m = SearchCompiler.compile(searchStr);
@@ -679,7 +679,7 @@ public final class ExpressionFactory {
* @param def Default value
* @return value for key, or default value if not found
*/
- public static String JOSM_pref(Environment env, String key, String def) {
+ public static String JOSM_pref(Environment env, String key, String def) { // NO_UCD (unused code)
return MapPaintStyles.getStyles().getPreferenceCached(key, def);
}
@@ -691,7 +691,7 @@ public final class ExpressionFactory {
* @see Pattern#matches(String, CharSequence)
* @since 5699
*/
- public static boolean regexp_test(String pattern, String target) {
+ public static boolean regexp_test(String pattern, String target) { // NO_UCD (unused code)
return Pattern.matches(pattern, target);
}
@@ -706,7 +706,7 @@ public final class ExpressionFactory {
* @see Pattern#MULTILINE
* @since 5699
*/
- public static boolean regexp_test(String pattern, String target, String flags) {
+ public static boolean regexp_test(String pattern, String target, String flags) { // NO_UCD (unused code)
int f = 0;
if (flags.contains("i")) {
f |= Pattern.CASE_INSENSITIVE;
@@ -733,7 +733,7 @@ public final class ExpressionFactory {
* @see Pattern#MULTILINE
* @since 5701
*/
- public static List<String> regexp_match(String pattern, String target, String flags) {
+ public static List<String> regexp_match(String pattern, String target, String flags) { // NO_UCD (unused code)
int f = 0;
if (flags.contains("i")) {
f |= Pattern.CASE_INSENSITIVE;
@@ -756,7 +756,7 @@ public final class ExpressionFactory {
* @return a list of capture groups if {@link Matcher#matches()}, or {@code null}.
* @since 5701
*/
- public static List<String> regexp_match(String pattern, String target) {
+ public static List<String> regexp_match(String pattern, String target) { // NO_UCD (unused code)
return Utils.getMatches(Pattern.compile(pattern).matcher(target));
}
@@ -766,7 +766,7 @@ public final class ExpressionFactory {
* @return the OSM id of the current object
* @see OsmPrimitive#getUniqueId()
*/
- public static long osm_id(final Environment env) {
+ public static long osm_id(final Environment env) { // NO_UCD (unused code)
return env.osm.getUniqueId();
}
@@ -777,7 +777,7 @@ public final class ExpressionFactory {
* @return the translated string
*/
@NullableArguments
- public static String tr(String... args) {
+ public static String tr(String... args) { // NO_UCD (unused code)
final String text = args[0];
System.arraycopy(args, 1, args, 0, args.length - 1);
return org.openstreetmap.josm.tools.I18n.tr(text, (Object[]) args);
@@ -790,7 +790,7 @@ public final class ExpressionFactory {
* @return the substring
* @see String#substring(int)
*/
- public static String substring(String s, /* due to missing Cascade.convertTo for int*/ float begin) {
+ public static String substring(String s, /* due to missing Cascade.convertTo for int*/ float begin) { // NO_UCD (unused code)
return s == null ? null : s.substring((int) begin);
}
@@ -803,7 +803,7 @@ public final class ExpressionFactory {
* @return the substring
* @see String#substring(int, int)
*/
- public static String substring(String s, float begin, float end) {
+ public static String substring(String s, float begin, float end) { // NO_UCD (unused code)
return s == null ? null : s.substring((int) begin, (int) end);
}
@@ -815,7 +815,7 @@ public final class ExpressionFactory {
* @return The resulting string
* @see String#replace(CharSequence, CharSequence)
*/
- public static String replace(String s, String target, String replacement) {
+ public static String replace(String s, String target, String replacement) { // NO_UCD (unused code)
return s == null ? null : s.replace(target, replacement);
}
@@ -826,7 +826,7 @@ public final class ExpressionFactory {
* @param s arbitrary string
* @return the encoded string
*/
- public static String URL_encode(String s) {
+ public static String URL_encode(String s) { // NO_UCD (unused code)
return s == null ? null : Utils.encodeUrl(s);
}
@@ -837,7 +837,7 @@ public final class ExpressionFactory {
* @param s arbitrary string
* @return the encoded string
*/
- public static String XML_encode(String s) {
+ public static String XML_encode(String s) { // NO_UCD (unused code)
return s == null ? null : XmlWriter.encode(s);
}
@@ -846,7 +846,7 @@ public final class ExpressionFactory {
* @param s the string
* @return long value from 0 to 2^32-1
*/
- public static long CRC32_checksum(String s) {
+ public static long CRC32_checksum(String s) { // NO_UCD (unused code)
CRC32 cs = new CRC32();
cs.update(s.getBytes(StandardCharsets.UTF_8));
return cs.getValue();
@@ -902,7 +902,7 @@ public final class ExpressionFactory {
* @return the same object, unchanged
*/
@NullableArguments
- public static Object print(Object o) {
+ public static Object print(Object o) { // NO_UCD (unused code)
System.out.print(o == null ? "none" : o.toString());
return o;
}
@@ -914,7 +914,7 @@ public final class ExpressionFactory {
* @return the same object, unchanged
*/
@NullableArguments
- public static Object println(Object o) {
+ public static Object println(Object o) { // NO_UCD (unused code)
System.out.println(o == null ? "none" : o.toString());
return o;
}
@@ -924,7 +924,7 @@ public final class ExpressionFactory {
* @param env the environment
* @return number of tags
*/
- public static int number_of_tags(Environment env) {
+ public static int number_of_tags(Environment env) { // NO_UCD (unused code)
return env.osm.getNumKeys();
}
@@ -934,7 +934,7 @@ public final class ExpressionFactory {
* @param key setting key (given as layer identifier, e.g. setting::mykey {...})
* @return the value of the setting (calculated when the style is loaded)
*/
- public static Object setting(Environment env, String key) {
+ public static Object setting(Environment env, String key) { // NO_UCD (unused code)
return env.source.settingValues.get(key);
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
index 7f41719..deedbab 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
@@ -293,7 +293,7 @@ public class MapCSSStyleSource extends StyleSource {
* @param conds The conditions to search through.
* @return An arbitrary key this rule depends on or <code>null</code> if there is no such key.
*/
- private String findAnyRequiredKey(List<Condition> conds) {
+ private static String findAnyRequiredKey(List<Condition> conds) {
String key = null;
for (Condition c : conds) {
if (c instanceof KeyCondition) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
index 0b6f225..63df174 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.mappaint.mapcss;
+import static org.openstreetmap.josm.data.projection.Ellipsoid.WGS84;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -636,20 +638,18 @@ public interface Selector {
return new Range(lower, upper);
}
- private static final double R = 6378135;
-
public static double level2scale(int lvl) {
if (lvl < 0)
throw new IllegalArgumentException("lvl must be >= 0 but is "+lvl);
// preliminary formula - map such that mapnik imagery tiles of the same
// or similar level are displayed at the given scale
- return 2.0 * Math.PI * R / Math.pow(2.0, lvl) / 2.56;
+ return 2.0 * Math.PI * WGS84.a / Math.pow(2.0, lvl) / 2.56;
}
public static int scale2level(double scale) {
if (scale < 0)
throw new IllegalArgumentException("scale must be >= 0 but is "+scale);
- return (int) Math.floor(Math.log(2 * Math.PI * R / 2.56 / scale) / Math.log(2));
+ return (int) Math.floor(Math.log(2 * Math.PI * WGS84.a / 2.56 / scale) / Math.log(2));
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
index 1d06d53..350ae7f 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
@@ -55,15 +55,15 @@ public class LineElement extends StyleElement {
public final String prefix;
public final float defaultMajorZIndex;
- LineType(String prefix, float default_major_z_index) {
+ LineType(String prefix, float defaultMajorZindex) {
this.prefix = prefix;
- this.defaultMajorZIndex = default_major_z_index;
+ this.defaultMajorZIndex = defaultMajorZindex;
}
}
- protected LineElement(Cascade c, float default_major_z_index, BasicStroke line, Color color, BasicStroke dashesLine,
+ protected LineElement(Cascade c, float defaultMajorZindex, BasicStroke line, Color color, BasicStroke dashesLine,
Color dashesBackground, float offset, float realWidth, boolean wayDirectionArrows) {
- super(c, default_major_z_index);
+ super(c, defaultMajorZindex);
this.line = line;
this.color = color;
this.dashesLine = dashesLine;
@@ -103,23 +103,23 @@ public class LineElement extends StyleElement {
private static LineElement createImpl(Environment env, LineType type) {
Cascade c = env.mc.getCascade(env.layer);
- Cascade c_def = env.mc.getCascade("default");
+ Cascade cDef = env.mc.getCascade("default");
Float width;
switch (type) {
case NORMAL:
- width = getWidth(c, WIDTH, getWidth(c_def, WIDTH, null));
+ width = getWidth(c, WIDTH, getWidth(cDef, WIDTH, null));
break;
case CASING:
Float casingWidth = c.get(type.prefix + WIDTH, null, Float.class, true);
if (casingWidth == null) {
- RelativeFloat rel_casingWidth = c.get(type.prefix + WIDTH, null, RelativeFloat.class, true);
- if (rel_casingWidth != null) {
- casingWidth = rel_casingWidth.val / 2;
+ RelativeFloat relCasingWidth = c.get(type.prefix + WIDTH, null, RelativeFloat.class, true);
+ if (relCasingWidth != null) {
+ casingWidth = relCasingWidth.val / 2;
}
}
if (casingWidth == null)
return null;
- width = getWidth(c, WIDTH, getWidth(c_def, WIDTH, null));
+ width = getWidth(c, WIDTH, getWidth(cDef, WIDTH, null));
if (width == null) {
width = 0f;
}
@@ -161,7 +161,7 @@ public class LineElement extends StyleElement {
break;
case LEFT_CASING:
case RIGHT_CASING:
- Float baseWidthOnDefault = getWidth(c_def, WIDTH, null);
+ Float baseWidthOnDefault = getWidth(cDef, WIDTH, null);
Float baseWidth = getWidth(c, WIDTH, baseWidthOnDefault);
if (baseWidth == null || baseWidth < 2f) {
baseWidth = 2f;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
index d321c0c..0eee3b9 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
@@ -92,8 +92,8 @@ public class NodeElement extends StyleElement {
public static final StyleElementList DEFAULT_NODE_STYLELIST_TEXT = new StyleElementList(NodeElement.SIMPLE_NODE_ELEMSTYLE,
BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
- protected NodeElement(Cascade c, MapImage mapImage, Symbol symbol, float default_major_z_index, RotationAngle rotationAngle) {
- super(c, default_major_z_index);
+ protected NodeElement(Cascade c, MapImage mapImage, Symbol symbol, float defaultMajorZindex, RotationAngle rotationAngle) {
+ super(c, defaultMajorZindex);
this.mapImage = mapImage;
this.symbol = symbol;
this.mapImageAngle = rotationAngle;
@@ -103,7 +103,7 @@ public class NodeElement extends StyleElement {
return create(env, 4f, false);
}
- private static NodeElement create(Environment env, float default_major_z_index, boolean allowDefault) {
+ private static NodeElement create(Environment env, float defaultMajorZindex, boolean allowDefault) {
Cascade c = env.mc.getCascade(env.layer);
MapImage mapImage = createIcon(env, ICON_KEYS);
@@ -137,7 +137,7 @@ public class NodeElement extends StyleElement {
// have to allocate a node element style.
if (!allowDefault && symbol == null && mapImage == null) return null;
- return new NodeElement(c, mapImage, symbol, default_major_z_index, rotationAngle);
+ return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle);
}
public static MapImage createIcon(final Environment env, final String[] keys) {
@@ -147,15 +147,15 @@ public class NodeElement extends StyleElement {
if (iconRef == null)
return null;
- Cascade c_def = env.mc.getCascade("default");
+ Cascade cDef = env.mc.getCascade("default");
- Float widthOnDefault = c_def.get(keys[ICON_WIDTH_IDX], null, Float.class);
+ Float widthOnDefault = cDef.get(keys[ICON_WIDTH_IDX], null, Float.class);
if (widthOnDefault != null && widthOnDefault <= 0) {
widthOnDefault = null;
}
Float widthF = getWidth(c, keys[ICON_WIDTH_IDX], widthOnDefault);
- Float heightOnDefault = c_def.get(keys[ICON_HEIGHT_IDX], null, Float.class);
+ Float heightOnDefault = cDef.get(keys[ICON_HEIGHT_IDX], null, Float.class);
if (heightOnDefault != null && heightOnDefault <= 0) {
heightOnDefault = null;
}
@@ -188,7 +188,7 @@ public class NodeElement extends StyleElement {
private static Symbol createSymbol(Environment env) {
Cascade c = env.mc.getCascade(env.layer);
- Cascade c_def = env.mc.getCascade("default");
+ Cascade cDef = env.mc.getCascade("default");
SymbolShape shape;
Keyword shapeKW = c.get("symbol-shape", null, Keyword.class);
@@ -215,7 +215,7 @@ public class NodeElement extends StyleElement {
} else
return null;
- Float sizeOnDefault = c_def.get("symbol-size", null, Float.class);
+ Float sizeOnDefault = cDef.get("symbol-size", null, Float.class);
if (sizeOnDefault != null && sizeOnDefault <= 0) {
sizeOnDefault = null;
}
@@ -228,7 +228,7 @@ public class NodeElement extends StyleElement {
if (size <= 0)
return null;
- Float strokeWidthOnDefault = getWidth(c_def, "symbol-stroke-width", null);
+ Float strokeWidthOnDefault = getWidth(cDef, "symbol-stroke-width", null);
Float strokeWidth = getWidth(c, "symbol-stroke-width", strokeWidthOnDefault);
Color strokeColor = c.get("symbol-stroke-color", null, Color.class);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
index 3cd3d72..88c21ed 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
@@ -34,16 +34,16 @@ public abstract class StyleElement implements StyleKeys {
// primitive; true, if it is a highlight or modifier
public boolean defaultSelectedHandling;
- public StyleElement(float major_z_index, float z_index, float object_z_index, boolean isModifier, boolean defaultSelectedHandling) {
- this.majorZIndex = major_z_index;
- this.zIndex = z_index;
- this.objectZIndex = object_z_index;
+ public StyleElement(float majorZindex, float zIndex, float objectZindex, boolean isModifier, boolean defaultSelectedHandling) {
+ this.majorZIndex = majorZindex;
+ this.zIndex = zIndex;
+ this.objectZIndex = objectZindex;
this.isModifier = isModifier;
this.defaultSelectedHandling = defaultSelectedHandling;
}
- protected StyleElement(Cascade c, float default_major_z_index) {
- majorZIndex = c.get(MAJOR_Z_INDEX, default_major_z_index, Float.class);
+ protected StyleElement(Cascade c, float defaultMajorZindex) {
+ majorZIndex = c.get(MAJOR_Z_INDEX, defaultMajorZindex, Float.class);
zIndex = c.get(Z_INDEX, 0f, Float.class);
objectZIndex = c.get(OBJECT_Z_INDEX, 0f, Float.class);
isModifier = c.get(MODIFIER, Boolean.FALSE, Boolean.class);
@@ -85,9 +85,9 @@ public abstract class StyleElement implements StyleKeys {
if (Keyword.DEFAULT.equals(widthKW))
return (float) MapPaintSettings.INSTANCE.getDefaultSegmentWidth();
if (relativeTo != null) {
- RelativeFloat width_rel = c.get(key, null, RelativeFloat.class, true);
- if (width_rel != null)
- return relativeTo + width_rel.val;
+ RelativeFloat widthRel = c.get(key, null, RelativeFloat.class, true);
+ if (widthRel != null)
+ return relativeTo + widthRel.val;
}
}
return null;
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
index c443fbc..445e503 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
@@ -34,8 +34,9 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.preferences.server.UserNameValidator;
import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+import org.openstreetmap.josm.gui.widgets.DefaultTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
@@ -389,44 +390,9 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
}
}
- private static class UserNameValidator extends AbstractTextComponentValidator {
- UserNameValidator(JTextComponent tc) {
- super(tc);
- }
-
- @Override
- public boolean isValid() {
- return !getComponent().getText().trim().isEmpty();
- }
-
- @Override
- public void validate() {
- if (isValid()) {
- feedbackValid(tr("Please enter your OSM user name"));
- } else {
- feedbackInvalid(tr("The user name cannot be empty. Please enter your OSM user name"));
- }
- }
- }
-
- private static class PasswordValidator extends AbstractTextComponentValidator {
-
+ static class PasswordValidator extends DefaultTextComponentValidator {
PasswordValidator(JTextComponent tc) {
- super(tc);
- }
-
- @Override
- public boolean isValid() {
- return !getComponent().getText().trim().isEmpty();
- }
-
- @Override
- public void validate() {
- if (isValid()) {
- feedbackValid(tr("Please enter your OSM password"));
- } else {
- feedbackInvalid(tr("The password cannot be empty. Please enter your OSM password"));
- }
+ super(tc, tr("Please enter your OSM password"), tr("The password cannot be empty. Please enter your OSM password"));
}
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
index a4e32df..4a6f98e 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
@@ -10,9 +10,8 @@ import java.awt.Insets;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.text.JTextComponent;
-import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+import org.openstreetmap.josm.gui.preferences.server.UserNameValidator;
import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
@@ -72,25 +71,4 @@ public class FullyAutomaticPropertiesPanel extends JPanel {
gc.fill = GridBagConstraints.BOTH;
add(new JPanel(), gc);
}
-
- private static class UserNameValidator extends AbstractTextComponentValidator {
-
- UserNameValidator(JTextComponent tc) {
- super(tc);
- }
-
- @Override
- public boolean isValid() {
- return !getComponent().getText().trim().isEmpty();
- }
-
- @Override
- public void validate() {
- if (isValid()) {
- feedbackValid(tr("Please enter your OSM user name"));
- } else {
- feedbackInvalid(tr("The user name cannot be empty. Please enter your OSM user name"));
- }
- }
- }
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
index d4d5ea1..ca46f9c 100644
--- a/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
@@ -26,7 +26,7 @@ import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.data.oauth.OAuthToken;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
-import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+import org.openstreetmap.josm.gui.widgets.DefaultTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
@@ -177,44 +177,17 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI {
return cbSaveToPreferences.isSelected();
}
- private static class AccessTokenKeyValidator extends AbstractTextComponentValidator {
-
+ private static class AccessTokenKeyValidator extends DefaultTextComponentValidator {
AccessTokenKeyValidator(JTextComponent tc) {
- super(tc);
- }
-
- @Override
- public boolean isValid() {
- return !getComponent().getText().trim().isEmpty();
- }
-
- @Override
- public void validate() {
- if (isValid()) {
- feedbackValid(tr("Please enter an Access Token Key"));
- } else {
- feedbackInvalid(tr("The Access Token Key must not be empty. Please enter an Access Token Key"));
- }
+ super(tc, tr("Please enter an Access Token Key"),
+ tr("The Access Token Key must not be empty. Please enter an Access Token Key"));
}
}
- private static class AccessTokenSecretValidator extends AbstractTextComponentValidator {
+ private static class AccessTokenSecretValidator extends DefaultTextComponentValidator {
AccessTokenSecretValidator(JTextComponent tc) {
- super(tc);
- }
-
- @Override
- public boolean isValid() {
- return !getComponent().getText().trim().isEmpty();
- }
-
- @Override
- public void validate() {
- if (isValid()) {
- feedbackValid(tr("Please enter an Access Token Secret"));
- } else {
- feedbackInvalid(tr("The Access Token Secret must not be empty. Please enter an Access Token Secret"));
- }
+ super(tc, tr("Please enter an Access Token Secret"),
+ tr("The Access Token Secret must not be empty. Please enter an Access Token Secret"));
}
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java b/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
index 496d1f9..e4c81b7 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
@@ -28,7 +28,6 @@ import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.KeyStroke;
@@ -255,7 +254,7 @@ public class OAuthAuthorizationWizard extends JDialog {
* @throws IllegalArgumentException if apiUrl is null
*/
public OAuthAuthorizationWizard(Component parent, String apiUrl, Executor executor) {
- super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
CheckParameterUtil.ensureParameterNotNull(apiUrl, "apiUrl");
this.apiUrl = apiUrl;
this.executor = executor;
diff --git a/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
index 4027b46..11a334d 100644
--- a/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
@@ -111,6 +111,13 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
pnlShowAccessToken.setAccessToken(getAccessToken());
}
+ static class StepLabel extends JLabel {
+ StepLabel(String text) {
+ super(text);
+ setFont(getFont().deriveFont(16f));
+ }
+ }
+
/**
* This is the panel displayed in the first step of the semi-automatic authorisation process.
*/
@@ -198,9 +205,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
protected final void build() {
setLayout(new BorderLayout(0, 5));
- JLabel lbl = new JLabel(tr("<html>Step 1/3: Retrieve an OAuth Request Token</html>"));
- lbl.setFont(lbl.getFont().deriveFont(16f));
- add(lbl, BorderLayout.NORTH);
+ add(new StepLabel(tr("<html>Step 1/3: Retrieve an OAuth Request Token</html>")), BorderLayout.NORTH);
add(buildAdvancedParametersPanel(), BorderLayout.CENTER);
add(buildCommandPanel(), BorderLayout.SOUTH);
}
@@ -222,9 +227,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
protected JPanel buildTitlePanel() {
JPanel pnl = new JPanel(new BorderLayout());
- JLabel lbl = new JLabel(tr("<html>Step 2/3: Authorize and retrieve an Access Token</html>"));
- lbl.setFont(lbl.getFont().deriveFont(16f));
- pnl.add(lbl, BorderLayout.CENTER);
+ pnl.add(new StepLabel(tr("<html>Step 2/3: Authorize and retrieve an Access Token</html>")), BorderLayout.CENTER);
return pnl;
}
@@ -265,7 +268,6 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
protected JPanel buildActionPanel() {
JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
-
pnl.add(new SideButton(new BackAction()));
pnl.add(new SideButton(new RetrieveAccessTokenAction()));
return pnl;
@@ -313,9 +315,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
protected JPanel buildTitlePanel() {
JPanel pnl = new JPanel(new BorderLayout());
- JLabel lbl = new JLabel(tr("<html>Step 3/3: Successfully retrieved an Access Token</html>"));
- lbl.setFont(lbl.getFont().deriveFont(16f));
- pnl.add(lbl, BorderLayout.CENTER);
+ pnl.add(new StepLabel(tr("<html>Step 3/3: Successfully retrieved an Access Token</html>")), BorderLayout.CENTER);
return pnl;
}
diff --git a/src/org/openstreetmap/josm/gui/package-info.java b/src/org/openstreetmap/josm/gui/package-info.java
new file mode 100644
index 0000000..3899e95
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM graphical user interface.
+ */
+package org.openstreetmap.josm.gui;
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
index 6cd380a..2e13611 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
@@ -21,7 +21,6 @@ import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JDialog;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.KeyStroke;
@@ -78,7 +77,7 @@ public class PreferenceDialog extends JDialog {
}
public PreferenceDialog(Component parent) {
- super(JOptionPane.getFrameForComponent(parent), tr("Preferences"), ModalityType.DOCUMENT_MODAL);
+ super(GuiHelper.getFrameForComponent(parent), tr("Preferences"), ModalityType.DOCUMENT_MODAL);
build();
this.setMinimumSize(new Dimension(600, 350));
// set the maximum width to the current screen. If the dialog is opened on a
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
index 807cd17..0d2bde9 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
@@ -62,10 +62,10 @@ import org.openstreetmap.josm.plugins.PluginDownloadTask;
import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.plugins.PluginInformation;
import org.openstreetmap.josm.plugins.PluginProxy;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
/**
* The preference settings.
diff --git a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
index 27e6a5e..8abedba 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
@@ -112,8 +112,8 @@ public abstract class SourceEditor extends JPanel {
protected final String availableSourcesUrl;
protected final transient List<SourceProvider> sourceProviders;
- protected JTable tblIconPaths;
- protected IconPathTableModel iconPathsModel;
+ private JTable tblIconPaths;
+ private IconPathTableModel iconPathsModel;
protected boolean sourcesInitiallyLoaded;
@@ -135,6 +135,7 @@ public abstract class SourceEditor extends JPanel {
this.lstAvailableSources.setSelectionModel(selectionModel);
final SourceEntryListCellRenderer listCellRenderer = new SourceEntryListCellRenderer();
this.lstAvailableSources.setCellRenderer(listCellRenderer);
+ GuiHelper.extendTooltipDelay(lstAvailableSources);
this.availableSourcesUrl = availableSourcesUrl;
this.sourceProviders = sourceProviders;
@@ -411,6 +412,23 @@ public abstract class SourceEditor extends JPanel {
*/
public abstract boolean finish();
+ protected boolean doFinish(SourcePrefHelper prefHelper, String iconPref) {
+ boolean changed = prefHelper.put(activeSourcesModel.getSources());
+
+ if (tblIconPaths != null) {
+ List<String> iconPaths = iconPathsModel.getIconPaths();
+
+ if (!iconPaths.isEmpty()) {
+ if (Main.pref.putCollection(iconPref, iconPaths)) {
+ changed = true;
+ }
+ } else if (Main.pref.putCollection(iconPref, null)) {
+ changed = true;
+ }
+ }
+ return changed;
+ }
+
/**
* Provide the GUI strings. (There are differences for MapPaint, Preset and TagChecker Rule)
* @param ident any {@link I18nString} value
@@ -902,7 +920,7 @@ public abstract class SourceEditor extends JPanel {
FileChooserManager fcm = new FileChooserManager(true)
.createFileChooser(true, null, Arrays.asList(ff, FileFilterAllFiles.getInstance()), ff, JFileChooser.FILES_ONLY);
prepareFileChooser(tfURL.getText(), fcm.getFileChooser());
- AbstractFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
+ AbstractFileChooser fc = fcm.openFileChooser(GuiHelper.getFrameForComponent(SourceEditor.this));
if (fc != null) {
tfURL.setText(fc.getSelectedFile().toString());
}
@@ -1632,7 +1650,7 @@ public abstract class SourceEditor extends JPanel {
fcm.getFileChooser().setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
}
prepareFileChooser(tfFileName.getText(), fcm.getFileChooser());
- AbstractFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
+ AbstractFileChooser fc = fcm.openFileChooser(GuiHelper.getFrameForComponent(SourceEditor.this));
if (fc != null) {
tfFileName.setText(fc.getSelectedFile().toString());
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
index 948bac1..bf29846 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
@@ -954,14 +954,6 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
}
}
- public Action getAction(String s) {
- Action e = actions.get(s);
- if (e == null) {
- e = regactions.get(s);
- }
- return e;
- }
-
private void loadActions() {
rootActionsNode.removeAllChildren();
loadAction(rootActionsNode, Main.main.menu);
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java b/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
index 591f9c9..2947be1 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
@@ -27,7 +27,7 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class ListEditor extends AbstractListEditor<String> {
- private final List<String> data;
+ private final ListSettingTableModel model;
/**
* Constructs a new {@code ListEditor}.
@@ -37,18 +37,13 @@ public class ListEditor extends AbstractListEditor<String> {
*/
public ListEditor(final JComponent gui, PrefEntry entry, ListSetting setting) {
super(gui, tr("Change list setting"), entry);
- List<String> orig = setting.getValue();
- if (orig != null) {
- data = new ArrayList<>(orig);
- } else {
- data = new ArrayList<>();
- }
+ model = new ListSettingTableModel(setting.getValue());
setContent(build(), false);
}
@Override
public List<String> getData() {
- return new ArrayList<>(Utils.filter(data, new Predicate<String>() {
+ return new ArrayList<>(Utils.filter(model.getData(), new Predicate<String>() {
@Override
public boolean evaluate(String object) {
return object != null && !object.isEmpty();
@@ -60,8 +55,7 @@ public class ListEditor extends AbstractListEditor<String> {
protected final JPanel build() {
JPanel p = new JPanel(new GridBagLayout());
p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.eol().insets(0, 0, 5, 0));
- ListSettingTableModel listModel = new ListSettingTableModel();
- JTable table = new JTable(listModel);
+ JTable table = new JTable(model);
table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
table.setTableHeader(null);
@@ -74,7 +68,17 @@ public class ListEditor extends AbstractListEditor<String> {
return p;
}
- class ListSettingTableModel extends AbstractTableModel {
+ static class ListSettingTableModel extends AbstractTableModel {
+
+ private final List<String> data;
+
+ ListSettingTableModel(List<String> orig) {
+ if (orig != null) {
+ data = new ArrayList<>(orig);
+ } else {
+ data = new ArrayList<>();
+ }
+ }
public List<String> getData() {
return data;
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
index 343101a..5f1fb06 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
@@ -7,6 +7,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
+import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -94,16 +95,19 @@ public class PreferencesTable extends JTable {
*/
public boolean editPreference(final JComponent gui) {
if (getSelectedRowCount() != 1) {
- JOptionPane.showMessageDialog(
- gui,
- tr("Please select the row to edit."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
+ if (!GraphicsEnvironment.isHeadless()) {
+ JOptionPane.showMessageDialog(
+ gui,
+ tr("Please select the row to edit."),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE
+ );
+ }
return false;
}
final PrefEntry e = (PrefEntry) model.getValueAt(getSelectedRow(), 1);
Setting<?> stg = e.getValue();
+ boolean ok = false;
if (stg instanceof StringSetting) {
editCellAt(getSelectedRow(), 1);
Component editor = getEditorComponent();
@@ -111,37 +115,49 @@ public class PreferencesTable extends JTable {
editor.requestFocus();
}
} else if (stg instanceof ListSetting) {
- ListSetting lSetting = (ListSetting) stg;
- ListEditor lEditor = new ListEditor(gui, e, lSetting);
- lEditor.showDialog();
- if (lEditor.getValue() == 1) {
- List<String> data = lEditor.getData();
- if (!lSetting.equalVal(data)) {
- e.setValue(new ListSetting(data));
- return true;
- }
- }
+ ok = doEditList(gui, e, (ListSetting) stg);
} else if (stg instanceof ListListSetting) {
- ListListSetting llSetting = (ListListSetting) stg;
- ListListEditor llEditor = new ListListEditor(gui, e, llSetting);
- llEditor.showDialog();
- if (llEditor.getValue() == 1) {
- List<List<String>> data = llEditor.getData();
- if (!llSetting.equalVal(data)) {
- e.setValue(new ListListSetting(data));
- return true;
- }
- }
+ ok = doEditListList(gui, e, (ListListSetting) stg);
} else if (stg instanceof MapListSetting) {
- MapListSetting mlSetting = (MapListSetting) stg;
- MapListEditor mlEditor = new MapListEditor(gui, e, mlSetting);
- mlEditor.showDialog();
- if (mlEditor.getValue() == 1) {
- List<Map<String, String>> data = mlEditor.getData();
- if (!mlSetting.equalVal(data)) {
- e.setValue(new MapListSetting(data));
- return true;
- }
+ ok = doEditMapList(gui, e, (MapListSetting) stg);
+ }
+ return ok;
+ }
+
+ private static boolean doEditList(final JComponent gui, final PrefEntry e, ListSetting lSetting) {
+ ListEditor lEditor = new ListEditor(gui, e, lSetting);
+ lEditor.showDialog();
+ if (lEditor.getValue() == 1) {
+ List<String> data = lEditor.getData();
+ if (!lSetting.equalVal(data)) {
+ e.setValue(new ListSetting(data));
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean doEditListList(final JComponent gui, final PrefEntry e, ListListSetting llSetting) {
+ ListListEditor llEditor = new ListListEditor(gui, e, llSetting);
+ llEditor.showDialog();
+ if (llEditor.getValue() == 1) {
+ List<List<String>> data = llEditor.getData();
+ if (!llSetting.equalVal(data)) {
+ e.setValue(new ListListSetting(data));
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean doEditMapList(final JComponent gui, final PrefEntry e, MapListSetting mlSetting) {
+ MapListEditor mlEditor = new MapListEditor(gui, e, mlSetting);
+ mlEditor.showDialog();
+ if (mlEditor.getValue() == 1) {
+ List<Map<String, String>> data = mlEditor.getData();
+ if (!mlSetting.equalVal(data)) {
+ e.setValue(new MapListSetting(data));
+ return true;
}
}
return false;
@@ -178,68 +194,85 @@ public class PreferencesTable extends JTable {
rbString.setSelected(true);
- ExtendedDialog dlg = new ExtendedDialog(gui, tr("Add setting"), new String[] {tr("OK"), tr("Cancel")});
- dlg.setButtonIcons(new String[] {"ok.png", "cancel.png"});
- dlg.setContent(p);
- dlg.showDialog();
-
PrefEntry pe = null;
boolean ok = false;
- if (dlg.getValue() == 1) {
+ if (!GraphicsEnvironment.isHeadless() && askAddSetting(gui, p)) {
if (rbString.isSelected()) {
StringSetting sSetting = new StringSetting(null);
pe = new PrefEntry(tkey.getText(), sSetting, sSetting, false);
- StringEditor sEditor = new StringEditor(gui, pe, sSetting);
- sEditor.showDialog();
- if (sEditor.getValue() == 1) {
- String data = sEditor.getData();
- if (!Objects.equals(sSetting.getValue(), data)) {
- pe.setValue(new StringSetting(data));
- ok = true;
- }
- }
+ ok = doAddSimple(gui, pe, sSetting);
} else if (rbList.isSelected()) {
ListSetting lSetting = new ListSetting(null);
pe = new PrefEntry(tkey.getText(), lSetting, lSetting, false);
- ListEditor lEditor = new ListEditor(gui, pe, lSetting);
- lEditor.showDialog();
- if (lEditor.getValue() == 1) {
- List<String> data = lEditor.getData();
- if (!lSetting.equalVal(data)) {
- pe.setValue(new ListSetting(data));
- ok = true;
- }
- }
+ ok = doAddList(gui, pe, lSetting);
} else if (rbListList.isSelected()) {
ListListSetting llSetting = new ListListSetting(null);
pe = new PrefEntry(tkey.getText(), llSetting, llSetting, false);
- ListListEditor llEditor = new ListListEditor(gui, pe, llSetting);
- llEditor.showDialog();
- if (llEditor.getValue() == 1) {
- List<List<String>> data = llEditor.getData();
- if (!llSetting.equalVal(data)) {
- pe.setValue(new ListListSetting(data));
- ok = true;
- }
- }
+ ok = doAddListList(gui, pe, llSetting);
} else if (rbMapList.isSelected()) {
MapListSetting mlSetting = new MapListSetting(null);
pe = new PrefEntry(tkey.getText(), mlSetting, mlSetting, false);
- MapListEditor mlEditor = new MapListEditor(gui, pe, mlSetting);
- mlEditor.showDialog();
- if (mlEditor.getValue() == 1) {
- List<Map<String, String>> data = mlEditor.getData();
- if (!mlSetting.equalVal(data)) {
- pe.setValue(new MapListSetting(data));
- ok = true;
- }
- }
+ ok = doAddMapList(gui, pe, mlSetting);
+ }
+ }
+ return ok ? pe : null;
+ }
+
+ private static boolean askAddSetting(JComponent gui, JPanel p) {
+ return new ExtendedDialog(gui, tr("Add setting"), new String[] {tr("OK"), tr("Cancel")})
+ .setContent(p).setButtonIcons(new String[] {"ok.png", "cancel.png"}).showDialog().getValue() == 1;
+ }
+
+ private static boolean doAddSimple(final JComponent gui, PrefEntry pe, StringSetting sSetting) {
+ StringEditor sEditor = new StringEditor(gui, pe, sSetting);
+ sEditor.showDialog();
+ if (sEditor.getValue() == 1) {
+ String data = sEditor.getData();
+ if (!Objects.equals(sSetting.getValue(), data)) {
+ pe.setValue(new StringSetting(data));
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean doAddList(final JComponent gui, PrefEntry pe, ListSetting lSetting) {
+ ListEditor lEditor = new ListEditor(gui, pe, lSetting);
+ lEditor.showDialog();
+ if (lEditor.getValue() == 1) {
+ List<String> data = lEditor.getData();
+ if (!lSetting.equalVal(data)) {
+ pe.setValue(new ListSetting(data));
+ return true;
}
}
- if (ok)
- return pe;
- else
- return null;
+ return false;
+ }
+
+ private static boolean doAddListList(final JComponent gui, PrefEntry pe, ListListSetting llSetting) {
+ ListListEditor llEditor = new ListListEditor(gui, pe, llSetting);
+ llEditor.showDialog();
+ if (llEditor.getValue() == 1) {
+ List<List<String>> data = llEditor.getData();
+ if (!llSetting.equalVal(data)) {
+ pe.setValue(new ListListSetting(data));
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean doAddMapList(final JComponent gui, PrefEntry pe, MapListSetting mlSetting) {
+ MapListEditor mlEditor = new MapListEditor(gui, pe, mlSetting);
+ mlEditor.showDialog();
+ if (mlEditor.getValue() == 1) {
+ List<Map<String, String>> data = mlEditor.getData();
+ if (!mlSetting.equalVal(data)) {
+ pe.setValue(new MapListSetting(data));
+ return true;
+ }
+ }
+ return false;
}
/**
@@ -248,12 +281,14 @@ public class PreferencesTable extends JTable {
*/
public void resetPreferences(final JComponent gui) {
if (getSelectedRowCount() == 0) {
- JOptionPane.showMessageDialog(
- gui,
- tr("Please select the row to delete."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
+ if (!GraphicsEnvironment.isHeadless()) {
+ JOptionPane.showMessageDialog(
+ gui,
+ tr("Please select the row to delete."),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE
+ );
+ }
return;
}
for (int row : getSelectedRows()) {
@@ -263,7 +298,7 @@ public class PreferencesTable extends JTable {
fireDataChanged();
}
- private class AllSettingsTableModel extends DefaultTableModel {
+ final class AllSettingsTableModel extends DefaultTableModel {
AllSettingsTableModel() {
setColumnIdentifiers(new String[]{tr("Key"), tr("Value")});
@@ -298,7 +333,7 @@ public class PreferencesTable extends JTable {
}
}
- private static class SettingCellRenderer extends DefaultTableCellRenderer {
+ static final class SettingCellRenderer extends DefaultTableCellRenderer {
private final Color backgroundColor = UIManager.getColor("Table.background");
private final Color changedColor = Main.pref.getColor(
marktr("Advanced Background: Changed"),
@@ -343,7 +378,7 @@ public class PreferencesTable extends JTable {
}
}
- private static class SettingCellEditor extends DefaultCellEditor {
+ static final class SettingCellEditor extends DefaultCellEditor {
SettingCellEditor() {
super(new JosmTextField());
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
index 2dbce1a..d6595eb 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
@@ -95,21 +95,21 @@ public class ColorPreference implements SubPreferenceSetting {
}
// fill model with colors:
Map<String, String> colorKeyList = new TreeMap<>();
- Map<String, String> colorKeyList_mappaint = new TreeMap<>();
- Map<String, String> colorKeyList_layer = new TreeMap<>();
+ Map<String, String> colorKeyListMappaint = new TreeMap<>();
+ Map<String, String> colorKeyListLayer = new TreeMap<>();
for (String key : colorMap.keySet()) {
if (key.startsWith("layer ")) {
- colorKeyList_layer.put(getName(key), key);
+ colorKeyListLayer.put(getName(key), key);
} else if (key.startsWith("mappaint.")) {
// use getName(key)+key, as getName() may be ambiguous
- colorKeyList_mappaint.put(getName(key)+key, key);
+ colorKeyListMappaint.put(getName(key)+key, key);
} else {
colorKeyList.put(getName(key), key);
}
}
addColorRows(colorMap, colorKeyList);
- addColorRows(colorMap, colorKeyList_mappaint);
- addColorRows(colorMap, colorKeyList_layer);
+ addColorRows(colorMap, colorKeyListMappaint);
+ addColorRows(colorMap, colorKeyListLayer);
if (this.colors != null) {
this.colors.repaint();
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
index 3b95705..49aaf24 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
@@ -445,7 +445,7 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
return savePreferences(null, false);
}
- private void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) {
+ private static void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) {
String labelPattern = property.getAsString();
boolean found = false;
for (int i = 0; i < LABEL_PATTERN_TEMPLATE.length; i++) {
@@ -462,7 +462,7 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
}
}
- private void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) {
+ private static void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) {
if (cb.getSelectedIndex() == WAYPOINT_LABEL_CUSTOM) {
tf.setEnabled(true);
} else {
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
index 47ce2f0..df9aff0 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
@@ -77,11 +77,11 @@ public class LafPreference implements SubPreferenceSetting {
// let's try to load additional LookAndFeels and put them into the list
if (Main.isPlatformOsx()) {
try {
- Class<?> Cquaqua = Class.forName("ch.randelshofer.quaqua.QuaquaLookAndFeel");
- Object Oquaqua = Cquaqua.getConstructor((Class[]) null).newInstance((Object[]) null);
+ Class<?> cquaqua = Class.forName("ch.randelshofer.quaqua.QuaquaLookAndFeel");
+ Object oquaqua = cquaqua.getConstructor((Class[]) null).newInstance((Object[]) null);
// no exception? Then Go!
lafCombo.addItem(
- new UIManager.LookAndFeelInfo(((LookAndFeel) Oquaqua).getName(), "ch.randelshofer.quaqua.QuaquaLookAndFeel")
+ new UIManager.LookAndFeelInfo(((LookAndFeel) oquaqua).getName(), "ch.randelshofer.quaqua.QuaquaLookAndFeel")
);
} catch (Exception ex) {
// just debug, Quaqua may not even be installed...
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java b/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
index 8ba8771..9fe52a0 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
@@ -30,9 +30,12 @@ import org.openstreetmap.josm.tools.LanguageInfo;
/**
* Language preferences.
+ * @since 1065
*/
public class LanguagePreference implements SubPreferenceSetting {
+ private static final String LANGUAGE = "language";
+
/**
* Factory used to create a new {@code LanguagePreference}.
*/
@@ -51,7 +54,7 @@ public class LanguagePreference implements SubPreferenceSetting {
LanguageComboBoxModel model = new LanguageComboBoxModel();
// Selecting the language BEFORE the JComboBox listens to model changes speed up initialization by ~35ms (see #7386)
// See https://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui
- model.selectLanguage(Main.pref.get("language"));
+ model.selectLanguage(Main.pref.get(LANGUAGE));
langCombo = new JosmComboBox<>(model);
langCombo.setRenderer(new LanguageCellRenderer());
@@ -69,9 +72,9 @@ public class LanguagePreference implements SubPreferenceSetting {
@Override
public boolean ok() {
if (langCombo.getSelectedItem() == null)
- return Main.pref.put("language", null);
+ return Main.pref.put(LANGUAGE, null);
else
- return Main.pref.put("language",
+ return Main.pref.put(LANGUAGE,
LanguageInfo.getJOSMLocaleCode((Locale) langCombo.getSelectedItem()));
}
@@ -83,15 +86,15 @@ public class LanguagePreference implements SubPreferenceSetting {
data.addAll(Arrays.asList(I18n.getAvailableTranslations()));
}
- public void selectLanguage(String language) {
+ private void selectLanguage(String language) {
setSelectedItem(null);
if (language != null) {
- language = LanguageInfo.getJavaLocaleCode(language);
+ String lang = LanguageInfo.getJavaLocaleCode(language);
for (Locale locale: data) {
if (locale == null) {
continue;
}
- if (locale.toString().equals(language)) {
+ if (locale.toString().equals(lang)) {
setSelectedItem(locale);
return;
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java
index eec5c56..feec978 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java
@@ -70,6 +70,10 @@ public class CacheContentsPanel extends JPanel {
private final JButton editButton;
private Object editorValue;
+ private ButtonColumn() {
+ this(null);
+ }
+
private ButtonColumn(Action action) {
this.action = action;
renderButton = new JButton();
@@ -223,7 +227,7 @@ public class CacheContentsPanel extends JPanel {
return ret;
}
- private JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) {
+ private static JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) {
final JTable ret = new JTable(tableModel);
ButtonColumn buttonColumn = new ButtonColumn(
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
index 333980d..01c3e77 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
@@ -9,6 +9,7 @@ import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
+import java.awt.GraphicsEnvironment;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
@@ -96,7 +97,7 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
false, new JTabbedPane());
}
- private void addSettingsSection(final JPanel p, String name, JPanel section) {
+ private static void addSettingsSection(final JPanel p, String name, JPanel section) {
addSettingsSection(p, name, section, GBC.eol());
}
@@ -159,7 +160,9 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
Main.main.menu.imageryMenu.refreshOffsetMenu();
OffsetBookmark.saveBookmarks();
- DownloadDialog.getInstance().refreshTileSources();
+ if (!GraphicsEnvironment.isHeadless()) {
+ DownloadDialog.getInstance().refreshTileSources();
+ }
boolean commonRestartRequired = commonSettings.saveSettings();
boolean wmsRestartRequired = wmsSettings.saveSettings();
@@ -276,9 +279,11 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
isSelected, boolean hasFocus, int row, int column) {
ImageryInfo info = (ImageryInfo) value;
JLabel label = (JLabel) super.getTableCellRendererComponent(
- table, info.getName(), isSelected, hasFocus, row, column);
+ table, info == null ? null : info.getName(), isSelected, hasFocus, row, column);
GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
- label.setToolTipText(info.getToolTipText());
+ if (info != null) {
+ label.setToolTipText(info.getToolTipText());
+ }
return label;
}
}
@@ -768,7 +773,7 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
}
}
- private boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {
+ private static boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {
URL url = null;
try {
url = new URL(eulaUrl.replaceAll("\\{lang\\}", LanguageInfo.getWikiLanguagePrefix()));
@@ -872,11 +877,11 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
setColumnIdentifiers(new String[] {tr("Projection"), tr("Layer"), tr("Name"), tr("Easting"), tr("Northing")});
}
- public OffsetBookmark getRow(int row) {
+ private OffsetBookmark getRow(int row) {
return bookmarks.get(row);
}
- public void addRow(OffsetBookmark i) {
+ private void addRow(OffsetBookmark i) {
bookmarks.add(i);
int p = getRowCount() - 1;
fireTableRowsInserted(p, p);
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
index d40ed43..ba2fc0c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
@@ -85,7 +85,7 @@ public class MapPaintPreference implements SubPreferenceSetting {
static class MapPaintSourceEditor extends SourceEditor {
- private static final String iconpref = "mappaint.icon.sources";
+ private static final String ICONPREF = "mappaint.icon.sources";
MapPaintSourceEditor() {
super(SourceType.MAP_PAINT_STYLE, Main.getJOSMWebsite()+"/styles", styleSourceProviders, true);
@@ -98,22 +98,7 @@ public class MapPaintPreference implements SubPreferenceSetting {
@Override
public boolean finish() {
- List<SourceEntry> activeStyles = activeSourcesModel.getSources();
-
- boolean changed = MapPaintPrefHelper.INSTANCE.put(activeStyles);
-
- if (tblIconPaths != null) {
- List<String> iconPaths = iconPathsModel.getIconPaths();
-
- if (!iconPaths.isEmpty()) {
- if (Main.pref.putCollection(iconpref, iconPaths)) {
- changed = true;
- }
- } else if (Main.pref.putCollection(iconpref, null)) {
- changed = true;
- }
- }
- return changed;
+ return doFinish(MapPaintPrefHelper.INSTANCE, ICONPREF);
}
@Override
@@ -123,7 +108,7 @@ public class MapPaintPreference implements SubPreferenceSetting {
@Override
public Collection<String> getInitialIconPathsList() {
- return Main.pref.getCollection(iconpref, null);
+ return Main.pref.getCollection(ICONPREF, null);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
index 88ac9fe..cedfa59 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
@@ -27,12 +27,12 @@ import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
import org.openstreetmap.josm.gui.preferences.SourceEditor;
import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
import org.openstreetmap.josm.gui.preferences.SourceEntry;
import org.openstreetmap.josm.gui.preferences.SourceProvider;
import org.openstreetmap.josm.gui.preferences.SourceType;
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.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -182,7 +182,7 @@ public final class TaggingPresetPreference implements SubPreferenceSetting {
static class TaggingPresetSourceEditor extends SourceEditor {
- private static final String iconpref = "taggingpreset.icon.sources";
+ private static final String ICONPREF = "taggingpreset.icon.sources";
TaggingPresetSourceEditor() {
super(SourceType.TAGGING_PRESET, Main.getJOSMWebsite()+"/presets", presetSourceProviders, true);
@@ -195,22 +195,7 @@ public final class TaggingPresetPreference implements SubPreferenceSetting {
@Override
public boolean finish() {
- List<SourceEntry> activeStyles = activeSourcesModel.getSources();
-
- boolean changed = PresetPrefHelper.INSTANCE.put(activeStyles);
-
- if (tblIconPaths != null) {
- List<String> iconPaths = iconPathsModel.getIconPaths();
-
- if (!iconPaths.isEmpty()) {
- if (Main.pref.putCollection(iconpref, iconPaths)) {
- changed = true;
- }
- } else if (Main.pref.putCollection(iconpref, null)) {
- changed = true;
- }
- }
- return changed;
+ return doFinish(PresetPrefHelper.INSTANCE, ICONPREF);
}
@Override
@@ -220,7 +205,7 @@ public final class TaggingPresetPreference implements SubPreferenceSetting {
@Override
public Collection<String> getInitialIconPathsList() {
- return Main.pref.getCollection(iconpref, null);
+ return Main.pref.getCollection(ICONPREF, null);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
index e9b357a..9025304 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
@@ -69,14 +69,16 @@ public class PluginListPanel extends VerticallyScrollablePanel {
}
protected String formatPluginLocalVersion(PluginInformation pi) {
- if (pi == null) return tr("unknown");
+ if (pi == null)
+ return tr("unknown");
if (pi.localversion == null || pi.localversion.trim().isEmpty())
return tr("unknown");
return pi.localversion;
}
protected String formatCheckboxTooltipText(PluginInformation pi) {
- if (pi == null) return "";
+ if (pi == null)
+ return "";
if (pi.downloadlink == null)
return tr("Plugin bundled with JOSM");
else
@@ -106,10 +108,9 @@ public class PluginListPanel extends VerticallyScrollablePanel {
/**
* A plugin checkbox.
- *
*/
private class JPluginCheckBox extends JCheckBox {
- public final transient PluginInformation pi;
+ protected final transient PluginInformation pi;
JPluginCheckBox(final PluginInformation pi, boolean selected) {
this.pi = pi;
@@ -121,7 +122,6 @@ public class PluginListPanel extends VerticallyScrollablePanel {
/**
* Listener called when the user selects/unselects a plugin checkbox.
- *
*/
private class PluginCbActionListener implements ActionListener {
private final JPluginCheckBox cb;
@@ -171,7 +171,6 @@ public class PluginListPanel extends VerticallyScrollablePanel {
}
}
-
/**
* Alerts the user if an unselected plugin is still required by another plugins
*
@@ -180,8 +179,7 @@ public class PluginListPanel extends VerticallyScrollablePanel {
* @param otherPlugins the other plugins
*/
private static void alertPluginStillRequired(Component parent, String plugin, Set<String> otherPlugins) {
- StringBuilder sb = new StringBuilder();
- sb.append("<html>")
+ StringBuilder sb = new StringBuilder("<html>")
.append(trn("Plugin {0} is still required by this plugin:",
"Plugin {0} is still required by these {1} plugins:",
otherPlugins.size(),
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
index bdc807b..bbd9443 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
@@ -269,8 +269,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
);
if (answer != 0 /* OK */)
return;
- List<String> sites = pnl.getUpdateSites();
- Main.pref.setPluginSites(sites);
+ Main.pref.setPluginSites(pnl.getUpdateSites());
}
/**
@@ -496,11 +495,10 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
}
/**
- * Applies the current filter condition in the filter text field to the
- * model
+ * Applies the current filter condition in the filter text field to the model.
*/
class SearchFieldAdapter implements DocumentListener {
- public void filter() {
+ private void filter() {
String expr = tfFilter.getText().trim();
if (expr.isEmpty()) {
expr = null;
@@ -542,7 +540,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
@Override
public void actionPerformed(ActionEvent e) {
String s = JOptionPane.showInputDialog(
- JOptionPane.getFrameForComponent(PluginConfigurationSitesPanel.this),
+ GuiHelper.getFrameForComponent(PluginConfigurationSitesPanel.this),
tr("Add JOSM Plugin description URL."),
tr("Enter URL"),
JOptionPane.QUESTION_MESSAGE
@@ -557,7 +555,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
public void actionPerformed(ActionEvent e) {
if (list.getSelectedValue() == null) {
JOptionPane.showMessageDialog(
- JOptionPane.getFrameForComponent(PluginConfigurationSitesPanel.this),
+ GuiHelper.getFrameForComponent(PluginConfigurationSitesPanel.this),
tr("Please select an entry."),
tr("Warning"),
JOptionPane.WARNING_MESSAGE
@@ -583,7 +581,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
public void actionPerformed(ActionEvent event) {
if (list.getSelectedValue() == null) {
JOptionPane.showMessageDialog(
- JOptionPane.getFrameForComponent(PluginConfigurationSitesPanel.this),
+ GuiHelper.getFrameForComponent(PluginConfigurationSitesPanel.this),
tr("Please select an entry."),
tr("Warning"),
JOptionPane.WARNING_MESSAGE
@@ -596,7 +594,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
add(buttons, GBC.eol());
}
- public List<String> getUpdateSites() {
+ protected List<String> getUpdateSites() {
if (model.getSize() == 0)
return Collections.emptyList();
List<String> ret = new ArrayList<>(model.getSize());
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
index 636efe9..ae16141 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
@@ -35,7 +35,7 @@ public class LambertCC9ZonesProjectionChoice extends ListProjectionChoice {
super(tr("Lambert CC9 Zone (France)"), /* NO-ICON */ "core:lambertcc9", lambert9zones, tr("Lambert CC Zone"));
}
- private class LambertCC9CBPanel extends CBPanel {
+ private static class LambertCC9CBPanel extends CBPanel {
LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
super(entries, initialIndex, label, listener);
this.add(new JLabel(ImageProvider.get("data/projection", "LambertCC9Zones.png")), GBC.eol().fill(GBC.HORIZONTAL));
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
index f6db9fe..ae0802e 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
@@ -30,7 +30,7 @@ public class LambertProjectionChoice extends ListProjectionChoice {
super(tr("Lambert 4 Zones (France)"), /* NO-ICON */ "core:lambert", lambert4zones, tr("Lambert CC Zone"));
}
- private class LambertCBPanel extends CBPanel {
+ private static class LambertCBPanel extends CBPanel {
LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
super(entries, initialIndex, label, listener);
this.add(new JLabel(ImageProvider.get("data/projection", "Departements_Lambert4Zones.png")), GBC.eol().fill(GBC.HORIZONTAL));
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java
index 688fe2a..c2d3fc3 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java
@@ -84,7 +84,7 @@ public abstract class ListProjectionChoice extends AbstractProjectionChoice {
this.index = idx;
}
- protected class CBPanel extends JPanel {
+ protected static class CBPanel extends JPanel {
public JosmComboBox<String> prefcb;
public CBPanel(String[] entries, int initialIndex, String label, final ActionListener listener) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
index a41e3b6..2a5e24a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
@@ -42,7 +42,7 @@ import org.openstreetmap.josm.tools.UserCancelException;
* user already has an Access Token.
*
* For initial authorisation see {@link OAuthAuthorizationWizard}.
- *
+ * @since 2745
*/
public class OAuthAuthenticationPreferencesPanel extends JPanel implements PropertyChangeListener {
private JPanel pnlAuthorisationMessage;
@@ -54,6 +54,14 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
private JCheckBox cbSaveToPreferences;
/**
+ * Create the panel
+ */
+ public OAuthAuthenticationPreferencesPanel() {
+ build();
+ refreshView();
+ }
+
+ /**
* Builds the panel for entering the advanced OAuth parameters
*
* @return panel with advanced settings
@@ -139,14 +147,6 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
}
/**
- * Create the panel
- */
- public OAuthAuthenticationPreferencesPanel() {
- build();
- refreshView();
- }
-
- /**
* Sets the URL of the OSM API for which this panel is currently displaying OAuth properties.
*
* @param apiUrl the api URL
@@ -223,6 +223,14 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
private JosmTextField tfAccessTokenKey;
private JosmTextField tfAccessTokenSecret;
+ /**
+ * Constructs a new {@code AlreadyAuthorisedPanel}.
+ */
+ AlreadyAuthorisedPanel() {
+ build();
+ refreshView();
+ }
+
protected void build() {
setLayout(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
@@ -290,24 +298,15 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
gc.weightx = 1.0;
gc.weighty = 1.0;
add(new JPanel(), gc);
-
}
- public final void refreshView() {
+ protected final void refreshView() {
String v = OAuthAccessTokenHolder.getInstance().getAccessTokenKey();
tfAccessTokenKey.setText(v == null ? "" : v);
v = OAuthAccessTokenHolder.getInstance().getAccessTokenSecret();
tfAccessTokenSecret.setText(v == null ? "" : v);
cbSaveToPreferences.setSelected(OAuthAccessTokenHolder.getInstance().isSaveToPreferences());
}
-
- /**
- * Constructs a new {@code AlreadyAuthorisedPanel}.
- */
- AlreadyAuthorisedPanel() {
- build();
- refreshView();
- }
}
/**
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
index dead37c..8448567 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
@@ -60,6 +60,14 @@ public class OsmApiUrlInputPanel extends JPanel {
private transient ApiUrlPropagator propagator;
+ /**
+ * Constructs a new {@code OsmApiUrlInputPanel}.
+ */
+ public OsmApiUrlInputPanel() {
+ build();
+ HelpUtil.setHelpContext(this, HelpUtil.ht("/Preferences/Connection#ApiUrl"));
+ }
+
protected JComponent buildDefaultServerUrlPanel() {
cbUseDefaultServerUrl = new JCheckBox(tr("<html>Use the default OSM server URL (<strong>{0}</strong>)</html>", OsmApi.DEFAULT_API_URL));
cbUseDefaultServerUrl.addItemListener(new UseDefaultServerUrlChangeHandler());
@@ -111,14 +119,6 @@ public class OsmApiUrlInputPanel extends JPanel {
}
/**
- * Constructs a new {@code OsmApiUrlInputPanel}.
- */
- public OsmApiUrlInputPanel() {
- build();
- HelpUtil.setHelpContext(this, HelpUtil.ht("/Preferences/Connection#ApiUrl"));
- }
-
- /**
* Initializes the configuration panel with values from the preferences
*/
public void initFromPreferences() {
@@ -151,8 +151,7 @@ public class OsmApiUrlInputPanel extends JPanel {
}
String newUrl = OsmApi.getOsmApi().getServerUrl();
- // When API URL changes, re-initialize API connection so we may adjust
- // server-dependent settings.
+ // When API URL changes, re-initialize API connection so we may adjust server-dependent settings.
if (!oldUrl.equals(newUrl)) {
try {
OsmApi.getOsmApi().initialize(null);
@@ -302,11 +301,11 @@ public class OsmApiUrlInputPanel extends JPanel {
}
class ApiUrlPropagator extends FocusAdapter implements ActionListener {
- public void propagate() {
+ protected void propagate() {
propagate(getStrippedApiUrl());
}
- public void propagate(String url) {
+ protected void propagate(String url) {
firePropertyChange(API_URL_PROP, null, url);
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java b/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java
index ce1ac07..c2b56d3 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java
@@ -5,32 +5,18 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import javax.swing.text.JTextComponent;
-import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+import org.openstreetmap.josm.gui.widgets.DefaultTextComponentValidator;
/**
* Validator for OSM username.
*/
-public class UserNameValidator extends AbstractTextComponentValidator {
+public class UserNameValidator extends DefaultTextComponentValidator {
/**
* Constructs a new {@code UserNameValidator}.
* @param tc the text component used to enter username
*/
public UserNameValidator(JTextComponent tc) {
- super(tc);
- }
-
- @Override
- public boolean isValid() {
- return !getComponent().getText().trim().isEmpty();
- }
-
- @Override
- public void validate() {
- if (isValid()) {
- feedbackValid(tr("Please enter your OSM user name"));
- } else {
- feedbackInvalid(tr("The user name cannot be empty. Please enter your OSM user name"));
- }
+ super(tc, tr("Please enter your OSM user name"), tr("The user name cannot be empty. Please enter your OSM user name"));
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
index 2877d78..fe0ad5c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
@@ -76,6 +76,24 @@ public class PrefJPanel extends JPanel {
// not a list of real physical keys. If someone knows how to get that list?
private static Map<Integer, String> keyList = setKeyList();
+ private final JCheckBox cbAlt = new JCheckBox();
+ private final JCheckBox cbCtrl = new JCheckBox();
+ private final JCheckBox cbMeta = new JCheckBox();
+ private final JCheckBox cbShift = new JCheckBox();
+ private final JCheckBox cbDefault = new JCheckBox();
+ private final JCheckBox cbDisable = new JCheckBox();
+ private final JosmComboBox<String> tfKey = new JosmComboBox<>();
+
+ private final JTable shortcutTable = new JTable();
+
+ private final JosmTextField filterField = new JosmTextField();
+
+ /** Creates new form prefJPanel */
+ public PrefJPanel() {
+ this.model = new ScListModel();
+ initComponents();
+ }
+
private static Map<Integer, String> setKeyList() {
Map<Integer, String> list = new LinkedHashMap<>();
String unknown = Toolkit.getProperty("AWT.unknown", "Unknown");
@@ -88,7 +106,7 @@ public class PrefJPanel extends JPanel {
if (s != null && s.length() > 0 && !s.contains(unknown)) {
list.put(Integer.valueOf(i), s);
}
- } catch (Exception e) {
+ } catch (IllegalArgumentException | IllegalAccessException e) {
Main.error(e);
}
}
@@ -97,24 +115,6 @@ public class PrefJPanel extends JPanel {
return list;
}
- private final JCheckBox cbAlt = new JCheckBox();
- private final JCheckBox cbCtrl = new JCheckBox();
- private final JCheckBox cbMeta = new JCheckBox();
- private final JCheckBox cbShift = new JCheckBox();
- private final JCheckBox cbDefault = new JCheckBox();
- private final JCheckBox cbDisable = new JCheckBox();
- private final JosmComboBox<String> tfKey = new JosmComboBox<>();
-
- private final JTable shortcutTable = new JTable();
-
- private final JosmTextField filterField = new JosmTextField();
-
- /** Creates new form prefJPanel */
- public PrefJPanel() {
- this.model = new ScListModel();
- initComponents();
- }
-
/**
* Show only shortcuts with descriptions containing given substring
* @param substring The substring used to filter
@@ -168,7 +168,8 @@ public class PrefJPanel extends JPanel {
isSelected, boolean hasFocus, int row, int column) {
int row1 = shortcutTable.convertRowIndexToModel(row);
Shortcut sc = (Shortcut) model.getValueAt(row1, -1);
- if (sc == null) return null;
+ if (sc == null)
+ return null;
JLabel label = (JLabel) super.getTableCellRendererComponent(
table, name ? sc.getLongText() : sc.getKeyText(), isSelected, hasFocus, row, column);
GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
@@ -186,27 +187,24 @@ public class PrefJPanel extends JPanel {
}
private void initComponents() {
- JPanel listPane = new JPanel(new GridLayout());
- JScrollPane listScrollPane = new JScrollPane();
- JPanel shortcutEditPane = new JPanel(new GridLayout(5, 2));
-
CbAction action = new CbAction(this);
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
add(buildFilterPanel());
// This is the list of shortcuts:
shortcutTable.setModel(model);
- shortcutTable.getSelectionModel().addListSelectionListener(new CbAction(this));
+ shortcutTable.getSelectionModel().addListSelectionListener(action);
shortcutTable.setFillsViewportHeight(true);
shortcutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
shortcutTable.setAutoCreateRowSorter(true);
TableColumnModel mod = shortcutTable.getColumnModel();
mod.getColumn(0).setCellRenderer(new ShortcutTableCellRenderer(true));
mod.getColumn(1).setCellRenderer(new ShortcutTableCellRenderer(false));
+ JScrollPane listScrollPane = new JScrollPane();
listScrollPane.setViewportView(shortcutTable);
+ JPanel listPane = new JPanel(new GridLayout());
listPane.add(listScrollPane);
-
add(listPane);
// and here follows the edit area. I won't object to someone re-designing it, it looks, um, "minimalistic" ;)
@@ -226,6 +224,8 @@ public class PrefJPanel extends JPanel {
cbMeta.setAction(action);
cbMeta.setText(META); // see above for why no tr()
+ JPanel shortcutEditPane = new JPanel(new GridLayout(5, 2));
+
shortcutEditPane.add(cbDefault);
shortcutEditPane.add(new JLabel());
shortcutEditPane.add(cbShift);
@@ -265,15 +265,6 @@ public class PrefJPanel extends JPanel {
return pnl;
}
- private void disableAllModifierCheckboxes() {
- cbDefault.setEnabled(false);
- cbDisable.setEnabled(false);
- cbShift.setEnabled(false);
- cbCtrl.setEnabled(false);
- cbAlt.setEnabled(false);
- cbMeta.setEnabled(false);
- }
-
// this allows to edit shortcuts. it:
// * sets the edit controls to the selected shortcut
// * enabled/disables the controls as needed
@@ -281,14 +272,23 @@ public class PrefJPanel extends JPanel {
// And after I finally had it working, I realized that those two methods
// are playing ping-pong (politically correct: table tennis, I know) and
// even have some duplicated code. Feel free to refactor, If you have
- // more expirience with GUI coding than I have.
- private class CbAction extends AbstractAction implements ListSelectionListener {
+ // more experience with GUI coding than I have.
+ private static class CbAction extends AbstractAction implements ListSelectionListener {
private final PrefJPanel panel;
CbAction(PrefJPanel panel) {
this.panel = panel;
}
+ private void disableAllModifierCheckboxes() {
+ panel.cbDefault.setEnabled(false);
+ panel.cbDisable.setEnabled(false);
+ panel.cbShift.setEnabled(false);
+ panel.cbCtrl.setEnabled(false);
+ panel.cbAlt.setEnabled(false);
+ panel.cbMeta.setEnabled(false);
+ }
+
@Override
public void valueChanged(ListSelectionEvent e) {
ListSelectionModel lsm = panel.shortcutTable.getSelectionModel(); // can't use e here
@@ -302,9 +302,9 @@ public class PrefJPanel extends JPanel {
panel.cbAlt.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.ALT_DOWN_MASK) != 0);
panel.cbMeta.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.META_DOWN_MASK) != 0);
if (sc.getKeyStroke() != null) {
- tfKey.setSelectedItem(keyList.get(sc.getKeyStroke().getKeyCode()));
+ panel.tfKey.setSelectedItem(keyList.get(sc.getKeyStroke().getKeyCode()));
} else {
- tfKey.setSelectedItem(keyList.get(-1));
+ panel.tfKey.setSelectedItem(keyList.get(-1));
}
if (!sc.isChangeable()) {
disableAllModifierCheckboxes();
@@ -313,9 +313,9 @@ public class PrefJPanel extends JPanel {
panel.cbDefault.setEnabled(true);
actionPerformed(null);
}
- model.fireTableRowsUpdated(row, row);
+ panel.model.fireTableRowsUpdated(row, row);
} else {
- panel.disableAllModifierCheckboxes();
+ disableAllModifierCheckboxes();
panel.tfKey.setEnabled(false);
}
}
@@ -356,14 +356,14 @@ public class PrefJPanel extends JPanel {
panel.cbMeta.setEnabled(state);
panel.tfKey.setEnabled(state);
} else {
- panel.disableAllModifierCheckboxes();
+ disableAllModifierCheckboxes();
panel.tfKey.setEnabled(false);
}
}
}
class FilterFieldAdapter implements DocumentListener {
- public void filter() {
+ private void filter() {
String expr = filterField.getText().trim();
if (expr.isEmpty()) {
expr = null;
diff --git a/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
index 9c08bf6..7479336 100644
--- a/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
@@ -5,8 +5,13 @@ import java.awt.Component;
import org.openstreetmap.josm.Main;
+/**
+ * A singleton progress monitor that does nothing.
+ * @since 1811
+ */
public final class NullProgressMonitor implements ProgressMonitor {
+ /** The unique instance */
public static final ProgressMonitor INSTANCE = new NullProgressMonitor();
private NullProgressMonitor() {
@@ -19,10 +24,16 @@ public final class NullProgressMonitor implements ProgressMonitor {
@Override
public void beginTask(String title) {
+ if (Main.isDebugEnabled()) {
+ Main.debug(title);
+ }
}
@Override
public void beginTask(String title, int ticks) {
+ if (Main.isDebugEnabled()) {
+ Main.debug(title);
+ }
}
@Override
@@ -49,6 +60,9 @@ public final class NullProgressMonitor implements ProgressMonitor {
@Override
public void indeterminateSubTask(String title) {
+ if (Main.isDebugEnabled()) {
+ Main.debug(title);
+ }
}
@Override
@@ -92,6 +106,9 @@ public final class NullProgressMonitor implements ProgressMonitor {
@Override
public void subTask(String title) {
+ if (Main.isDebugEnabled()) {
+ Main.debug(title);
+ }
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
index 7e46381..9ad9b5b 100644
--- a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
@@ -9,13 +9,13 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
-import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapStatus.BackgroundProgressMonitor;
import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import org.openstreetmap.josm.gui.util.GuiHelper;
public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
@@ -123,7 +123,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
if (GraphicsEnvironment.isHeadless()) {
this.dialogParent = dialogParent;
} else {
- this.dialogParent = JOptionPane.getFrameForComponent(dialogParent);
+ this.dialogParent = GuiHelper.getFrameForComponent(dialogParent);
}
this.cancelable = true;
}
@@ -134,7 +134,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
* @param windowTitle window title
*/
public PleaseWaitProgressMonitor(Component dialogParent, String windowTitle) {
- this(JOptionPane.getFrameForComponent(dialogParent));
+ this(GuiHelper.getFrameForComponent(dialogParent));
this.windowTitle = windowTitle;
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagTable.java b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
index a6f6d89..e2e7b37 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagTable.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
@@ -5,13 +5,11 @@ import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
-import java.awt.Container;
import java.awt.Dimension;
import java.awt.KeyboardFocusManager;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
@@ -25,7 +23,6 @@ import javax.swing.AbstractAction;
import javax.swing.CellEditor;
import javax.swing.JComponent;
import javax.swing.JTable;
-import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
@@ -40,9 +37,9 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveData;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.gui.dialogs.relation.RunnableAction;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.gui.widgets.JosmTable;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.TextTagParser;
import org.openstreetmap.josm.tools.Utils;
@@ -51,7 +48,7 @@ import org.openstreetmap.josm.tools.Utils;
* This is the tabular editor component for OSM tags.
* @since 1762
*/
-public class TagTable extends JTable {
+public class TagTable extends JosmTable {
/** the table cell editor used by this table */
private TagCellEditor editor;
private final TagEditorModel model;
@@ -163,7 +160,7 @@ public class TagTable extends JTable {
*
*
*/
- class DeleteAction extends RunnableAction implements ListSelectionListener {
+ class DeleteAction extends AbstractAction implements ListSelectionListener {
DeleteAction() {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
@@ -198,7 +195,7 @@ public class TagTable extends JTable {
}
@Override
- public void run() {
+ public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
switch(getSelectedColumnCount()) {
@@ -252,7 +249,7 @@ public class TagTable extends JTable {
* Action to be run when the user adds a new tag.
*
*/
- class AddAction extends RunnableAction implements PropertyChangeListener {
+ class AddAction extends AbstractAction implements PropertyChangeListener {
AddAction() {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
putValue(SHORT_DESCRIPTION, tr("Add a new tag"));
@@ -261,7 +258,7 @@ public class TagTable extends JTable {
}
@Override
- public void run() {
+ public void actionPerformed(ActionEvent e) {
CellEditor editor = getCellEditor();
if (editor != null) {
getCellEditor().stopCellEditing();
@@ -286,7 +283,7 @@ public class TagTable extends JTable {
/**
* Action to be run when the user wants to paste tags from buffer
*/
- class PasteAction extends RunnableAction implements PropertyChangeListener {
+ class PasteAction extends AbstractAction implements PropertyChangeListener {
PasteAction() {
putValue(SMALL_ICON, ImageProvider.get("", "pastetags"));
putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer"));
@@ -295,7 +292,7 @@ public class TagTable extends JTable {
}
@Override
- public void run() {
+ public void actionPerformed(ActionEvent e) {
Relation relation = new Relation();
model.applyToPrimitive(relation);
@@ -334,27 +331,35 @@ public class TagTable extends JTable {
}
/** the delete action */
- private RunnableAction deleteAction;
+ private DeleteAction deleteAction;
/** the add action */
- private RunnableAction addAction;
+ private AddAction addAction;
/** the tag paste action */
- private RunnableAction pasteAction;
+ private PasteAction pasteAction;
/**
- *
+ * Returns the delete action.
* @return the delete action used by this table
*/
- public RunnableAction getDeleteAction() {
+ public DeleteAction getDeleteAction() {
return deleteAction;
}
- public RunnableAction getAddAction() {
+ /**
+ * Returns the add action.
+ * @return the add action used by this table
+ */
+ public AddAction getAddAction() {
return addAction;
}
- public RunnableAction getPasteAction() {
+ /**
+ * Returns the paste action.
+ * @return the paste action used by this table
+ */
+ public PasteAction getPasteAction() {
return pasteAction;
}
@@ -415,20 +420,11 @@ public class TagTable extends JTable {
@Override
public Dimension getPreferredSize() {
- Container c = getParent();
- while (c != null && !(c instanceof JViewport)) {
- c = c.getParent();
- }
- if (c != null) {
- Dimension d = super.getPreferredSize();
- d.width = c.getSize().width;
- return d;
- }
- return super.getPreferredSize();
+ return getPreferredFullWidthSize();
}
- @Override protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
- int condition, boolean pressed) {
+ @Override
+ protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition, boolean pressed) {
// handle delete key
//
@@ -439,7 +435,7 @@ public class TagTable extends JTable {
// DEL in the text input.
//
return super.processKeyBinding(ks, e, condition, pressed);
- getDeleteAction().run();
+ getDeleteAction().actionPerformed(null);
}
return super.processKeyBinding(ks, e, condition, pressed);
}
@@ -486,13 +482,6 @@ public class TagTable extends JTable {
return editor;
}
- public void addOKAccelatorListener(KeyListener l) {
- addKeyListener(l);
- if (editor != null) {
- editor.getEditor().addKeyListener(l);
- }
- }
-
/**
* Inject a tag cell editor in the tag table
*
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
index 2434d35..9a6b4a8 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
@@ -135,7 +135,9 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
if (sysSel != null) {
Transferable old = Utils.getTransferableContent(sysSel);
editorComponent.select(start, end);
- sysSel.setContents(old, null);
+ if (old != null) {
+ sysSel.setContents(old, null);
+ }
} else {
editorComponent.select(start, end);
}
@@ -200,7 +202,9 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
if (sysSel != null) {
Transferable old = Utils.getTransferableContent(sysSel);
editorComponent.selectAll();
- sysSel.setContents(old, null);
+ if (old != null) {
+ sysSel.setContents(old, null);
+ }
} else {
editorComponent.selectAll();
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
index 1976e0d..22764d3 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
@@ -6,6 +6,7 @@ package org.openstreetmap.josm.gui.tagging.ac;
* The selected flag is currently only used in plugins.
*
* Instances of this class are not modifiable.
+ * @since 1762
*/
public class AutoCompletionItemPriority implements Comparable<AutoCompletionItemPriority> {
@@ -43,12 +44,11 @@ public class AutoCompletionItemPriority implements Comparable<AutoCompletionItem
private final boolean inStandard;
private final boolean selected;
-
/**
- * Create new AutoCompletionItemPriority object.
+ * Constructs a new {@code AutoCompletionItemPriority}.
*
* @param inDataSet true, if the item is found in the currently active data layer
- * @param inStandard true, if the item is a standard tag, e.g. from the presets.
+ * @param inStandard true, if the item is a standard tag, e.g. from the presets
* @param selected true, if it is found on an object that is currently selected
* @param userInput null, if the user hasn't entered this tag so far. A number when
* the tag key / value has been entered by the user before. A lower number means
@@ -61,22 +61,47 @@ public class AutoCompletionItemPriority implements Comparable<AutoCompletionItem
this.userInput = userInput == null ? NO_USER_INPUT : userInput;
}
+ /**
+ * Constructs a new {@code AutoCompletionItemPriority}.
+ *
+ * @param inDataSet true, if the item is found in the currently active data layer
+ * @param inStandard true, if the item is a standard tag, e.g. from the presets
+ * @param selected true, if it is found on an object that is currently selected
+ */
public AutoCompletionItemPriority(boolean inDataSet, boolean inStandard, boolean selected) {
this(inDataSet, inStandard, selected, NO_USER_INPUT);
}
+ /**
+ * Determines if the item is found in the currently active data layer.
+ * @return {@code true} if the item is found in the currently active data layer
+ */
public boolean isInDataSet() {
return inDataSet;
}
+ /**
+ * Determines if the item is a standard tag, e.g. from the presets.
+ * @return {@code true} if the item is a standard tag, e.g. from the presets
+ */
public boolean isInStandard() {
return inStandard;
}
+ /**
+ * Determines if it is found on an object that is currently selected.
+ * @return {@code true} if it is found on an object that is currently selected
+ */
public boolean isSelected() {
return selected;
}
+ /**
+ * Returns a number when the tag key / value has been entered by the user before.
+ * A lower number means this happened more recently and beats a higher number in priority.
+ * @return a number when the tag key / value has been entered by the user before.
+ * {@code null}, if the user hasn't entered this tag so far.
+ */
public Integer getUserInput() {
return userInput == NO_USER_INPUT ? null : userInput;
}
@@ -88,16 +113,20 @@ public class AutoCompletionItemPriority implements Comparable<AutoCompletionItem
@Override
public int compareTo(AutoCompletionItemPriority other) {
int ui = Integer.compare(other.userInput, userInput);
- if (ui != 0) return ui;
+ if (ui != 0)
+ return ui;
int sel = Boolean.valueOf(selected).compareTo(other.selected);
- if (sel != 0) return sel;
+ if (sel != 0)
+ return sel;
int ds = Boolean.valueOf(inDataSet).compareTo(other.inDataSet);
- if (ds != 0) return ds;
+ if (ds != 0)
+ return ds;
int std = Boolean.valueOf(inStandard).compareTo(other.inStandard);
- if (std != 0) return std;
+ if (std != 0)
+ return std;
return 0;
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
index cdf7fae..4d73f4d 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
@@ -27,7 +27,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
*
* AutoCompletionList is an {@link AbstractTableModel} which serves the list of filtered
* items to a {@link JTable}.
- *
+ * @since 1762
*/
public class AutoCompletionList extends AbstractTableModel {
@@ -66,7 +66,6 @@ public class AutoCompletionList extends AbstractTableModel {
/**
* clears the current filter
- *
*/
public void clearFilter() {
filter = null;
@@ -134,8 +133,9 @@ public class AutoCompletionList extends AbstractTableModel {
* @param priority the priority to use
*/
public void add(Collection<String> values, AutoCompletionItemPriority priority) {
- if (values == null) return;
- for (String value: values) {
+ if (values == null)
+ return;
+ for (String value : values) {
if (value == null) {
continue;
}
@@ -147,16 +147,19 @@ public class AutoCompletionList extends AbstractTableModel {
filter();
}
+ /**
+ * Adds values that have been entered by the user.
+ * @param values values that have been entered by the user
+ */
public void addUserInput(Collection<String> values) {
- if (values == null) return;
+ if (values == null)
+ return;
int i = 0;
- for (String value: values) {
- if (value == null) {
- continue;
+ for (String value : values) {
+ if (value != null) {
+ appendOrUpdatePriority(
+ new AutoCompletionListItem(value, new AutoCompletionItemPriority(false, false, false, i++)));
}
- AutoCompletionListItem item = new AutoCompletionListItem(value, new AutoCompletionItemPriority(false, false, false, i));
- appendOrUpdatePriority(item);
- i++;
}
sort();
filter();
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
index 1a5c26e..dfd77e4 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
@@ -543,7 +543,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
* @param p the primitive
* @return {@code true} if this preset matches the primitive
*/
- @Override
+ @Override
public boolean evaluate(OsmPrimitive p) {
return matches(EnumSet.of(TaggingPresetType.forPrimitive(p)), p.getKeys(), false);
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
index 739a51c..4ed08f3 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
@@ -102,11 +102,11 @@ public abstract class TaggingPresetItem {
return s == null ? s : s.replaceAll("'", "''");
}
- protected static String getLocaleText(String text, String text_context, String defaultText) {
+ protected static String getLocaleText(String text, String textContext, String defaultText) {
if (text == null) {
return defaultText;
- } else if (text_context != null) {
- return trc(text_context, fixPresetString(text));
+ } else if (textContext != null) {
+ return trc(textContext, fixPresetString(text));
} else {
return tr(fixPresetString(text));
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java
index 8665fca..f4a0601 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.awt.MouseInfo;
import java.awt.Point;
+import java.awt.PointerInfo;
import java.awt.event.ActionEvent;
import java.io.Serializable;
import java.util.ArrayList;
@@ -93,8 +94,11 @@ public class TaggingPresetMenu extends TaggingPreset {
for (Component c : menu.getMenuComponents()) {
pm.add(copyMenuComponent(c));
}
- Point p = MouseInfo.getPointerInfo().getLocation();
- pm.show(Main.parent, p.x-Main.parent.getX(), p.y-Main.parent.getY());
+ PointerInfo pointerInfo = MouseInfo.getPointerInfo();
+ if (pointerInfo != null) {
+ Point p = pointerInfo.getLocation();
+ pm.show(Main.parent, p.x-Main.parent.getX(), p.y-Main.parent.getY());
+ }
}
}
@@ -122,37 +126,30 @@ public class TaggingPresetMenu extends TaggingPreset {
if (item instanceof JMenuItem) {
sortarray.add((JMenuItem) item);
if (i == items.length-1) {
- Collections.sort(sortarray, comp);
- int pos = 0;
- for (JMenuItem menuItem : sortarray) {
- int oldPos;
- if (lastSeparator == 0) {
- oldPos = pos;
- } else {
- oldPos = pos+lastSeparator+1;
- }
- menu.add(menuItem, oldPos);
- pos++;
- }
+ handleMenuItem(menu, comp, sortarray, lastSeparator);
sortarray = new ArrayList<>();
lastSeparator = 0;
}
} else if (item instanceof JSeparator) {
- Collections.sort(sortarray, comp);
- int pos = 0;
- for (JMenuItem menuItem : sortarray) {
- int oldPos;
- if (lastSeparator == 0) {
- oldPos = pos;
- } else {
- oldPos = pos+lastSeparator+1;
- }
- menu.add(menuItem, oldPos);
- pos++;
- }
+ handleMenuItem(menu, comp, sortarray, lastSeparator);
sortarray = new ArrayList<>();
lastSeparator = i;
}
}
}
+
+ private static void handleMenuItem(JMenu menu, PresetTextComparator comp, List<JMenuItem> sortarray, int lastSeparator) {
+ Collections.sort(sortarray, comp);
+ int pos = 0;
+ for (JMenuItem menuItem : sortarray) {
+ int oldPos;
+ if (lastSeparator == 0) {
+ oldPos = pos;
+ } else {
+ oldPos = pos+lastSeparator+1;
+ }
+ menu.add(menuItem, oldPos);
+ pos++;
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
index af9a10d..231359d 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
@@ -2,7 +2,7 @@
package org.openstreetmap.josm.gui.tagging.presets;
import java.util.Collection;
-import java.util.Collections;
+import java.util.EnumSet;
import java.util.LinkedList;
import java.util.List;
@@ -54,7 +54,7 @@ public final class TaggingPresetNameTemplateList implements TaggingPresetListene
public TaggingPreset findPresetTemplate(OsmPrimitive primitive) {
synchronized (this) {
for (TaggingPreset t : presetsWithPattern) {
- Collection<TaggingPresetType> type = Collections.singleton(TaggingPresetType.forPrimitive(primitive));
+ Collection<TaggingPresetType> type = EnumSet.of(TaggingPresetType.forPrimitive(primitive));
if (t.typeMatches(type)) {
if (t.nameTemplateFilter != null) {
if (t.nameTemplateFilter.match(primitive))
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
index 4e03af6..893c9b1 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
@@ -387,10 +387,10 @@ public abstract class ComboMultiSelect extends KeyedItem {
label.setToolTipText(getKeyTooltipText());
p.add(label, GBC.std().insets(0, 0, 10, 0));
addToPanelAnchor(p, default_, presetInitiallyMatches);
+ label.setLabelFor(component);
component.setToolTipText(getKeyTooltipText());
return true;
-
}
private void initListEntries() {
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 2c87ad2..a9cddc2 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
@@ -51,10 +51,10 @@ public class Roles extends TaggingPresetItem {
throw new SAXException(tr("Unknown requisite: {0}", str));
}
- public void setMember_expression(String member_expression) throws SAXException {
+ public void setMember_expression(String memberExpression) throws SAXException {
try {
final SearchAction.SearchSetting searchSetting = new SearchAction.SearchSetting();
- searchSetting.text = member_expression;
+ searchSetting.text = memberExpression;
searchSetting.caseSensitive = true;
searchSetting.regexSearch = true;
this.memberExpression = SearchCompiler.compile(searchSetting);
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
index 76b5939..0ce5703 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
@@ -179,6 +179,7 @@ public class Text extends KeyedItem {
}
final JLabel label = new JLabel(locale_text + ':');
label.setToolTipText(getKeyTooltipText());
+ label.setLabelFor(value);
p.add(label, GBC.std().insets(0, 0, 10, 0));
p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
value.setToolTipText(getKeyTooltipText());
diff --git a/src/org/openstreetmap/josm/gui/util/GuiHelper.java b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
index f45d549..c38837d 100644
--- a/src/org/openstreetmap/josm/gui/util/GuiHelper.java
+++ b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
@@ -11,6 +11,7 @@ import java.awt.Dialog;
import java.awt.Dimension;
import java.awt.DisplayMode;
import java.awt.Font;
+import java.awt.Frame;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
@@ -23,6 +24,8 @@ import java.awt.event.ActionListener;
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.awt.image.FilteredImageSource;
import java.lang.reflect.InvocationTargetException;
import java.util.Enumeration;
@@ -42,6 +45,7 @@ import javax.swing.JScrollPane;
import javax.swing.Scrollable;
import javax.swing.SwingUtilities;
import javax.swing.Timer;
+import javax.swing.ToolTipManager;
import javax.swing.UIManager;
import javax.swing.plaf.FontUIResource;
@@ -474,4 +478,52 @@ public final class GuiHelper {
public static Window getWindowAncestorFor(EventObject e) {
return e != null && e.getSource() instanceof Component ? SwingUtilities.getWindowAncestor((Component) e.getSource()) : null;
}
+
+ /**
+ * Extends tooltip dismiss delay to a default value of 1 minute for the given component.
+ * @param c component
+ * @since 10024
+ */
+ public static void extendTooltipDelay(Component c) {
+ extendTooltipDelay(c, 60000);
+ }
+
+ /**
+ * Extends tooltip dismiss delay to the specified value for the given component.
+ * @param c component
+ * @param delay tooltip dismiss delay in milliseconds
+ * @see <a href="http://stackoverflow.com/a/6517902/2257172">http://stackoverflow.com/a/6517902/2257172</a>
+ * @since 10024
+ */
+ public static void extendTooltipDelay(Component c, final int delay) {
+ final int defaultDismissTimeout = ToolTipManager.sharedInstance().getDismissDelay();
+ c.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseEntered(MouseEvent me) {
+ ToolTipManager.sharedInstance().setDismissDelay(delay);
+ }
+
+ @Override
+ public void mouseExited(MouseEvent me) {
+ ToolTipManager.sharedInstance().setDismissDelay(defaultDismissTimeout);
+ }
+ });
+ }
+
+ /**
+ * Returns the specified component's <code>Frame</code> without throwing exception in headless mode.
+ *
+ * @param parentComponent the <code>Component</code> to check for a <code>Frame</code>
+ * @return the <code>Frame</code> that contains the component, or <code>getRootFrame</code>
+ * if the component is <code>null</code>, or does not have a valid <code>Frame</code> parent
+ * @see JOptionPane#getFrameForComponent
+ * @see GraphicsEnvironment#isHeadless
+ * @since 10035
+ */
+ public static Frame getFrameForComponent(Component parentComponent) {
+ if (parentComponent == null && GraphicsEnvironment.isHeadless()) {
+ return null;
+ }
+ return JOptionPane.getFrameForComponent(parentComponent);
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java b/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
index 075466d..4ed3dbc 100644
--- a/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
+++ b/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
@@ -17,8 +17,6 @@ class ComboBoxHistory extends DefaultComboBoxModel<AutoCompletionListItem> imple
private final int maxSize;
- private final transient List<HistoryChangedListener> listeners = new ArrayList<>();
-
/**
* Constructs a {@code ComboBoxHistory} keeping track of {@code maxSize} items
* @param size the history size
@@ -62,8 +60,6 @@ class ComboBoxHistory extends DefaultComboBoxModel<AutoCompletionListItem> imple
// set selected item to the one just added
setSelectedItem(o);
-
- fireHistoryChanged();
}
@Override
@@ -115,18 +111,4 @@ class ComboBoxHistory extends DefaultComboBoxModel<AutoCompletionListItem> imple
}
return list;
}
-
- public void addHistoryChangedListener(HistoryChangedListener l) {
- listeners.add(l);
- }
-
- public void removeHistoryChangedListener(HistoryChangedListener l) {
- listeners.remove(l);
- }
-
- private void fireHistoryChanged() {
- for (HistoryChangedListener l : listeners) {
- l.historyChanged(asStringList());
- }
- }
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java b/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java
index 18a0f88..8812b43 100644
--- a/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java
+++ b/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java
@@ -44,7 +44,7 @@ public final class CompileSearchTextDecorator implements DocumentListener {
} catch (SearchCompiler.ParseError ex) {
textComponent.setBackground(new Color(255, 224, 224));
textComponent.setToolTipText(ex.getMessage());
- filter = new SearchCompiler.Always();
+ filter = SearchCompiler.Always.INSTANCE;
}
textComponent.firePropertyChange("filter", 0, 1);
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/DefaultTextComponentValidator.java b/src/org/openstreetmap/josm/gui/widgets/DefaultTextComponentValidator.java
new file mode 100644
index 0000000..fa824e8
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/DefaultTextComponentValidator.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import javax.swing.text.JTextComponent;
+
+/**
+ * Default text component validator that only checks that an input field is not empty.
+ * @since 10073
+ */
+public class DefaultTextComponentValidator extends AbstractTextComponentValidator {
+
+ private final String validFeedback;
+ private final String invalidFeedback;
+
+ /**
+ * Constructs a new {@code DefaultTextComponentValidator}.
+ * @param tc he text component. Must not be null.
+ * @param validFeedback text displayed for valid feedback
+ * @param invalidFeedback text displayed for invalid feedback
+ */
+ public DefaultTextComponentValidator(JTextComponent tc, String validFeedback, String invalidFeedback) {
+ super(tc);
+ this.validFeedback = validFeedback;
+ this.invalidFeedback = invalidFeedback;
+ }
+
+ @Override
+ public boolean isValid() {
+ return !getComponent().getText().trim().isEmpty();
+ }
+
+ @Override
+ public void validate() {
+ if (isValid()) {
+ feedbackValid(validFeedback);
+ } else {
+ feedbackInvalid(invalidFeedback);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java b/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
index 08e5af8..c4d29df 100644
--- a/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
+++ b/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
@@ -209,7 +209,7 @@ public class FileChooserManager {
* @param value The string that goes in the dialog window's title bar
* @return this
*/
- public FileChooserManager title(String value) {
+ public FileChooserManager title(String value) {
title = value;
return this;
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java b/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
index 73a1586..6114ded 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
@@ -40,7 +40,7 @@ public class JosmImageView extends ImageView {
* @throws SecurityException see {@link Class#getDeclaredField} for details
* @throws NoSuchFieldException see {@link Class#getDeclaredField} for details
*/
- public JosmImageView(Element elem) throws NoSuchFieldException, SecurityException {
+ public JosmImageView(Element elem) throws NoSuchFieldException {
super(elem);
imageField = ImageView.class.getDeclaredField("image");
stateField = ImageView.class.getDeclaredField("state");
@@ -55,11 +55,11 @@ public class JosmImageView extends ImageView {
/**
* Makes sure the necessary properties and image is loaded.
*/
- private void sync() {
+ private void doSync() {
try {
int s = (int) stateField.get(this);
if ((s & RELOAD_IMAGE_FLAG) != 0) {
- refreshImage();
+ doRefreshImage();
}
s = (int) stateField.get(this);
if ((s & RELOAD_FLAG) != 0) {
@@ -84,8 +84,7 @@ public class JosmImageView extends ImageView {
* @throws NoSuchMethodException see {@link Class#getDeclaredMethod} for details
* @throws SecurityException see {@link Class#getDeclaredMethod} for details
*/
- private void refreshImage() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException,
- NoSuchMethodException, SecurityException {
+ private void doRefreshImage() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
synchronized (this) {
// clear out width/height/reloadimage flag and set loading flag
stateField.set(this, ((int) stateField.get(this) | LOADING_FLAG | RELOAD_IMAGE_FLAG | WIDTH_FLAG |
@@ -98,7 +97,7 @@ public class JosmImageView extends ImageView {
try {
// Load the image
- loadImage();
+ doLoadImage();
// And update the size params
Method updateImageSize = ImageView.class.getDeclaredMethod("updateImageSize");
@@ -121,8 +120,7 @@ public class JosmImageView extends ImageView {
* @throws NoSuchMethodException see {@link Class#getDeclaredMethod} for details
* @throws SecurityException see {@link Class#getDeclaredMethod} for details
*/
- private void loadImage() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException,
- NoSuchMethodException, SecurityException {
+ private void doLoadImage() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
URL src = getImageURL();
if (src != null) {
String urlStr = src.toExternalForm();
@@ -141,31 +139,31 @@ public class JosmImageView extends ImageView {
@Override
public Image getImage() {
- sync();
+ doSync();
return super.getImage();
}
@Override
public AttributeSet getAttributes() {
- sync();
+ doSync();
return super.getAttributes();
}
@Override
public void paint(Graphics g, Shape a) {
- sync();
+ doSync();
super.paint(g, a);
}
@Override
public float getPreferredSpan(int axis) {
- sync();
+ doSync();
return super.getPreferredSpan(axis);
}
@Override
public void setSize(float width, float height) {
- sync();
+ doSync();
super.setSize(width, height);
}
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmTable.java b/src/org/openstreetmap/josm/gui/widgets/JosmTable.java
index e826f24..f85eb8c 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmTable.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmTable.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
+import java.awt.Container;
+import java.awt.Dimension;
import java.awt.KeyboardFocusManager;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -8,6 +10,7 @@ import java.awt.event.KeyEvent;
import javax.swing.AbstractAction;
import javax.swing.JComponent;
import javax.swing.JTable;
+import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
import javax.swing.table.TableColumnModel;
@@ -104,4 +107,17 @@ public abstract class JosmTable extends JTable {
}
}
}
+
+ protected Dimension getPreferredFullWidthSize() {
+ Container c = getParent();
+ while (c != null && !(c instanceof JViewport)) {
+ c = c.getParent();
+ }
+ if (c != null) {
+ Dimension d = super.getPreferredSize();
+ d.width = c.getSize().width;
+ return d;
+ }
+ return super.getPreferredSize();
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
index f00d1a0..bbf547a 100644
--- a/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
+++ b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
@@ -344,7 +344,7 @@ public class MultiSplitLayout implements LayoutManager {
return r;
}
- private void minimizeSplitBounds(Split split, Rectangle bounds) {
+ private static void minimizeSplitBounds(Split split, Rectangle bounds) {
Rectangle splitBounds = new Rectangle(bounds.x, bounds.y, 0, 0);
List<Node> splitChildren = split.getChildren();
Node lastChild = splitChildren.get(splitChildren.size() - 1);
@@ -709,7 +709,7 @@ public class MultiSplitLayout implements LayoutManager {
}
}
- private void throwInvalidLayout(String msg, Node node) {
+ private static void throwInvalidLayout(String msg, Node node) {
throw new InvalidLayoutException(msg, node);
}
@@ -758,7 +758,7 @@ public class MultiSplitLayout implements LayoutManager {
layout2(getModel(), bounds);
}
- private Divider dividerAt(Node root, int x, int y) {
+ private static Divider dividerAt(Node root, int x, int y) {
if (root instanceof Divider) {
Divider divider = (Divider) root;
return divider.getBounds().contains(x, y) ? divider : null;
@@ -784,7 +784,7 @@ public class MultiSplitLayout implements LayoutManager {
return dividerAt(getModel(), x, y);
}
- private boolean nodeOverlapsRectangle(Node node, Rectangle r2) {
+ private static boolean nodeOverlapsRectangle(Node node, Rectangle r2) {
Rectangle r1 = node.getBounds();
return
(r1.x <= (r2.x + r2.width)) && ((r1.x + r1.width) >= r2.x) &&
@@ -1096,14 +1096,13 @@ public class MultiSplitLayout implements LayoutManager {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("MultiSplitLayout.Leaf");
- sb.append(" \"")
+ return new StringBuilder("MultiSplitLayout.Leaf \"")
.append(getName())
.append("\" weight=")
.append(getWeight())
.append(' ')
- .append(getBounds());
- return sb.toString();
+ .append(getBounds())
+ .toString();
}
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java b/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
index 01118d3..ded1af4 100644
--- a/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
+++ b/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java
@@ -98,8 +98,9 @@ public class NativeFileChooser extends AbstractFileChooser {
@Override
public void setFileFilter(final FileFilter cff) {
FilenameFilter filter = new FilenameFilter() {
- public boolean accept(File Directory, String fileName) {
- return cff.accept(new File(Directory.getAbsolutePath() + fileName));
+ @Override
+ public boolean accept(File directory, String fileName) {
+ return cff.accept(new File(directory.getAbsolutePath() + fileName));
}
};
fileDialog.setFilenameFilter(filter);
diff --git a/src/org/openstreetmap/josm/io/CachedFile.java b/src/org/openstreetmap/josm/io/CachedFile.java
index 5139cf5..7845e17 100644
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
@@ -212,6 +213,24 @@ public class CachedFile implements Closeable {
}
/**
+ * Get the full content of the requested resource as a byte array.
+ * @return the full content of the requested resource as byte array
+ * @throws IOException in case of an I/O error
+ */
+ public byte[] getByteContent() throws IOException {
+ try (InputStream is = getInputStream()) {
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ int nRead;
+ byte[] data = new byte[8192];
+ while ((nRead = is.read(data, 0, data.length)) != -1) {
+ buffer.write(data, 0, nRead);
+ }
+ buffer.flush();
+ return buffer.toByteArray();
+ }
+ }
+
+ /**
* Returns {@link #getInputStream()} wrapped in a buffered reader.
* <p>
* Detects Unicode charset in use utilizing {@link UTFInputStreamReader}.
diff --git a/src/org/openstreetmap/josm/io/CertificateAmendment.java b/src/org/openstreetmap/josm/io/CertificateAmendment.java
new file mode 100644
index 0000000..192c91b
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/CertificateAmendment.java
@@ -0,0 +1,159 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.PKIXParameters;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
+import java.util.Objects;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Class to add missing root certificates to the list of trusted certificates
+ * for TLS connections.
+ *
+ * The added certificates are deemed trustworthy by the main web browsers and
+ * operating systems, but not included in some distributions of Java.
+ *
+ * The certificates are added in-memory at each start, nothing is written to disk.
+ * @since 9995
+ */
+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"
+ };
+
+ private static final String[] SHA_HASHES = {
+ "0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739",
+ "c766a9bef2d4071c863a31aa4920e813b2d198608cb7b7cfe21143b836df09ea"
+ };
+
+ private CertificateAmendment() {
+ // Hide default constructor for utility classes
+ }
+
+ /**
+ * Add missing root certificates to the list of trusted certificates for TLS connections.
+ * @throws IOException if an I/O error occurs
+ */
+ public static void addMissingCertificates() throws IOException {
+ if (!Main.pref.getBoolean("tls.add-missing-certificates", true))
+ return;
+ KeyStore keyStore;
+ try {
+ keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+ } catch (KeyStoreException ex) {
+ throw new IOException(ex);
+ }
+ Path cacertsPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
+ try (InputStream is = Files.newInputStream(cacertsPath)) {
+ keyStore.load(is, "changeit".toCharArray());
+ } catch (NoSuchAlgorithmException ex) {
+ throw new RuntimeException(ex);
+ } catch (CertificateException ex) {
+ throw new IOException(ex);
+ }
+
+ CertificateFactory cf;
+ try {
+ cf = CertificateFactory.getInstance("X.509");
+ } catch (CertificateException ex) {
+ throw new RuntimeException(ex);
+ }
+ boolean certificateAdded = false;
+ for (int i = 0; i < CERT_AMEND.length; i++) {
+ CachedFile certCF = new CachedFile(CERT_AMEND[i]);
+ byte[] certBytes = certCF.getByteContent();
+ ByteArrayInputStream certIS = new ByteArrayInputStream(certBytes);
+ X509Certificate cert;
+
+ try {
+ 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 RuntimeException(tr("Error adding certificate {0} - certificate fingerprint mismatch. Expected {1}, was {2}",
+ CERT_AMEND[i],
+ SHA_HASHES[i],
+ sha1
+ ));
+ }
+ } catch (CertificateException ex) {
+ throw new IOException(ex);
+ } catch (NoSuchAlgorithmException ex) {
+ throw new RuntimeException(ex);
+ }
+ 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();
+ try {
+ keyStore.setCertificateEntry(alias, cert);
+ } catch (KeyStoreException ex) {
+ throw new AssertionError(ex);
+ }
+ certificateAdded = true;
+ }
+ }
+
+ if (certificateAdded) {
+ try {
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ tmf.init(keyStore);
+ SSLContext sslContext = SSLContext.getInstance("TLS");
+ sslContext.init(null, tmf.getTrustManagers(), null);
+ SSLContext.setDefault(sslContext);
+ } catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+
+ /**
+ * Check if the certificate is missing and needs to be added to the keystore.
+ * @param keyStore the keystore
+ * @param crt the certificate
+ * @return true, if the certificate is not contained in the keystore
+ */
+ private static boolean certificateIsMissing(KeyStore keyStore, X509Certificate crt) {
+ PKIXParameters params;
+ try {
+ params = new PKIXParameters(keyStore);
+ } catch (KeyStoreException ex) {
+ throw new AssertionError(ex);
+ } catch (InvalidAlgorithmParameterException ex) {
+ throw new RuntimeException(ex);
+ }
+ String id = crt.getSubjectX500Principal().getName();
+ for (TrustAnchor ta : params.getTrustAnchors()) {
+ X509Certificate cert = ta.getTrustedCert();
+ if (Objects.equals(id, cert.getSubjectX500Principal().getName()))
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/ChangesetQuery.java b/src/org/openstreetmap/josm/io/ChangesetQuery.java
index 7b651d9..b1c4c35 100644
--- a/src/org/openstreetmap/josm/io/ChangesetQuery.java
+++ b/src/org/openstreetmap/josm/io/ChangesetQuery.java
@@ -15,6 +15,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -24,6 +25,11 @@ import org.openstreetmap.josm.tools.date.DateUtils;
public class ChangesetQuery {
/**
+ * Maximum number of changesets returned by the OSM API call "/changesets?"
+ */
+ public static int MAX_CHANGESETS_NUMBER = 100;
+
+ /**
* Replies a changeset query object from the query part of a OSM API URL for querying changesets.
*
* @param query the query part
@@ -233,6 +239,9 @@ public class ChangesetQuery {
*/
public ChangesetQuery forChangesetIds(Collection<Long> changesetIds) {
CheckParameterUtil.ensureParameterNotNull(changesetIds, "changesetIds");
+ if (changesetIds.size() > MAX_CHANGESETS_NUMBER) {
+ Main.warn("Changeset query built with more than " + MAX_CHANGESETS_NUMBER + " changeset ids (" + changesetIds.size() + ")");
+ }
this.changesetIds = changesetIds;
return this;
}
diff --git a/src/org/openstreetmap/josm/io/GpxReader.java b/src/org/openstreetmap/josm/io/GpxReader.java
index 73372e2..dbbdefb 100644
--- a/src/org/openstreetmap/josm/io/GpxReader.java
+++ b/src/org/openstreetmap/josm/io/GpxReader.java
@@ -409,7 +409,7 @@ public class GpxReader implements GpxConstants {
try {
currentWayPoint.put(localName, Float.valueOf(accumulator.toString()));
} catch (Exception e) {
- currentWayPoint.put(localName, new Float(0));
+ currentWayPoint.put(localName, 0f);
}
break;
case "time":
diff --git a/src/org/openstreetmap/josm/io/NMEAImporter.java b/src/org/openstreetmap/josm/io/NMEAImporter.java
index 5793aed..7f23c7c 100644
--- a/src/org/openstreetmap/josm/io/NMEAImporter.java
+++ b/src/org/openstreetmap/josm/io/NMEAImporter.java
@@ -66,7 +66,7 @@ public class NMEAImporter extends FileImporter {
}
}
- private void showNmeaInfobox(boolean success, NmeaReader r) {
+ private static void showNmeaInfobox(boolean success, NmeaReader r) {
final StringBuilder msg = new StringBuilder(160).append("<html>");
msg.append(tr("Coordinates imported: {0}", r.getNumberOfCoordinates())).append("<br>")
.append(tr("Malformed sentences: {0}", r.getParserMalformed())).append("<br>")
diff --git a/src/org/openstreetmap/josm/io/NmeaReader.java b/src/org/openstreetmap/josm/io/NmeaReader.java
index ae85c39..62179e6 100644
--- a/src/org/openstreetmap/josm/io/NmeaReader.java
+++ b/src/org/openstreetmap/josm/io/NmeaReader.java
@@ -172,12 +172,12 @@ public class NmeaReader {
try (BufferedReader rd = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8))) {
StringBuilder sb = new StringBuilder(1024);
- int loopstart_char = rd.read();
+ int loopstartChar = rd.read();
ps = new NMEAParserState();
- if (loopstart_char == -1)
+ if (loopstartChar == -1)
//TODO tell user about the problem?
return;
- sb.append((char) loopstart_char);
+ sb.append((char) loopstartChar);
ps.pDate = "010100"; // TODO date problem
while (true) {
// don't load unparsable files completely to memory
diff --git a/src/org/openstreetmap/josm/io/NoteReader.java b/src/org/openstreetmap/josm/io/NoteReader.java
index 0624d9b..5d56968 100644
--- a/src/org/openstreetmap/josm/io/NoteReader.java
+++ b/src/org/openstreetmap/josm/io/NoteReader.java
@@ -8,6 +8,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import javax.xml.parsers.ParserConfigurationException;
@@ -100,9 +101,9 @@ public class NoteReader {
thisNote.setId(Long.parseLong(attrs.getValue("id")));
String closedTimeStr = attrs.getValue("closed_at");
if (closedTimeStr == null) { //no closed_at means the note is still open
- thisNote.setState(Note.State.open);
+ thisNote.setState(Note.State.OPEN);
} else {
- thisNote.setState(Note.State.closed);
+ thisNote.setState(Note.State.CLOSED);
thisNote.setClosedAt(DateUtils.fromString(closedTimeStr));
}
thisNote.setCreatedAt(DateUtils.fromString(attrs.getValue("created_at")));
@@ -115,7 +116,7 @@ public class NoteReader {
commentUid = Long.parseLong(uidStr);
}
commentUsername = attrs.getValue("user");
- noteAction = Action.valueOf(attrs.getValue("action"));
+ noteAction = Action.valueOf(attrs.getValue("action").toUpperCase(Locale.ENGLISH));
commentCreateDate = DateUtils.fromString(attrs.getValue("timestamp"));
String isNew = attrs.getValue("is_new");
if (isNew == null) {
@@ -160,7 +161,7 @@ public class NoteReader {
thisNote.setId(Long.parseLong(buffer.toString()));
break;
case "status":
- thisNote.setState(Note.State.valueOf(buffer.toString()));
+ thisNote.setState(Note.State.valueOf(buffer.toString().toUpperCase(Locale.ENGLISH)));
break;
case "date_created":
thisNote.setCreatedAt(DateUtils.fromString(buffer.toString()));
@@ -182,7 +183,7 @@ public class NoteReader {
buffer.setLength(0);
break;
case "action":
- noteAction = Action.valueOf(buffer.toString());
+ noteAction = Action.valueOf(buffer.toString().toUpperCase(Locale.ENGLISH));
break;
case "note": //nothing to do for comment or note, already handled above
case "comment":
diff --git a/src/org/openstreetmap/josm/io/OsmApi.java b/src/org/openstreetmap/josm/io/OsmApi.java
index a0b5ff5..9119c18 100644
--- a/src/org/openstreetmap/josm/io/OsmApi.java
+++ b/src/org/openstreetmap/josm/io/OsmApi.java
@@ -280,7 +280,7 @@ public class OsmApi extends OsmConnection {
* @param addBody true to generate the full XML, false to only generate the encapsulating tag
* @return XML string
*/
- private String toXml(IPrimitive o, boolean addBody) {
+ protected final String toXml(IPrimitive o, boolean addBody) {
StringWriter swriter = new StringWriter();
try (OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(swriter), true, version)) {
swriter.getBuffer().setLength(0);
@@ -301,7 +301,7 @@ public class OsmApi extends OsmConnection {
* @param s the changeset
* @return XML string
*/
- private String toXml(Changeset s) {
+ protected final String toXml(Changeset s) {
StringWriter swriter = new StringWriter();
try (OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(swriter), true, version)) {
swriter.getBuffer().setLength(0);
@@ -858,13 +858,13 @@ public class OsmApi extends OsmConnection {
* @return the resulting Note
* @throws OsmTransferException if the API response cannot be parsed
*/
- private Note parseSingleNote(String xml) throws OsmTransferException {
+ private static Note parseSingleNote(String xml) throws OsmTransferException {
try {
List<Note> newNotes = new NoteReader(xml).parse();
if (newNotes.size() == 1) {
return newNotes.get(0);
}
- //Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note
+ // Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note
throw new OsmTransferException(tr("Note upload failed"));
} catch (SAXException | IOException e) {
Main.error(e, true);
diff --git a/src/org/openstreetmap/josm/io/OsmChangesetParser.java b/src/org/openstreetmap/josm/io/OsmChangesetParser.java
index 8959b66..6ea669b 100644
--- a/src/org/openstreetmap/josm/io/OsmChangesetParser.java
+++ b/src/org/openstreetmap/josm/io/OsmChangesetParser.java
@@ -118,22 +118,22 @@ public final class OsmChangesetParser {
}
// -- min_lon and min_lat
- String min_lon = atts.getValue("min_lon");
- String min_lat = atts.getValue("min_lat");
- String max_lon = atts.getValue("max_lon");
- String max_lat = atts.getValue("max_lat");
- if (min_lon != null && min_lat != null && max_lon != null && max_lat != null) {
+ String minLonStr = atts.getValue("min_lon");
+ String minLatStr = atts.getValue("min_lat");
+ String maxLonStr = atts.getValue("max_lon");
+ String maxLatStr = atts.getValue("max_lat");
+ if (minLonStr != null && minLatStr != null && maxLonStr != null && maxLatStr != null) {
double minLon = 0;
try {
- minLon = Double.parseDouble(min_lon);
+ minLon = Double.parseDouble(minLonStr);
} catch (NumberFormatException e) {
- throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lon", min_lon));
+ throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lon", minLonStr));
}
double minLat = 0;
try {
- minLat = Double.parseDouble(min_lat);
+ minLat = Double.parseDouble(minLatStr);
} catch (NumberFormatException e) {
- throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lat", min_lat));
+ throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lat", minLatStr));
}
current.setMin(new LatLon(minLat, minLon));
@@ -141,15 +141,15 @@ public final class OsmChangesetParser {
double maxLon = 0;
try {
- maxLon = Double.parseDouble(max_lon);
+ maxLon = Double.parseDouble(maxLonStr);
} catch (NumberFormatException e) {
- throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lon", max_lon));
+ throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lon", maxLonStr));
}
double maxLat = 0;
try {
- maxLat = Double.parseDouble(max_lat);
+ maxLat = Double.parseDouble(maxLatStr);
} catch (NumberFormatException e) {
- throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", max_lat));
+ throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", maxLatStr));
}
current.setMax(new LatLon(maxLon, maxLat));
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
index 7c9186b..c9ca53c 100644
--- a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
@@ -72,7 +72,7 @@ public class OsmServerChangesetReader extends OsmServerReader {
sb.append("changesets?").append(query.getQueryString());
try (InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true))) {
if (in == null)
- return null;
+ return Collections.emptyList();
monitor.indeterminateSubTask(tr("Downloading changesets ..."));
result = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
} catch (IOException e) {
diff --git a/src/org/openstreetmap/josm/io/OsmServerLocationReader.java b/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
index ce82ff9..7504b62 100644
--- a/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
@@ -32,7 +32,7 @@ public class OsmServerLocationReader extends OsmServerReader {
this.url = url;
}
- protected abstract class Parser<T> {
+ protected abstract static class Parser<T> {
protected final ProgressMonitor progressMonitor;
protected final Compression compression;
protected InputStream in;
diff --git a/src/org/openstreetmap/josm/io/OsmServerWriter.java b/src/org/openstreetmap/josm/io/OsmServerWriter.java
index c0c662e..e19a6ee 100644
--- a/src/org/openstreetmap/josm/io/OsmServerWriter.java
+++ b/src/org/openstreetmap/josm/io/OsmServerWriter.java
@@ -60,22 +60,22 @@ public class OsmServerWriter {
private long uploadStartTime;
- public String timeLeft(int progress, int list_size) {
+ public String timeLeft(int progress, int listSize) {
long now = System.currentTimeMillis();
long elapsed = now - uploadStartTime;
if (elapsed == 0) {
elapsed = 1;
}
- double uploads_per_ms = (double) progress / elapsed;
- double uploads_left = list_size - progress;
- long ms_left = (long) (uploads_left / uploads_per_ms);
- long minutes_left = ms_left / MSECS_PER_MINUTE;
- long seconds_left = (ms_left / MSECS_PER_SECOND) % SECONDS_PER_MINUTE;
- StringBuilder time_left_str = new StringBuilder().append(minutes_left).append(':');
- if (seconds_left < 10) {
- time_left_str.append('0');
+ double uploadsPerMs = (double) progress / elapsed;
+ double uploadsLeft = listSize - progress;
+ long msLeft = (long) (uploadsLeft / uploadsPerMs);
+ long minutesLeft = msLeft / MSECS_PER_MINUTE;
+ long secondsLeft = (msLeft / MSECS_PER_SECOND) % SECONDS_PER_MINUTE;
+ StringBuilder timeLeftStr = new StringBuilder().append(minutesLeft).append(':');
+ if (secondsLeft < 10) {
+ timeLeftStr.append('0');
}
- return time_left_str.append(seconds_left).toString();
+ return timeLeftStr.append(secondsLeft).toString();
}
/**
@@ -93,7 +93,7 @@ public class OsmServerWriter {
uploadStartTime = System.currentTimeMillis();
for (OsmPrimitive osm : primitives) {
int progress = progressMonitor.getTicks();
- String time_left_str = timeLeft(progress, primitives.size());
+ String timeLeftStr = timeLeft(progress, primitives.size());
String msg = "";
switch(OsmPrimitiveType.from(osm)) {
case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
@@ -105,7 +105,7 @@ public class OsmServerWriter {
Math.round(100.0*progress/primitives.size()),
progress,
primitives.size(),
- time_left_str,
+ timeLeftStr,
osm.getName() == null ? osm.getId() : osm.getName(),
osm.getId()));
makeApiRequest(osm, progressMonitor);
diff --git a/src/org/openstreetmap/josm/io/OsmWriter.java b/src/org/openstreetmap/josm/io/OsmWriter.java
index 89604a4..074c886 100644
--- a/src/org/openstreetmap/josm/io/OsmWriter.java
+++ b/src/org/openstreetmap/josm/io/OsmWriter.java
@@ -238,10 +238,9 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
}
public void visit(Changeset cs) {
- out.print(" <changeset ");
- out.print(" id='"+cs.getId()+'\'');
+ out.print(" <changeset id='"+cs.getId()+'\'');
if (cs.getUser() != null) {
- out.print(" user='"+cs.getUser().getName() +'\'');
+ out.print(" user='"+ XmlWriter.encode(cs.getUser().getName()) +'\'');
out.print(" uid='"+cs.getUser().getId() +'\'');
}
if (cs.getCreatedAt() != null) {
diff --git a/src/org/openstreetmap/josm/io/StreamProgressUpdater.java b/src/org/openstreetmap/josm/io/StreamProgressUpdater.java
index af480d1..c4aae37 100644
--- a/src/org/openstreetmap/josm/io/StreamProgressUpdater.java
+++ b/src/org/openstreetmap/josm/io/StreamProgressUpdater.java
@@ -26,8 +26,8 @@ final class StreamProgressUpdater {
}
private void initProgressMonitor() {
- progressMonitor.beginTask(taskTitle);
if (size > 0) {
+ progressMonitor.subTask(taskTitle);
progressMonitor.setTicksCount((int) size);
} else {
progressMonitor.indeterminateSubTask(taskTitle);
diff --git a/src/org/openstreetmap/josm/io/package-info.java b/src/org/openstreetmap/josm/io/package-info.java
new file mode 100644
index 0000000..5467f2e
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM input/output support.
+ */
+package org.openstreetmap.josm.io;
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
index 867a5b2..ede96ea 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
@@ -172,7 +172,7 @@ public class RemoteControlHttpsServer extends Thread {
ext.set(BasicConstraintsExtension.NAME, new BasicConstraintsExtension(Boolean.TRUE, false, 0));
// Critical: only allow TLS ("serverAuth" = 1.3.6.1.5.5.7.3.1)
ext.set(ExtendedKeyUsageExtension.NAME, new ExtendedKeyUsageExtension(Boolean.TRUE,
- new Vector<ObjectIdentifier>(Arrays.asList(new ObjectIdentifier("1.3.6.1.5.5.7.3.1")))));
+ new Vector<>(Arrays.asList(new ObjectIdentifier("1.3.6.1.5.5.7.3.1")))));
if (san != null) {
int colonpos;
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
index 5103ba3..d09c2c7 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
@@ -176,8 +176,9 @@ public class RequestProcessor extends Thread {
String command = questionPos < 0 ? url : url.substring(0, questionPos);
Map<String, String> headers = new HashMap<>();
- int k = 0, MAX_HEADERS = 20;
- while (k < MAX_HEADERS) {
+ int k = 0;
+ int maxHeaders = 20;
+ while (k < maxHeaders) {
get = in.readLine();
if (get == null) break;
k++;
@@ -265,7 +266,7 @@ public class RequestProcessor extends Thread {
* @throws IOException
* If the error can not be written
*/
- private void sendError(Writer out) throws IOException {
+ private static void sendError(Writer out) throws IOException {
sendHeader(out, "500 Internal Server Error", "text/html", true);
out.write("<HTML>\r\n");
out.write("<HEAD><TITLE>Internal Error</TITLE>\r\n");
@@ -284,7 +285,7 @@ public class RequestProcessor extends Thread {
* @throws IOException
* If the error can not be written
*/
- private void sendNotImplemented(Writer out) throws IOException {
+ private static void sendNotImplemented(Writer out) throws IOException {
sendHeader(out, "501 Not Implemented", "text/html", true);
out.write("<HTML>\r\n");
out.write("<HEAD><TITLE>Not Implemented</TITLE>\r\n");
@@ -305,7 +306,7 @@ public class RequestProcessor extends Thread {
* @throws IOException
* If the error can not be written
*/
- private void sendForbidden(Writer out, String help) throws IOException {
+ private static void sendForbidden(Writer out, String help) throws IOException {
sendHeader(out, "403 Forbidden", "text/html", true);
out.write("<HTML>\r\n");
out.write("<HEAD><TITLE>Forbidden</TITLE>\r\n");
@@ -329,7 +330,7 @@ public class RequestProcessor extends Thread {
* @throws IOException
* If the error can not be written
*/
- private void sendBadRequest(Writer out, String help) throws IOException {
+ private static void sendBadRequest(Writer out, String help) throws IOException {
sendHeader(out, "400 Bad Request", "text/html", true);
out.write("<HTML>\r\n");
out.write("<HEAD><TITLE>Bad Request</TITLE>\r\n");
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
index f10558d..217eac0 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
@@ -94,7 +94,7 @@ public class AddWayHandler extends RequestHandler {
@Override
protected void validateRequest() throws RequestHandlerBadRequestException {
allCoordinates.clear();
- for (String coordinatesString : args.get("way").split(";\\s*")) {
+ for (String coordinatesString : (args != null ? args.get("way") : "").split(";\\s*")) {
String[] coordinates = coordinatesString.split(",\\s*", 2);
if (coordinates.length < 2) {
throw new RequestHandlerBadRequestException(
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
index d1161ef..d601f15 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
@@ -115,9 +115,9 @@ public class ImageryHandler extends RequestHandler.RawURLParseRequestHandler {
@Override
protected void validateRequest() throws RequestHandlerBadRequestException {
- String url = args.get("url");
- String type = args.get("type");
- String cookies = args.get("cookies");
+ String url = args != null ? args.get("url") : null;
+ String type = args != null ? args.get("type") : null;
+ String cookies = args != null ? args.get("cookies") : null;
try {
ImageryLayer.create(new ImageryInfo(null, url, type, null, cookies));
} catch (IllegalArgumentException e) {
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
index afda48a..592e265 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
@@ -268,10 +268,10 @@ public class LoadAndZoomHandler extends RequestHandler {
minlon = 0;
maxlon = 0;
try {
- minlat = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("bottom")));
- maxlat = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("top")));
- minlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("left")));
- maxlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("right")));
+ minlat = LatLon.roundToOsmPrecision(Double.parseDouble(args != null ? args.get("bottom") : ""));
+ maxlat = LatLon.roundToOsmPrecision(Double.parseDouble(args != null ? args.get("top") : ""));
+ minlon = LatLon.roundToOsmPrecision(Double.parseDouble(args != null ? args.get("left") : ""));
+ maxlon = LatLon.roundToOsmPrecision(Double.parseDouble(args != null ? args.get("right") : ""));
} catch (NumberFormatException e) {
throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+')', e);
}
@@ -290,7 +290,7 @@ public class LoadAndZoomHandler extends RequestHandler {
}
// Process optional argument 'select'
- if (args.containsKey("select")) {
+ if (args != null && args.containsKey("select")) {
toSelect.clear();
for (String item : args.get("select").split(",")) {
try {
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
index c4f7ff7..e822ad7 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java
@@ -96,7 +96,7 @@ public class LoadDataHandler extends RequestHandler {
}
}
- protected class LoadDataTask extends DownloadOsmTask.AbstractInternalTask {
+ protected static class LoadDataTask extends DownloadOsmTask.AbstractInternalTask {
protected final String layerName;
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
index c4b5b84..c1347d7 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
@@ -104,7 +104,7 @@ public class LoadObjectHandler extends RequestHandler {
@Override
protected void validateRequest() throws RequestHandlerBadRequestException {
ps.clear();
- for (String i : args.get("objects").split(",\\s*")) {
+ for (String i : (args != null ? args.get("objects") : "").split(",\\s*")) {
try {
ps.add(SimplePrimitiveId.fromString(i));
} catch (IllegalArgumentException e) {
diff --git a/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java b/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
index 312057e..34fbea1 100644
--- a/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
@@ -28,7 +28,7 @@ public class GeoImageSessionExporter extends AbstractSessionExporter<GeoImageLay
* Constructs a new {@code GeoImageSessionExporter}.
* @param layer GeoImage layer to export
*/
- public GeoImageSessionExporter(GeoImageLayer layer) {
+ public GeoImageSessionExporter(GeoImageLayer layer) { // NO_UCD (unused code)
super(layer);
}
diff --git a/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java b/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java
index fea1ae6..b4c8409 100644
--- a/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java
@@ -20,7 +20,7 @@ public class GpxTracksSessionExporter extends GenericSessionExporter<GpxLayer> {
* Constructs a new {@code GpxTracksSessionExporter}.
* @param layer GPX layer to export
*/
- public GpxTracksSessionExporter(GpxLayer layer) {
+ public GpxTracksSessionExporter(GpxLayer layer) { // NO_UCD (test only)
super(layer, "tracks", "0.1", "gpx");
}
diff --git a/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java b/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
index 197178e..47b323c 100644
--- a/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
@@ -32,7 +32,7 @@ public class ImagerySessionExporter extends AbstractSessionExporter<ImageryLayer
* Constructs a new {@code ImagerySessionExporter}.
* @param layer imagery layer to export
*/
- public ImagerySessionExporter(ImageryLayer layer) {
+ public ImagerySessionExporter(ImageryLayer layer) { // NO_UCD (unused code)
super(layer);
}
@@ -40,7 +40,7 @@ public class ImagerySessionExporter extends AbstractSessionExporter<ImageryLayer
* Constructs a new {@code ImagerySessionExporter}.
* @param layer TMS layer to export
*/
- public ImagerySessionExporter(TMSLayer layer) {
+ public ImagerySessionExporter(TMSLayer layer) { // NO_UCD (unused code)
super(layer);
}
@@ -48,7 +48,7 @@ public class ImagerySessionExporter extends AbstractSessionExporter<ImageryLayer
* Constructs a new {@code ImagerySessionExporter}.
* @param layer WMS layer to export
*/
- public ImagerySessionExporter(WMSLayer layer) {
+ public ImagerySessionExporter(WMSLayer layer) { // NO_UCD (unused code)
super(layer);
}
@@ -56,7 +56,7 @@ public class ImagerySessionExporter extends AbstractSessionExporter<ImageryLayer
* Constructs a new {@code ImagerySessionExporter}.
* @param layer WMTS layer to export
*/
- public ImagerySessionExporter(WMTSLayer layer) {
+ public ImagerySessionExporter(WMTSLayer layer) { // NO_UCD (unused code)
super(layer);
}
diff --git a/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java b/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java
index be745db..fe34c07 100644
--- a/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java
@@ -36,7 +36,7 @@ public class MarkerSessionExporter extends AbstractSessionExporter<MarkerLayer>
* Constructs a new {@code MarkerSessionExporter}.
* @param layer marker layer to export
*/
- public MarkerSessionExporter(MarkerLayer layer) {
+ public MarkerSessionExporter(MarkerLayer layer) { // NO_UCD (unused code)
super(layer);
}
diff --git a/src/org/openstreetmap/josm/io/session/NoteSessionExporter.java b/src/org/openstreetmap/josm/io/session/NoteSessionExporter.java
index db51546..a5d0cf3 100644
--- a/src/org/openstreetmap/josm/io/session/NoteSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/NoteSessionExporter.java
@@ -17,7 +17,7 @@ public class NoteSessionExporter extends GenericSessionExporter<NoteLayer> {
* Constructs a new {@code NoteSessionExporter}.
* @param layer Note layer to export
*/
- public NoteSessionExporter(NoteLayer layer) {
+ public NoteSessionExporter(NoteLayer layer) { // NO_UCD (unused code)
super(layer, "osm-notes", "0.1", "osn");
}
diff --git a/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java b/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
index 2226837..bedd1df 100644
--- a/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
@@ -21,7 +21,7 @@ public class OsmDataSessionExporter extends GenericSessionExporter<OsmDataLayer>
* Constructs a new {@code OsmDataSessionExporter}.
* @param layer Data layer to export
*/
- public OsmDataSessionExporter(OsmDataLayer layer) {
+ public OsmDataSessionExporter(OsmDataLayer layer) { // NO_UCD (test only)
super(layer, "osm-data", "0.1", "osm");
}
diff --git a/src/org/openstreetmap/josm/package-info.java b/src/org/openstreetmap/josm/package-info.java
new file mode 100644
index 0000000..adfa2a2
--- /dev/null
+++ b/src/org/openstreetmap/josm/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes of JOSM application.
+ */
+package org.openstreetmap.josm;
diff --git a/src/org/openstreetmap/josm/plugins/PluginException.java b/src/org/openstreetmap/josm/plugins/PluginException.java
index 465a735..1add9ba 100644
--- a/src/org/openstreetmap/josm/plugins/PluginException.java
+++ b/src/org/openstreetmap/josm/plugins/PluginException.java
@@ -9,26 +9,41 @@ import static org.openstreetmap.josm.tools.I18n.tr;
* is also no reason against this.. ;)
*
* @author Immanuel.Scholz
+ * @since 149
*/
public class PluginException extends Exception {
+
+ /** Plugin proxy, can be null */
public final transient PluginProxy plugin;
- public final String name;
+ /**
+ * Constructs a new {@code PluginException} with the specified plugin and cause.
+ * @param plugin plugin proxy
+ * @param name plugin name
+ * @param cause cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ */
public PluginException(PluginProxy plugin, String name, Throwable cause) {
super(tr("An error occurred in plugin {0}", name), cause);
this.plugin = plugin;
- this.name = name;
}
- public PluginException(String name, String message) {
+ /**
+ * Constructs a new {@code PluginException} with the specified detail message.
+ * @param message message the detail message (which is saved for later retrieval by the {@link #getMessage()} method).
+ */
+ public PluginException(String message) {
super(message);
this.plugin = null;
- this.name = name;
}
+ /**
+ * Constructs a new {@code PluginException} with the specified plugin name, cause and a detail message of
+ * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail message of <tt>cause</tt>).
+ * @param name plugin name
+ * @param cause cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ */
public PluginException(String name, Throwable cause) {
super(tr("An error occurred in plugin {0}", name), cause);
this.plugin = null;
- this.name = name;
}
}
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index bd83008..909d72f 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -7,6 +7,7 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.Component;
import java.awt.Font;
+import java.awt.GraphicsEnvironment;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
@@ -79,51 +80,51 @@ public final class PluginHandler {
*/
protected static final Collection<DeprecatedPlugin> DEPRECATED_PLUGINS;
static {
- String IN_CORE = tr("integrated into main program");
+ String inCore = tr("integrated into main program");
DEPRECATED_PLUGINS = Arrays.asList(new DeprecatedPlugin[] {
- new DeprecatedPlugin("mappaint", IN_CORE),
- new DeprecatedPlugin("unglueplugin", IN_CORE),
- new DeprecatedPlugin("lang-de", IN_CORE),
- new DeprecatedPlugin("lang-en_GB", IN_CORE),
- new DeprecatedPlugin("lang-fr", IN_CORE),
- new DeprecatedPlugin("lang-it", IN_CORE),
- new DeprecatedPlugin("lang-pl", IN_CORE),
- new DeprecatedPlugin("lang-ro", IN_CORE),
- new DeprecatedPlugin("lang-ru", IN_CORE),
- new DeprecatedPlugin("ewmsplugin", IN_CORE),
- new DeprecatedPlugin("ywms", IN_CORE),
- new DeprecatedPlugin("tways-0.2", IN_CORE),
- new DeprecatedPlugin("geotagged", IN_CORE),
+ new DeprecatedPlugin("mappaint", inCore),
+ new DeprecatedPlugin("unglueplugin", inCore),
+ new DeprecatedPlugin("lang-de", inCore),
+ new DeprecatedPlugin("lang-en_GB", inCore),
+ new DeprecatedPlugin("lang-fr", inCore),
+ new DeprecatedPlugin("lang-it", inCore),
+ new DeprecatedPlugin("lang-pl", inCore),
+ new DeprecatedPlugin("lang-ro", inCore),
+ new DeprecatedPlugin("lang-ru", inCore),
+ new DeprecatedPlugin("ewmsplugin", inCore),
+ new DeprecatedPlugin("ywms", inCore),
+ new DeprecatedPlugin("tways-0.2", inCore),
+ new DeprecatedPlugin("geotagged", inCore),
new DeprecatedPlugin("landsat", tr("replaced by new {0} plugin", "lakewalker")),
- new DeprecatedPlugin("namefinder", IN_CORE),
- new DeprecatedPlugin("waypoints", IN_CORE),
- new DeprecatedPlugin("slippy_map_chooser", IN_CORE),
+ new DeprecatedPlugin("namefinder", inCore),
+ new DeprecatedPlugin("waypoints", inCore),
+ new DeprecatedPlugin("slippy_map_chooser", inCore),
new DeprecatedPlugin("tcx-support", tr("replaced by new {0} plugin", "dataimport")),
- new DeprecatedPlugin("usertools", IN_CORE),
- new DeprecatedPlugin("AgPifoJ", IN_CORE),
- new DeprecatedPlugin("utilsplugin", IN_CORE),
- new DeprecatedPlugin("ghost", IN_CORE),
- new DeprecatedPlugin("validator", IN_CORE),
- new DeprecatedPlugin("multipoly", IN_CORE),
- new DeprecatedPlugin("multipoly-convert", IN_CORE),
- new DeprecatedPlugin("remotecontrol", IN_CORE),
- new DeprecatedPlugin("imagery", IN_CORE),
- new DeprecatedPlugin("slippymap", IN_CORE),
- new DeprecatedPlugin("wmsplugin", IN_CORE),
- new DeprecatedPlugin("ParallelWay", IN_CORE),
+ new DeprecatedPlugin("usertools", inCore),
+ new DeprecatedPlugin("AgPifoJ", inCore),
+ new DeprecatedPlugin("utilsplugin", inCore),
+ new DeprecatedPlugin("ghost", inCore),
+ new DeprecatedPlugin("validator", inCore),
+ new DeprecatedPlugin("multipoly", inCore),
+ new DeprecatedPlugin("multipoly-convert", inCore),
+ new DeprecatedPlugin("remotecontrol", inCore),
+ new DeprecatedPlugin("imagery", inCore),
+ new DeprecatedPlugin("slippymap", inCore),
+ new DeprecatedPlugin("wmsplugin", inCore),
+ new DeprecatedPlugin("ParallelWay", inCore),
new DeprecatedPlugin("dumbutils", tr("replaced by new {0} plugin", "utilsplugin2")),
- new DeprecatedPlugin("ImproveWayAccuracy", IN_CORE),
+ new DeprecatedPlugin("ImproveWayAccuracy", inCore),
new DeprecatedPlugin("Curves", tr("replaced by new {0} plugin", "utilsplugin2")),
new DeprecatedPlugin("epsg31287", tr("replaced by new {0} plugin", "proj4j")),
new DeprecatedPlugin("licensechange", tr("no longer required")),
- new DeprecatedPlugin("restart", IN_CORE),
- new DeprecatedPlugin("wayselector", IN_CORE),
+ new DeprecatedPlugin("restart", inCore),
+ new DeprecatedPlugin("wayselector", inCore),
new DeprecatedPlugin("openstreetbugs", tr("replaced by new {0} plugin", "notes")),
new DeprecatedPlugin("nearclick", tr("no longer required")),
- new DeprecatedPlugin("notes", IN_CORE),
- new DeprecatedPlugin("mirrored_download", IN_CORE),
- new DeprecatedPlugin("ImageryCache", IN_CORE),
+ new DeprecatedPlugin("notes", inCore),
+ new DeprecatedPlugin("mirrored_download", inCore),
+ new DeprecatedPlugin("ImageryCache", inCore),
new DeprecatedPlugin("commons-imaging", tr("replaced by new {0} plugin", "apache-commons")),
new DeprecatedPlugin("missingRoads", tr("replaced by new {0} plugin", "ImproveOsm")),
new DeprecatedPlugin("trafficFlowDirection", tr("replaced by new {0} plugin", "ImproveOsm")),
@@ -220,7 +221,6 @@ public final class PluginHandler {
static final String[] UNMAINTAINED_PLUGINS = new String[] {
"gpsbabelgui",
"Intersect_way",
- "CADTools", // See #11438, #11518, https://github.com/ROTARIUANAMARIA/CADTools/issues/1
"ContourOverlappingMerge", // See #11202, #11518, https://github.com/bularcasergiu/ContourOverlappingMerge/issues/1
"LaneConnector", // See #11468, #11518, https://github.com/TrifanAdrian/LanecConnectorPlugin/issues/1
"Remove.redundant.points" // See #11468, #11518, https://github.com/bularcasergiu/RemoveRedundantPoints (not even created an issue...)
@@ -275,7 +275,7 @@ public final class PluginHandler {
* @param parent The parent Component used to display warning popup
* @param plugins the collection of plugins
*/
- private static void filterDeprecatedPlugins(Component parent, Collection<String> plugins) {
+ static void filterDeprecatedPlugins(Component parent, Collection<String> plugins) {
Set<DeprecatedPlugin> removedPlugins = new TreeSet<>();
for (DeprecatedPlugin depr : DEPRECATED_PLUGINS) {
if (plugins.contains(depr.name)) {
@@ -304,12 +304,14 @@ public final class PluginHandler {
sb.append("</li>");
}
sb.append("</ul></html>");
- JOptionPane.showMessageDialog(
- parent,
- sb.toString(),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
+ if (!GraphicsEnvironment.isHeadless()) {
+ JOptionPane.showMessageDialog(
+ parent,
+ sb.toString(),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE
+ );
+ }
}
/**
@@ -322,7 +324,7 @@ public final class PluginHandler {
*
* @param plugins the collection of plugins
*/
- private static void filterUnmaintainedPlugins(Component parent, Collection<String> plugins) {
+ static void filterUnmaintainedPlugins(Component parent, Collection<String> plugins) {
for (String unmaintained : UNMAINTAINED_PLUGINS) {
if (!plugins.contains(unmaintained)) {
continue;
@@ -877,15 +879,24 @@ public final class PluginHandler {
}
try {
monitor.beginTask(tr("Determine plugins to load..."));
- Set<String> plugins = new HashSet<>();
- plugins.addAll(Main.pref.getCollection("plugins", new LinkedList<String>()));
- if (System.getProperty("josm.plugins") != null) {
- plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
+ Set<String> plugins = new HashSet<>(Main.pref.getCollection("plugins", new LinkedList<String>()));
+ if (Main.isDebugEnabled()) {
+ Main.debug("Plugins list initialized to " + plugins);
+ }
+ String systemProp = System.getProperty("josm.plugins");
+ if (systemProp != null) {
+ plugins.addAll(Arrays.asList(systemProp.split(",")));
+ if (Main.isDebugEnabled()) {
+ Main.debug("josm.plugins system property set to '" + systemProp+"'. Plugins list is now " + plugins);
+ }
}
monitor.subTask(tr("Removing deprecated plugins..."));
filterDeprecatedPlugins(parent, plugins);
monitor.subTask(tr("Removing unmaintained plugins..."));
filterUnmaintainedPlugins(parent, plugins);
+ if (Main.isDebugEnabled()) {
+ Main.debug("Plugins list is finally set to " + plugins);
+ }
Map<String, PluginInformation> infos = loadLocallyAvailablePluginInformation(monitor.createSubTaskMonitor(1, false));
List<PluginInformation> ret = new LinkedList<>();
for (Iterator<String> it = plugins.iterator(); it.hasNext();) {
diff --git a/src/org/openstreetmap/josm/plugins/PluginInformation.java b/src/org/openstreetmap/josm/plugins/PluginInformation.java
index 4b08e8b..feb4669 100644
--- a/src/org/openstreetmap/josm/plugins/PluginInformation.java
+++ b/src/org/openstreetmap/josm/plugins/PluginInformation.java
@@ -110,7 +110,7 @@ public class PluginInformation {
*/
public PluginInformation(File file, String name) throws PluginException {
if (!PluginHandler.isValidJar(file)) {
- throw new PluginException(name, tr("Invalid jar file ''{0}''", file));
+ throw new PluginException(tr("Invalid jar file ''{0}''", file));
}
this.name = name;
this.file = file;
@@ -120,7 +120,7 @@ public class PluginInformation {
) {
Manifest manifest = jar.getManifest();
if (manifest == null)
- throw new PluginException(name, tr("The plugin file ''{0}'' does not include a Manifest.", file.toString()));
+ throw new PluginException(tr("The plugin file ''{0}'' does not include a Manifest.", file.toString()));
scanManifest(manifest, false);
libraries.add(0, Utils.fileToURL(file));
} catch (IOException e) {
diff --git a/src/org/openstreetmap/josm/plugins/PluginListParseException.java b/src/org/openstreetmap/josm/plugins/PluginListParseException.java
index ece385f..8e7f272 100644
--- a/src/org/openstreetmap/josm/plugins/PluginListParseException.java
+++ b/src/org/openstreetmap/josm/plugins/PluginListParseException.java
@@ -1,20 +1,27 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins;
+/**
+ * Exception thrown during plugin list parsing.
+ * @since 2817
+ */
public class PluginListParseException extends Exception {
- public PluginListParseException() {
- super();
- }
-
- public PluginListParseException(String arg0, Throwable arg1) {
- super(arg0, arg1);
- }
- public PluginListParseException(String arg0) {
- super(arg0);
+ /**
+ * Constructs a new {@code PluginListParseException} with the specified detail message and cause.
+ * @param message message the detail message (which is saved for later retrieval by the {@link #getMessage()} method).
+ * @param cause cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ */
+ public PluginListParseException(String message, Throwable cause) {
+ super(message, cause);
}
- public PluginListParseException(Throwable arg0) {
- super(arg0);
+ /**
+ * Constructs a new {@code PluginListParseException} with the specified cause and a detail message of
+ * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail message of <tt>cause</tt>).
+ * @param cause cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ */
+ public PluginListParseException(Throwable cause) {
+ super(cause);
}
}
diff --git a/src/org/openstreetmap/josm/plugins/PluginListParser.java b/src/org/openstreetmap/josm/plugins/PluginListParser.java
index d3ab2b6..a208146 100644
--- a/src/org/openstreetmap/josm/plugins/PluginListParser.java
+++ b/src/org/openstreetmap/josm/plugins/PluginListParser.java
@@ -33,7 +33,7 @@ public class PluginListParser {
* @return a plugin information object
* @throws PluginListParseException if plugin manifest cannot be parsed
*/
- protected static PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException {
+ public static PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException {
try {
return new PluginInformation(
new ByteArrayInputStream(manifest.getBytes(StandardCharsets.UTF_8)),
diff --git a/src/org/openstreetmap/josm/plugins/PluginProxy.java b/src/org/openstreetmap/josm/plugins/PluginProxy.java
index 1e5a643..e3884e7 100644
--- a/src/org/openstreetmap/josm/plugins/PluginProxy.java
+++ b/src/org/openstreetmap/josm/plugins/PluginProxy.java
@@ -7,7 +7,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.download.DownloadSelection;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
-import org.openstreetmap.josm.tools.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
/**
* Helper class for the JOSM system to communicate with the plugin.
diff --git a/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java b/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
index e262c1d..b1f416c 100644
--- a/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
+++ b/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
@@ -15,6 +15,7 @@ import java.util.Map;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.OsmTransferException;
import org.xml.sax.SAXException;
@@ -72,7 +73,7 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
}
}
- private File[] listFiles(File pluginsDirectory, final String regex) {
+ private static File[] listFiles(File pluginsDirectory, final String regex) {
return pluginsDirectory.listFiles(
new FilenameFilter() {
@Override
@@ -135,7 +136,10 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
}
protected void scanLocalPluginRepository(ProgressMonitor monitor, File pluginsDirectory) {
- if (pluginsDirectory == null) return;
+ if (pluginsDirectory == null)
+ return;
+ if (monitor == null)
+ monitor = NullProgressMonitor.INSTANCE;
try {
monitor.beginTask("");
scanSiteCacheFiles(monitor, pluginsDirectory);
diff --git a/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java b/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
index 589662e..7717fbd 100644
--- a/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
+++ b/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
@@ -195,7 +195,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
}
}
- private void displayErrorMessage(final ProgressMonitor monitor, final String msg, final String details, final String title,
+ private static void displayErrorMessage(final ProgressMonitor monitor, final String msg, final String details, final String title,
final String firstMessage) {
GuiHelper.runInEDTAndWait(new Runnable() {
@Override public void run() {
diff --git a/src/org/openstreetmap/josm/plugins/package-info.java b/src/org/openstreetmap/josm/plugins/package-info.java
new file mode 100644
index 0000000..77897c1
--- /dev/null
+++ b/src/org/openstreetmap/josm/plugins/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for JOSM plugins system.
+ */
+package org.openstreetmap.josm.plugins;
diff --git a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
deleted file mode 100644
index 0fac45f..0000000
--- a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+++ /dev/null
@@ -1,301 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.tools;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.Component;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.zip.GZIPOutputStream;
-
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.ShowStatusReportAction;
-import org.openstreetmap.josm.data.Version;
-import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.preferences.plugin.PluginPreference;
-import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
-import org.openstreetmap.josm.gui.widgets.JosmTextArea;
-import org.openstreetmap.josm.gui.widgets.UrlLabel;
-import org.openstreetmap.josm.plugins.PluginDownloadTask;
-import org.openstreetmap.josm.plugins.PluginHandler;
-
-/**
- * An exception handler that asks the user to send a bug report.
- *
- * @author imi
- */
-public final class BugReportExceptionHandler implements Thread.UncaughtExceptionHandler {
-
- private static boolean handlingInProgress;
- private static volatile BugReporterThread bugReporterThread;
- private static int exceptionCounter;
- private static boolean suppressExceptionDialogs;
-
- private static class BugReporterThread extends Thread {
-
- private final class BugReporterWorker implements Runnable {
- private final PluginDownloadTask pluginDownloadTask;
-
- private BugReporterWorker(PluginDownloadTask pluginDownloadTask) {
- this.pluginDownloadTask = pluginDownloadTask;
- }
-
- @Override
- public void run() {
- // Then ask for submitting a bug report, for exceptions thrown from a plugin too, unless updated to a new version
- if (pluginDownloadTask == null) {
- String[] buttonTexts = new String[] {tr("Do nothing"), tr("Report Bug")};
- String[] buttonIcons = new String[] {"cancel", "bug"};
- int defaultButtonIdx = 1;
- String message = tr("An unexpected exception occurred.<br>" +
- "This is always a coding error. If you are running the latest<br>" +
- "version of JOSM, please consider being kind and file a bug report."
- );
- // Check user is running current tested version, the error may already be fixed
- int josmVersion = Version.getInstance().getVersion();
- if (josmVersion != Version.JOSM_UNKNOWN_VERSION) {
- try {
- int latestVersion = Integer.parseInt(new WikiReader().
- read(Main.getJOSMWebsite()+"/wiki/TestedVersion?format=txt").trim());
- if (latestVersion > josmVersion) {
- buttonTexts = new String[] {tr("Do nothing"), tr("Update JOSM"), tr("Report Bug")};
- buttonIcons = new String[] {"cancel", "download", "bug"};
- defaultButtonIdx = 2;
- message = tr("An unexpected exception occurred. This is always a coding error.<br><br>" +
- "However, you are running an old version of JOSM ({0}),<br>" +
- "instead of using the current tested version (<b>{1}</b>).<br><br>"+
- "<b>Please update JOSM</b> before considering to file a bug report.",
- String.valueOf(josmVersion), String.valueOf(latestVersion));
- }
- } catch (IOException | NumberFormatException e) {
- Main.warn("Unable to detect latest version of JOSM: "+e.getMessage());
- }
- }
- // Show dialog
- ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Unexpected Exception"), buttonTexts);
- ed.setButtonIcons(buttonIcons);
- ed.setIcon(JOptionPane.ERROR_MESSAGE);
- ed.setCancelButton(1);
- ed.setDefaultButton(defaultButtonIdx);
- JPanel pnl = new JPanel(new GridBagLayout());
- pnl.add(new JLabel("<html>" + message + "</html>"), GBC.eol());
- JCheckBox cbSuppress = null;
- if (exceptionCounter > 1) {
- cbSuppress = new JCheckBox(tr("Suppress further error dialogs for this session."));
- pnl.add(cbSuppress, GBC.eol());
- }
- ed.setContent(pnl);
- ed.setFocusOnDefaultButton(true);
- ed.showDialog();
- if (cbSuppress != null && cbSuppress.isSelected()) {
- suppressExceptionDialogs = true;
- }
- if (ed.getValue() <= 1) {
- // "Do nothing"
- return;
- } else if (ed.getValue() < buttonTexts.length) {
- // "Update JOSM"
- try {
- Main.platform.openUrl(Main.getJOSMWebsite());
- } catch (IOException e) {
- Main.warn("Unable to access JOSM website: "+e.getMessage());
- }
- } else {
- // "Report bug"
- askForBugReport(e);
- }
- } else {
- // Ask for restart to install new plugin
- PluginPreference.notifyDownloadResults(
- Main.parent, pluginDownloadTask, !pluginDownloadTask.getDownloadedPlugins().isEmpty());
- }
- }
- }
-
- private final Throwable e;
-
- /**
- * Constructs a new {@code BugReporterThread}.
- * @param t the exception
- */
- BugReporterThread(Throwable t) {
- super("Bug Reporter");
- this.e = t;
- }
-
- @Override
- public void run() {
- // Give the user a chance to deactivate the plugin which threw the exception (if it was thrown from a plugin)
- SwingUtilities.invokeLater(new BugReporterWorker(PluginHandler.updateOrdisablePluginAfterException(e)));
- }
- }
-
- @Override
- public void uncaughtException(Thread t, Throwable e) {
- handleException(e);
- }
-
- /**
- * Handles the given throwable object
- * @param t The throwable object
- */
- public void handle(Throwable t) {
- handleException(t);
- }
-
- /**
- * Handles the given exception
- * @param e the exception
- */
- public static void handleException(final Throwable e) {
- if (handlingInProgress || suppressExceptionDialogs)
- return; // we do not handle secondary exceptions, this gets too messy
- if (bugReporterThread != null && bugReporterThread.isAlive())
- return;
- handlingInProgress = true;
- exceptionCounter++;
- try {
- Main.error(e);
- if (Main.parent != null) {
- if (e instanceof OutOfMemoryError) {
- // do not translate the string, as translation may raise an exception
- JOptionPane.showMessageDialog(Main.parent, "JOSM is out of memory. " +
- "Strange things may happen.\nPlease restart JOSM with the -Xmx###M option,\n" +
- "where ### is the number of MB assigned to JOSM (e.g. 256).\n" +
- "Currently, " + Runtime.getRuntime().maxMemory()/1024/1024 + " MB are available to JOSM.",
- "Error",
- JOptionPane.ERROR_MESSAGE
- );
- return;
- }
-
- bugReporterThread = new BugReporterThread(e);
- bugReporterThread.start();
- }
- } finally {
- handlingInProgress = false;
- }
- }
-
- private static void askForBugReport(final Throwable e) {
- try {
- final int maxlen = 6000;
- StringWriter stack = new StringWriter();
- e.printStackTrace(new PrintWriter(stack));
-
- String text = ShowStatusReportAction.getReportHeader() + stack.getBuffer().toString();
- String urltext = text.replaceAll("\r", "");
- if (urltext.length() > maxlen) {
- urltext = urltext.substring(0, maxlen);
- int idx = urltext.lastIndexOf('\n');
- // cut whole line when not loosing too much
- if (maxlen-idx < 200) {
- urltext = urltext.substring(0, idx+1);
- }
- urltext += "...<snip>...\n";
- }
-
- JPanel p = new JPanel(new GridBagLayout());
- p.add(new JMultilineLabel(
- tr("You have encountered an error in JOSM. Before you file a bug report " +
- "make sure you have updated to the latest version of JOSM here:")),
- GBC.eol().fill(GridBagConstraints.HORIZONTAL));
- p.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eop().insets(8, 0, 0, 0));
- p.add(new JMultilineLabel(
- tr("You should also update your plugins. If neither of those help please " +
- "file a bug report in our bugtracker using this link:")),
- GBC.eol().fill(GridBagConstraints.HORIZONTAL));
- p.add(getBugReportUrlLabel(urltext), GBC.eop().insets(8, 0, 0, 0));
- p.add(new JMultilineLabel(
- tr("There the error information provided below should already be " +
- "filled in for you. Please include information on how to reproduce " +
- "the error and try to supply as much detail as possible.")),
- GBC.eop().fill(GridBagConstraints.HORIZONTAL));
- p.add(new JMultilineLabel(
- tr("Alternatively, if that does not work you can manually fill in the information " +
- "below at this URL:")), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
- p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
-
- // Wiki formatting for manual copy-paste
- text = "{{{\n"+text+"}}}";
-
- if (Utils.copyToClipboard(text)) {
- p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")),
- GBC.eop().fill(GridBagConstraints.HORIZONTAL));
- }
-
- JosmTextArea info = new JosmTextArea(text, 18, 60);
- info.setCaretPosition(0);
- info.setEditable(false);
- p.add(new JScrollPane(info), GBC.eop().fill());
-
- for (Component c: p.getComponents()) {
- if (c instanceof JMultilineLabel) {
- ((JMultilineLabel) c).setMaxWidth(400);
- }
- }
-
- JOptionPane.showMessageDialog(Main.parent, p, tr("You have encountered a bug in JOSM"), JOptionPane.ERROR_MESSAGE);
- } catch (Exception e1) {
- Main.error(e1);
- }
- }
-
- /**
- * Determines if an exception is currently being handled
- * @return {@code true} if an exception is currently being handled, {@code false} otherwise
- */
- public static boolean exceptionHandlingInProgress() {
- return handlingInProgress;
- }
-
- /**
- * Replies the URL to create a JOSM bug report with the given debug text
- * @param debugText The debug text to provide us
- * @return The URL to create a JOSM bug report with the given debug text
- * @since 5849
- */
- public static URL getBugReportUrl(String debugText) {
- try (
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- GZIPOutputStream gzip = new GZIPOutputStream(out)
- ) {
- gzip.write(debugText.getBytes(StandardCharsets.UTF_8));
- gzip.finish();
-
- return new URL(Main.getJOSMWebsite()+"/josmticket?" +
- "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
- } catch (IOException e) {
- Main.error(e);
- return null;
- }
- }
-
- /**
- * Replies the URL label to create a JOSM bug report with the given debug text
- * @param debugText The debug text to provide us
- * @return The URL label to create a JOSM bug report with the given debug text
- * @since 5849
- */
- public static UrlLabel getBugReportUrlLabel(String debugText) {
- URL url = getBugReportUrl(debugText);
- if (url != null) {
- return new UrlLabel(url.toString(), Main.getJOSMWebsite()+"/josmticket?...", 2);
- }
- return null;
- }
-}
diff --git a/src/org/openstreetmap/josm/tools/CopyList.java b/src/org/openstreetmap/josm/tools/CopyList.java
index fa30f74..2ef50aa 100644
--- a/src/org/openstreetmap/josm/tools/CopyList.java
+++ b/src/org/openstreetmap/josm/tools/CopyList.java
@@ -182,7 +182,7 @@ public final class CopyList<E> extends AbstractList<E> implements RandomAccess,
return next;
} catch (IndexOutOfBoundsException e) {
checkForComodification();
- throw new NoSuchElementException(e.getMessage());
+ throw (NoSuchElementException) new NoSuchElementException(e.getMessage()).initCause(e);
}
}
diff --git a/src/org/openstreetmap/josm/tools/Diff.java b/src/org/openstreetmap/josm/tools/Diff.java
index 3cdeef9..0f007b8 100644
--- a/src/org/openstreetmap/josm/tools/Diff.java
+++ b/src/org/openstreetmap/josm/tools/Diff.java
@@ -176,7 +176,7 @@ public class Diff {
for (int c = 1;; ++c) {
int d; /* Active diagonal. */
- boolean big_snake = false;
+ boolean bigSnake = false;
/* Extend the top-down search by an edit step in each diagonal. */
if (fmin > dmin) {
@@ -203,7 +203,7 @@ public class Diff {
++x; ++y;
}
if (x - oldx > SNAKE_LIMIT) {
- big_snake = true;
+ bigSnake = true;
}
fd[fdiagoff + d] = x;
if (odd && bmin <= d && d <= bmax && bd[bdiagoff + d] <= fd[fdiagoff + d]) {
@@ -237,7 +237,7 @@ public class Diff {
--x; --y;
}
if (oldx - x > SNAKE_LIMIT) {
- big_snake = true;
+ bigSnake = true;
}
bd[bdiagoff + d] = x;
if (!odd && fmin <= d && d <= fmax && bd[bdiagoff + d] <= fd[fdiagoff + d]) {
@@ -254,7 +254,7 @@ public class Diff {
With this heuristic, for files with a constant small density
of changes, the algorithm is linear in the file size. */
- if (c > 200 && big_snake && heuristic) {
+ if (c > 200 && bigSnake && heuristic) {
int best = 0;
int bestpos = -1;
@@ -617,11 +617,11 @@ public class Diff {
* @return the array of equivalence class counts.
*/
int[] equivCount() {
- int[] equiv_count = new int[equivMax];
+ int[] equivCount = new int[equivMax];
for (int i = 0; i < bufferedLines; ++i) {
- ++equiv_count[equivs[i]];
+ ++equivCount[equivs[i]];
}
- return equiv_count;
+ return equivCount;
}
/**
@@ -852,39 +852,39 @@ public class Diff {
*/
void shift_boundaries(FileData f) {
final boolean[] changed = changedFlag;
- final boolean[] other_changed = f.changedFlag;
+ final boolean[] otherChanged = f.changedFlag;
int i = 0;
int j = 0;
- int i_end = bufferedLines;
+ int iEnd = bufferedLines;
int preceding = -1;
- int other_preceding = -1;
+ int otherPreceding = -1;
for (;;) {
- int start, end, other_start;
+ int start, end, otherStart;
/* Scan forwards to find beginning of another run of changes.
Also keep track of the corresponding point in the other file. */
- while (i < i_end && !changed[1+i]) {
- while (other_changed[1+j++]) {
+ while (i < iEnd && !changed[1+i]) {
+ while (otherChanged[1+j++]) {
/* Non-corresponding lines in the other file
will count as the preceding batch of changes. */
- other_preceding = j;
+ otherPreceding = j;
}
i++;
}
- if (i == i_end) {
+ if (i == iEnd) {
break;
}
start = i;
- other_start = j;
+ otherStart = j;
for (;;) {
/* Now find the end of this run of changes. */
- while (i < i_end && changed[1+i]) {
+ while (i < iEnd && changed[1+i]) {
i++;
}
end = i;
@@ -898,8 +898,8 @@ public class Diff {
/* You might ask, how could this run follow right after another?
Only because the previous run was shifted here. */
- if (end != i_end && equivs[start] == equivs[end] && !other_changed[1+j]
- && !((preceding >= 0 && start == preceding) || (other_preceding >= 0 && other_start == other_preceding))) {
+ if (end != iEnd && equivs[start] == equivs[end] && !otherChanged[1+j]
+ && !((preceding >= 0 && start == preceding) || (otherPreceding >= 0 && otherStart == otherPreceding))) {
changed[1+end++] = true;
changed[1+start++] = false;
++i;
@@ -913,7 +913,7 @@ public class Diff {
}
preceding = i;
- other_preceding = j;
+ otherPreceding = j;
}
}
diff --git a/src/org/openstreetmap/josm/tools/HttpClient.java b/src/org/openstreetmap/josm/tools/HttpClient.java
index ff47780..cd70c04 100644
--- a/src/org/openstreetmap/josm/tools/HttpClient.java
+++ b/src/org/openstreetmap/josm/tools/HttpClient.java
@@ -109,9 +109,8 @@ public final class HttpClient {
Main.info("{0} {1} ({2}) ...", requestMethod, url, Utils.getSizeString(requestBody.length, Locale.getDefault()));
connection.setFixedLengthStreamingMode(requestBody.length);
connection.setDoOutput(true);
- final ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(1, false);
try (OutputStream out = new BufferedOutputStream(
- new ProgressOutputStream(connection.getOutputStream(), requestBody.length, subTaskMonitor))) {
+ new ProgressOutputStream(connection.getOutputStream(), requestBody.length, progressMonitor))) {
out.write(requestBody);
}
}
@@ -263,9 +262,8 @@ public final class HttpClient {
} catch (IOException ioe) {
in = connection.getErrorStream();
}
- monitor.subTask(tr("Fetching content..."));
if (in != null) {
- in = new ProgressInputStream(in, getContentLength(), monitor.createSubTaskMonitor(1, false));
+ in = new ProgressInputStream(in, getContentLength(), monitor);
in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
Compression compression = Compression.NONE;
if (uncompress) {
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 06449c0..c2f3ef3 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -94,8 +94,6 @@ public final class I18n {
private static volatile PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
private static volatile String loadedCode = "en";
- /** store the original system locale for further use */
- public static final Locale SystemLocale = Locale.getDefault();
/* Localization keys for file chooser (and color chooser). */
private static final String[] javaInternalMessageKeys = new String[] {
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index a022420..7f1de8c 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -82,6 +82,7 @@ import org.xml.sax.helpers.XMLReaderFactory;
import com.kitfox.svg.SVGDiagram;
import com.kitfox.svg.SVGUniverse;
+import org.openstreetmap.josm.data.osm.DataSet;
/**
* Helper class to support the application with images.
@@ -752,8 +753,9 @@ public class ImageProvider {
} else {
extensions = new String[] {".png", ".svg"};
}
- final int ARCHIVE = 0, LOCAL = 1;
- for (int place : new Integer[] {ARCHIVE, LOCAL}) {
+ final int typeArchive = 0;
+ final int typeLocal = 1;
+ for (int place : new Integer[] {typeArchive, typeLocal}) {
for (String ext : extensions) {
if (".svg".equals(ext)) {
@@ -776,7 +778,7 @@ public class ImageProvider {
if (ir != null) return ir;
switch (place) {
- case ARCHIVE:
+ case typeArchive:
if (archive != null) {
ir = getIfAvailableZip(fullName, archive, inArchiveDir, type);
if (ir != null) {
@@ -785,7 +787,7 @@ public class ImageProvider {
}
}
break;
- case LOCAL:
+ case typeLocal:
// getImageUrl() does a ton of "stat()" calls and gets expensive
// and redundant when you have a whole ton of objects. So,
// index the cache by the name of the icon we're looking for
@@ -923,8 +925,8 @@ public class ImageProvider {
continue;
}
} else {
- final String fn_md5 = Utils.md5Hex(fn);
- url = b + fn_md5.substring(0, 1) + '/' + fn_md5.substring(0, 2) + "/" + fn;
+ final String fnMD5 = Utils.md5Hex(fn);
+ url = b + fnMD5.substring(0, 1) + '/' + fnMD5.substring(0, 2) + "/" + fn;
}
result = getIfAvailableHttp(url, type);
if (result != null) {
@@ -1310,7 +1312,18 @@ public class ImageProvider {
public static ImageIcon getPadded(OsmPrimitive primitive, Dimension iconSize) {
// Check if the current styles have special icon for tagged nodes.
if (primitive instanceof org.openstreetmap.josm.data.osm.Node) {
- Pair<StyleElementList, Range> nodeStyles = MapPaintStyles.getStyles().generateStyles(primitive, 100, false);
+ Pair<StyleElementList, Range> nodeStyles;
+ DataSet ds = primitive.getDataSet();
+ if (ds != null) {
+ ds.getReadLock().lock();
+ }
+ try {
+ nodeStyles = MapPaintStyles.getStyles().generateStyles(primitive, 100, false);
+ } finally {
+ if (ds != null) {
+ ds.getReadLock().unlock();
+ }
+ }
for (StyleElement style : nodeStyles.a) {
if (style instanceof NodeElement) {
NodeElement nodeStyle = (NodeElement) style;
diff --git a/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java b/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
index 5cb8485..6e2991a 100644
--- a/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
+++ b/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
@@ -61,7 +61,7 @@ public final class OverpassTurboQueryWizard {
* @return an Overpass QL query
* @throws UncheckedParseException when the parsing fails
*/
- public String constructQuery(String search) throws UncheckedParseException {
+ public String constructQuery(String search) {
try {
final Object result = ((Invocable) engine).invokeFunction("overpassWizard", search);
if (Boolean.FALSE.equals(result)) {
@@ -71,10 +71,9 @@ public final class OverpassTurboQueryWizard {
query = query.replace("[bbox:{{bbox}}]", "");
return query;
} catch (NoSuchMethodException e) {
- throw new IllegalStateException();
+ throw new IllegalStateException(e);
} catch (ScriptException e) {
- throw new RuntimeException("Failed to execute OverpassTurboQueryWizard", e);
+ throw new UncheckedParseException("Failed to execute OverpassTurboQueryWizard", e);
}
}
-
}
diff --git a/src/org/openstreetmap/josm/tools/Pair.java b/src/org/openstreetmap/josm/tools/Pair.java
index 524401c..ae1776c 100644
--- a/src/org/openstreetmap/josm/tools/Pair.java
+++ b/src/org/openstreetmap/josm/tools/Pair.java
@@ -1,7 +1,5 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Objects;
/**
@@ -47,19 +45,6 @@ public final class Pair<A, B> {
}
/**
- * Converts a single-typed pair to a list.
- * @param <T> type of both elements
- * @param p pair
- * @return list containing a and b
- */
- public static <T> List<T> toList(Pair<T, T> p) {
- List<T> l = new ArrayList<>(2);
- l.add(p.a);
- l.add(p.b);
- return l;
- }
-
- /**
* Sorts a single-typed pair so {@code a <= b}.
* @param <T> type of both elements
* @param p pair
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
index 3d04ffd..24cc6b0 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
@@ -25,7 +25,7 @@ import org.xml.sax.SAXException;
* {@code PlatformHook} implementation for Apple Mac OS X systems.
* @since 1023
*/
-public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook, InvocationHandler {
+public class PlatformHookOsx extends PlatformHookUnixoid implements InvocationHandler {
private static PlatformHookOsx ivhandler = new PlatformHookOsx();
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
index ed108c8..c25c128 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
@@ -65,13 +65,15 @@ public class PlatformHookUnixoid implements PlatformHook {
/**
* Platform font name.
*/
- @pref @writeExplicitly
+ @pref
+ @writeExplicitly
public String name = "";
/**
* File name.
*/
- @pref @writeExplicitly
+ @pref
+ @writeExplicitly
public String file = "";
/**
@@ -155,10 +157,9 @@ public class PlatformHookUnixoid implements PlatformHook {
StringBuilder result = new StringBuilder();
result.append("<html>").append(name);
if (sc != null && !sc.getKeyText().isEmpty()) {
- result.append(' ')
- .append("<font size='-2'>")
- .append('(').append(sc.getKeyText()).append(')')
- .append("</font>");
+ result.append(" <font size='-2'>(")
+ .append(sc.getKeyText())
+ .append(")</font>");
}
return result.append(" </html>").toString();
}
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
index 3b5f6df..d13a9c1 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
@@ -59,7 +59,7 @@ import org.openstreetmap.josm.Main;
* {@code PlatformHook} implementation for Microsoft Windows systems.
* @since 1023
*/
-public class PlatformHookWindows extends PlatformHookUnixoid implements PlatformHook {
+public class PlatformHookWindows extends PlatformHookUnixoid {
@Override
public void startupHook() {
diff --git a/src/org/openstreetmap/josm/tools/Predicates.java b/src/org/openstreetmap/josm/tools/Predicates.java
index 3dc899b..2c2b528 100644
--- a/src/org/openstreetmap/josm/tools/Predicates.java
+++ b/src/org/openstreetmap/josm/tools/Predicates.java
@@ -16,6 +16,36 @@ public final class Predicates {
}
/**
+ * Creates a predicate that returns true every time.
+ * @param <T> The type of the predicate.
+ * @return A predicate returning <code>true</code>
+ * @since 10040
+ */
+ public static <T> Predicate<T> alwaysTrue() {
+ return new Predicate<T>() {
+ @Override
+ public boolean evaluate(T object) {
+ return true;
+ }
+ };
+ }
+
+ /**
+ * Creates a predicate that returns false every time.
+ * @param <T> The type of the predicate.
+ * @return A predicate returning <code>false</code>
+ * @since 10040
+ */
+ public static <T> Predicate<T> alwaysFalse() {
+ return new Predicate<T>() {
+ @Override
+ public boolean evaluate(T object) {
+ return false;
+ }
+ };
+ }
+
+ /**
* Returns the negation of {@code predicate}.
* @param <T> type of items
* @param predicate the predicate to negate
@@ -46,6 +76,21 @@ public final class Predicates {
}
/**
+ * Creates a new predicate that checks if elements are exactly of that class.
+ * @param <T> The predicate type.
+ * @param clazz The class the elements must have.
+ * @return A predicate.
+ */
+ public static <T> Predicate<T> isOfClass(final Class<? extends T> clazz) {
+ return new Predicate<T>() {
+ @Override
+ public boolean evaluate(T obj) {
+ return obj != null && obj.getClass() == clazz;
+ }
+ };
+ }
+
+ /**
* Returns a {@link Predicate} executing {@link Pattern#matcher(CharSequence)} and {@link java.util.regex.Matcher#matches}.
* @param pattern the pattern
* @return a {@link Predicate} executing {@link Pattern#matcher(CharSequence)} and {@link java.util.regex.Matcher#matches}
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index 5a0e6dc..1e8f2ff 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -600,7 +600,7 @@ public final class Utils {
}
});
return true;
- } catch (IllegalStateException ex) {
+ } catch (IllegalStateException | HeadlessException ex) {
Main.error(ex);
return false;
}
@@ -1470,7 +1470,7 @@ public final class Utils {
* @param loadFactor the load factor
* @return the initial capacity for the HashMap constructor
*/
- public static int hashMapInitialCapacity(int nEntries, float loadFactor) {
+ public static int hashMapInitialCapacity(int nEntries, double loadFactor) {
return (int) Math.ceil(nEntries / loadFactor);
}
@@ -1489,7 +1489,7 @@ public final class Utils {
* @return the initial capacity for the HashMap constructor
*/
public static int hashMapInitialCapacity(int nEntries) {
- return hashMapInitialCapacity(nEntries, 0.75f);
+ return hashMapInitialCapacity(nEntries, 0.75d);
}
/**
diff --git a/src/org/openstreetmap/josm/tools/WindowGeometry.java b/src/org/openstreetmap/josm/tools/WindowGeometry.java
index d7e02fb..0dd8515 100644
--- a/src/org/openstreetmap/josm/tools/WindowGeometry.java
+++ b/src/org/openstreetmap/josm/tools/WindowGeometry.java
@@ -48,8 +48,7 @@ public class WindowGeometry {
* @return the geometry object
*/
public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) {
- Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey)
- : getFullScreenInfo();
+ Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey) : getFullScreenInfo();
Point topLeft = new Point(
size.x + Math.max(0, (size.width - extent.width) /2),
size.y + Math.max(0, (size.height - extent.height) /2)
@@ -116,8 +115,7 @@ public class WindowGeometry {
* @param rect the position
*/
public WindowGeometry(Rectangle rect) {
- this.topLeft = rect.getLocation();
- this.extent = rect.getSize();
+ this(rect.getLocation(), rect.getSize());
}
/**
@@ -425,9 +423,7 @@ public class WindowGeometry {
* @return bounds of the screen
*/
private static Rectangle getScreenInfo(Rectangle g) {
- GraphicsEnvironment ge = GraphicsEnvironment
- .getLocalGraphicsEnvironment();
- GraphicsDevice[] gs = ge.getScreenDevices();
+ GraphicsDevice[] gs = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
int intersect = 0;
Rectangle bounds = null;
for (GraphicsDevice gd : gs) {
@@ -445,7 +441,7 @@ public class WindowGeometry {
b.x += b.width;
is = b.intersection(g);
s = is.width * is.height;
- if (bounds == null || intersect < s) {
+ if (intersect < s) {
intersect = s;
bounds = b;
}
@@ -459,7 +455,7 @@ public class WindowGeometry {
}
}
}
- return bounds;
+ return bounds != null ? bounds : g;
}
/**
diff --git a/src/org/openstreetmap/josm/tools/XmlObjectParser.java b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
index cd1fce7..cbbf9da 100644
--- a/src/org/openstreetmap/josm/tools/XmlObjectParser.java
+++ b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
@@ -240,10 +240,6 @@ public class XmlObjectParser implements Iterable<Object> {
parser = new Parser();
}
- public XmlObjectParser(DefaultHandler handler) {
- parser = handler;
- }
-
private Iterable<Object> start(final Reader in, final ContentHandler contentHandler) throws SAXException, IOException {
try {
XMLReader reader = Utils.newSafeSAXParser().getXMLReader();
diff --git a/src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java b/src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java
new file mode 100644
index 0000000..a90e9c0
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java
@@ -0,0 +1,251 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.GraphicsEnvironment;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ReportBugAction;
+import org.openstreetmap.josm.actions.ShowStatusReportAction;
+import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.preferences.plugin.PluginPreference;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.plugins.PluginDownloadTask;
+import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.WikiReader;
+
+/**
+ * An exception handler that asks the user to send a bug report.
+ *
+ * @author imi
+ * @since 40
+ */
+public final class BugReportExceptionHandler implements Thread.UncaughtExceptionHandler {
+
+ private static boolean handlingInProgress;
+ private static volatile BugReporterThread bugReporterThread;
+ private static int exceptionCounter;
+ private static boolean suppressExceptionDialogs;
+
+ static final class BugReporterThread extends Thread {
+
+ private final class BugReporterWorker implements Runnable {
+ private final PluginDownloadTask pluginDownloadTask;
+
+ private BugReporterWorker(PluginDownloadTask pluginDownloadTask) {
+ this.pluginDownloadTask = pluginDownloadTask;
+ }
+
+ @Override
+ public void run() {
+ // Then ask for submitting a bug report, for exceptions thrown from a plugin too, unless updated to a new version
+ if (pluginDownloadTask == null) {
+ askForBugReport(e);
+ } else {
+ // Ask for restart to install new plugin
+ PluginPreference.notifyDownloadResults(
+ Main.parent, pluginDownloadTask, !pluginDownloadTask.getDownloadedPlugins().isEmpty());
+ }
+ }
+ }
+
+ private final Throwable e;
+
+ /**
+ * Constructs a new {@code BugReporterThread}.
+ * @param t the exception
+ */
+ private BugReporterThread(Throwable t) {
+ super("Bug Reporter");
+ this.e = t;
+ }
+
+ static void askForBugReport(final Throwable e) {
+ String[] buttonTexts = new String[] {tr("Do nothing"), tr("Report Bug")};
+ String[] buttonIcons = new String[] {"cancel", "bug"};
+ int defaultButtonIdx = 1;
+ String message = tr("An unexpected exception occurred.<br>" +
+ "This is always a coding error. If you are running the latest<br>" +
+ "version of JOSM, please consider being kind and file a bug report."
+ );
+ // Check user is running current tested version, the error may already be fixed
+ int josmVersion = Version.getInstance().getVersion();
+ if (josmVersion != Version.JOSM_UNKNOWN_VERSION) {
+ try {
+ int latestVersion = Integer.parseInt(new WikiReader().
+ read(Main.getJOSMWebsite()+"/wiki/TestedVersion?format=txt").trim());
+ if (latestVersion > josmVersion) {
+ buttonTexts = new String[] {tr("Do nothing"), tr("Update JOSM"), tr("Report Bug")};
+ buttonIcons = new String[] {"cancel", "download", "bug"};
+ defaultButtonIdx = 2;
+ message = tr("An unexpected exception occurred. This is always a coding error.<br><br>" +
+ "However, you are running an old version of JOSM ({0}),<br>" +
+ "instead of using the current tested version (<b>{1}</b>).<br><br>"+
+ "<b>Please update JOSM</b> before considering to file a bug report.",
+ String.valueOf(josmVersion), String.valueOf(latestVersion));
+ }
+ } catch (IOException | NumberFormatException ex) {
+ Main.warn("Unable to detect latest version of JOSM: "+ex.getMessage());
+ }
+ }
+ // Build panel
+ JPanel pnl = new JPanel(new GridBagLayout());
+ pnl.add(new JLabel("<html>" + message + "</html>"), GBC.eol());
+ JCheckBox cbSuppress = null;
+ if (exceptionCounter > 1) {
+ cbSuppress = new JCheckBox(tr("Suppress further error dialogs for this session."));
+ pnl.add(cbSuppress, GBC.eol());
+ }
+ if (GraphicsEnvironment.isHeadless()) {
+ return;
+ }
+ // Show dialog
+ ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Unexpected Exception"), buttonTexts);
+ ed.setButtonIcons(buttonIcons);
+ ed.setIcon(JOptionPane.ERROR_MESSAGE);
+ ed.setCancelButton(1);
+ ed.setDefaultButton(defaultButtonIdx);
+ ed.setContent(pnl);
+ ed.setFocusOnDefaultButton(true);
+ ed.showDialog();
+ if (cbSuppress != null && cbSuppress.isSelected()) {
+ suppressExceptionDialogs = true;
+ }
+ if (ed.getValue() <= 1) {
+ // "Do nothing"
+ return;
+ } else if (ed.getValue() < buttonTexts.length) {
+ // "Update JOSM"
+ try {
+ Main.platform.openUrl(Main.getJOSMWebsite());
+ } catch (IOException ex) {
+ Main.warn("Unable to access JOSM website: "+ex.getMessage());
+ }
+ } else {
+ // "Report bug"
+ try {
+ JPanel p = buildPanel(e);
+ JOptionPane.showMessageDialog(Main.parent, p, tr("You have encountered a bug in JOSM"), JOptionPane.ERROR_MESSAGE);
+ } catch (Exception ex) {
+ Main.error(ex);
+ }
+ }
+ }
+
+ @Override
+ public void run() {
+ // Give the user a chance to deactivate the plugin which threw the exception (if it was thrown from a plugin)
+ SwingUtilities.invokeLater(new BugReporterWorker(PluginHandler.updateOrdisablePluginAfterException(e)));
+ }
+ }
+
+ @Override
+ public void uncaughtException(Thread t, Throwable e) {
+ handleException(e);
+ }
+
+ /**
+ * Handles the given exception
+ * @param e the exception
+ */
+ public static void handleException(final Throwable e) {
+ if (handlingInProgress || suppressExceptionDialogs)
+ return; // we do not handle secondary exceptions, this gets too messy
+ if (bugReporterThread != null && bugReporterThread.isAlive())
+ return;
+ handlingInProgress = true;
+ exceptionCounter++;
+ try {
+ Main.error(e);
+ if (Main.parent != null) {
+ if (e instanceof OutOfMemoryError) {
+ // do not translate the string, as translation may raise an exception
+ JOptionPane.showMessageDialog(Main.parent, "JOSM is out of memory. " +
+ "Strange things may happen.\nPlease restart JOSM with the -Xmx###M option,\n" +
+ "where ### is the number of MB assigned to JOSM (e.g. 256).\n" +
+ "Currently, " + Runtime.getRuntime().maxMemory()/1024/1024 + " MB are available to JOSM.",
+ "Error",
+ JOptionPane.ERROR_MESSAGE
+ );
+ return;
+ }
+
+ bugReporterThread = new BugReporterThread(e);
+ bugReporterThread.start();
+ }
+ } finally {
+ handlingInProgress = false;
+ }
+ }
+
+ static JPanel buildPanel(final Throwable e) {
+ StringWriter stack = new StringWriter();
+ e.printStackTrace(new PrintWriter(stack));
+
+ String text = ShowStatusReportAction.getReportHeader() + stack.getBuffer().toString();
+ text = text.replaceAll("\r", "");
+
+ JPanel p = new JPanel(new GridBagLayout());
+ p.add(new JMultilineLabel(
+ tr("You have encountered an error in JOSM. Before you file a bug report " +
+ "make sure you have updated to the latest version of JOSM here:")),
+ GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+ p.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eop().insets(8, 0, 0, 0));
+ p.add(new JMultilineLabel(
+ tr("You should also update your plugins. If neither of those help please " +
+ "file a bug report in our bugtracker using this link:")),
+ GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+ p.add(new JButton(new ReportBugAction(text)), GBC.eop().insets(8, 0, 0, 0));
+ p.add(new JMultilineLabel(
+ tr("There the error information provided below should already be " +
+ "filled in for you. Please include information on how to reproduce " +
+ "the error and try to supply as much detail as possible.")),
+ GBC.eop().fill(GridBagConstraints.HORIZONTAL));
+ p.add(new JMultilineLabel(
+ tr("Alternatively, if that does not work you can manually fill in the information " +
+ "below at this URL:")), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+ p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
+
+ // Wiki formatting for manual copy-paste
+ DebugTextDisplay textarea = new DebugTextDisplay(text);
+
+ if (textarea.copyToClippboard()) {
+ p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")),
+ GBC.eop().fill(GridBagConstraints.HORIZONTAL));
+ }
+
+ p.add(textarea, GBC.eop().fill());
+
+ for (Component c: p.getComponents()) {
+ if (c instanceof JMultilineLabel) {
+ ((JMultilineLabel) c).setMaxWidth(400);
+ }
+ }
+ return p;
+ }
+
+ /**
+ * Determines if an exception is currently being handled
+ * @return {@code true} if an exception is currently being handled, {@code false} otherwise
+ */
+ public static boolean exceptionHandlingInProgress() {
+ return handlingInProgress;
+ }
+}
diff --git a/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
new file mode 100644
index 0000000..5e6f39c
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
@@ -0,0 +1,182 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.tools.Base64;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.HttpClient.Response;
+import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Utils;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+/**
+ * This class handles sending the bug report to JOSM website.
+ * <p>
+ * Currently, we try to open a browser window for the user that displays the bug report.
+ *
+ * @author Michael Zangl
+ * @since 10055
+ */
+public class BugReportSender extends Thread {
+
+ private final String statusText;
+ private String errorMessage;
+
+ /**
+ * Creates a new sender.
+ * @param statusText The status text to send.
+ */
+ protected BugReportSender(String statusText) {
+ super("Bug report sender");
+ this.statusText = statusText;
+ }
+
+ @Override
+ public void run() {
+ try {
+ // first, send the debug text using post.
+ String debugTextPasteId = pasteDebugText();
+
+ // then open a browser to display the pasted text.
+ String openBrowserError = OpenBrowser.displayUrl(getJOSMTicketURL() + "?pdata_stored=" + debugTextPasteId);
+ if (openBrowserError != null) {
+ Main.warn(openBrowserError);
+ failed(openBrowserError);
+ }
+ } catch (BugReportSenderException e) {
+ Main.warn(e);
+ failed(e.getMessage());
+ }
+ }
+
+ /**
+ * Sends the debug text to the server.
+ * @return The token which was returned by the server. We need to pass this on to the ticket system.
+ * @throws BugReportSenderException if sending the report failed.
+ */
+ private String pasteDebugText() throws BugReportSenderException {
+ try {
+ String text = Utils.strip(statusText);
+ ByteBuffer buffer = Charset.forName("UTF-8").encode(CharBuffer.wrap(text));
+ String pdata = Base64.encode(buffer, false);
+ String postQuery = "pdata=" + URLEncoder.encode(pdata, "UTF-8");
+ HttpClient client = HttpClient.create(new URL(getJOSMTicketURL()), "POST")
+ .setHeader("Content-Type", "application/x-www-form-urlencoded")
+ .setRequestBody(postQuery.getBytes(StandardCharsets.UTF_8));
+
+ Response connection = client.connect();
+
+ if (connection.getResponseCode() >= 500) {
+ throw new BugReportSenderException("Internal server error.");
+ }
+
+ try (InputStream in = connection.getContent()) {
+ DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ Document document = builder.parse(in);
+ return retrieveDebugToken(document);
+ }
+ } catch (IOException | SAXException | ParserConfigurationException | XPathExpressionException t) {
+ throw new BugReportSenderException(t);
+ }
+ }
+
+ private static String getJOSMTicketURL() {
+ return Main.getJOSMWebsite() + "/josmticket";
+ }
+
+ private static String retrieveDebugToken(Document document) throws XPathExpressionException, BugReportSenderException {
+ XPathFactory factory = XPathFactory.newInstance();
+ XPath xpath = factory.newXPath();
+ String status = (String) xpath.compile("/josmticket/@status").evaluate(document, XPathConstants.STRING);
+ if (!"ok".equals(status)) {
+ String message = (String) xpath.compile("/josmticket/error/text()").evaluate(document,
+ XPathConstants.STRING);
+ if (message.isEmpty()) {
+ message = "Error in server response but server did not tell us what happened.";
+ }
+ throw new BugReportSenderException(message);
+ }
+
+ String token = (String) xpath.compile("/josmticket/preparedid/text()")
+ .evaluate(document, XPathConstants.STRING);
+ if (token.isEmpty()) {
+ throw new BugReportSenderException("Server did not respond with a prepared id.");
+ }
+ return token;
+ }
+
+ private void failed(String string) {
+ errorMessage = string;
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ JPanel errorPanel = new JPanel(new GridBagLayout());
+ errorPanel.add(new JMultilineLabel(
+ tr("Opening the bug report failed. Please report manually using this website:")),
+ GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+ errorPanel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
+ errorPanel.add(new DebugTextDisplay(statusText));
+
+ JOptionPane.showMessageDialog(Main.parent, errorPanel, tr("You have encountered a bug in JOSM"),
+ JOptionPane.ERROR_MESSAGE);
+ }
+ });
+ }
+
+ /**
+ * Returns the error message that could have occured during bug sending.
+ * @return the error message, or {@code null} if successful
+ */
+ public final String getErrorMessage() {
+ return errorMessage;
+ }
+
+ private static class BugReportSenderException extends Exception {
+ BugReportSenderException(String message) {
+ super(message);
+ }
+
+ BugReportSenderException(Throwable cause) {
+ super(cause);
+ }
+ }
+
+ /**
+ * Opens the bug report window on the JOSM server.
+ * @param statusText The status text to send along to the server.
+ * @return bug report sender started thread
+ */
+ public static BugReportSender reportBug(String statusText) {
+ BugReportSender sender = new BugReportSender(statusText);
+ sender.start();
+ return sender;
+ }
+}
diff --git a/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java b/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java
new file mode 100644
index 0000000..a0e2841
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import java.awt.Dimension;
+
+import javax.swing.JScrollPane;
+
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * This is a text area that displays the debug text with scroll bars.
+ * @author Michael Zangl
+ * @since 10055
+ */
+public class DebugTextDisplay extends JScrollPane {
+ private String text;
+
+ /**
+ * Creates a new text are with the fixed text
+ * @param textToDisplay The text to display.
+ */
+ public DebugTextDisplay(String textToDisplay) {
+ text = "{{{\n" + Utils.strip(textToDisplay) + "\n}}}";
+ JosmTextArea textArea = new JosmTextArea(text);
+ textArea.setCaretPosition(0);
+ textArea.setEditable(false);
+ setViewportView(textArea);
+ setPreferredSize(new Dimension(600, 300));
+ }
+
+ /**
+ * Copies the debug text to the clippboard.
+ * @return <code>true</code> if copy was successful
+ */
+ public boolean copyToClippboard() {
+ return Utils.copyToClipboard(text);
+ }
+}
diff --git a/src/org/openstreetmap/josm/tools/date/DateUtils.java b/src/org/openstreetmap/josm/tools/date/DateUtils.java
index 1398cf1..9fe1fd3 100644
--- a/src/org/openstreetmap/josm/tools/date/DateUtils.java
+++ b/src/org/openstreetmap/josm/tools/date/DateUtils.java
@@ -29,7 +29,7 @@ import org.openstreetmap.josm.tools.UncheckedParseException;
*/
public final class DateUtils {
- private DateUtils() {
+ protected DateUtils() {
// Hide default constructor for utils classes
}
@@ -136,7 +136,7 @@ public final class DateUtils {
try {
return XML_DATE.newXMLGregorianCalendar(str).toGregorianCalendar().getTimeInMillis();
} catch (Exception ex) {
- throw new UncheckedParseException("The date string (" + str + ") could not be parsed.");
+ throw new UncheckedParseException("The date string (" + str + ") could not be parsed.", ex);
}
}
@@ -169,12 +169,15 @@ public final class DateUtils {
}
private static boolean checkLayout(String text, String pattern) {
- if (text.length() != pattern.length()) return false;
+ if (text.length() != pattern.length())
+ return false;
for (int i = 0; i < pattern.length(); i++) {
char pc = pattern.charAt(i);
char tc = text.charAt(i);
- if (pc == 'x' && tc >= '0' && tc <= '9') continue;
- else if (pc == 'x' || pc != tc) return false;
+ if (pc == 'x' && Character.isDigit(tc))
+ continue;
+ else if (pc == 'x' || pc != tc)
+ return false;
}
return true;
}
diff --git a/src/org/openstreetmap/josm/tools/package-info.java b/src/org/openstreetmap/josm/tools/package-info.java
new file mode 100644
index 0000000..80ff0b4
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/package-info.java
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the classes for various utilities and tools called from all other packages.
+ */
+package org.openstreetmap.josm.tools;
diff --git a/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java b/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
index 4372b65..8c25572 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
@@ -39,13 +39,13 @@ public class ContextSwitchTemplate implements TemplateEntry {
}
};
- private abstract class ContextProvider extends Match {
+ private abstract static class ContextProvider extends Match {
protected Match condition;
abstract List<OsmPrimitive> getPrimitives(OsmPrimitive root);
}
- private class ParentSet extends ContextProvider {
+ private static class ParentSet extends ContextProvider {
private final Match childCondition;
ParentSet(Match child) {
@@ -80,7 +80,7 @@ public class ContextSwitchTemplate implements TemplateEntry {
}
}
- private class ChildSet extends ContextProvider {
+ private static class ChildSet extends ContextProvider {
private final Match parentCondition;
ChildSet(Match parentCondition) {
@@ -123,7 +123,7 @@ public class ContextSwitchTemplate implements TemplateEntry {
}
}
- private class OrSet extends ContextProvider {
+ private static class OrSet extends ContextProvider {
private final ContextProvider lhs;
private final ContextProvider rhs;
@@ -154,7 +154,7 @@ public class ContextSwitchTemplate implements TemplateEntry {
}
}
- private class AndSet extends ContextProvider {
+ private static class AndSet extends ContextProvider {
private final ContextProvider lhs;
private final ContextProvider rhs;
@@ -184,7 +184,7 @@ public class ContextSwitchTemplate implements TemplateEntry {
private final ContextProvider context;
private final TemplateEntry template;
- private Match transform(Match m, int searchExpressionPosition) throws ParseError {
+ private static Match transform(Match m, int searchExpressionPosition) throws ParseError {
if (m instanceof Parent) {
Match child = transform(((Parent) m).getOperand(), searchExpressionPosition);
return new ParentSet(child);
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index c30f87c..e8c9452 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -15,6 +15,9 @@ meta {
canvas {
default-points: false;
}
+node {
+ text: auto;
+}
/*************************/
/* create style settings */
@@ -153,7 +156,6 @@ node[cutting?!],
node[embankment?!] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/****************************/
@@ -193,7 +195,6 @@ node[traffic_sign][access=private][!is_prop_set(icon-image)],
node[traffic_sign][access=destination][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[traffic_sign][bicycle?!] {
icon-image: "vehicle/restriction/bicycle.png";
@@ -202,7 +203,6 @@ node[traffic_sign][bicycle?!] {
node[traffic_sign][bicycle=designated] {
icon-image: "vehicle/restriction/bicycle-designated.png";
set icon_z17;
- text: auto;
}
node[traffic_sign][foot?!] {
icon-image: "vehicle/restriction/foot.png";
@@ -211,7 +211,6 @@ node[traffic_sign][foot?!] {
node[traffic_sign][foot=designated] {
icon-image: "vehicle/restriction/foot-designated.png";
set icon_z17;
- text: auto;
}
node[traffic_sign][goods?!],
node[traffic_sign][hgv?!] {
@@ -281,7 +280,6 @@ node["addr:housenumber"],
node["addr:postcode"] {
icon-image: "misc/housenumber.png";
set icon_z17;
- text: auto;
}
way["addr:interpolation"=odd] {
width: 1;
@@ -308,53 +306,44 @@ area[building:part][!building:part?!] {
node[building][!building?!] {
icon-image: "misc/landmark/building.png";
set icon_z17;
- text: auto;
}
node[building=garage] {
icon-image: "misc/landuse/garages.png";
set icon_z17;
- text: auto;
}
node[building=garages] {
icon-image: "misc/landuse/garages.png";
set icon_z17;
- text: auto;
}
node[building=transformer_tower] {
icon-image: "power/transformer_tower.svg";
- text: auto;
+ set icon_z17;
}
node[entrance=yes],
node[entrance=staircase] {
icon-image: "misc/entrance-yes.png";
set icon_z17;
- text: auto;
}
node[entrance=main] {
icon-image: "misc/entrance-main.png";
set icon_z17;
- text: auto;
}
node[entrance=service] {
icon-image: "misc/entrance-service.png";
set icon_z17;
- text: auto;
}
node[entrance=exit] {
icon-image: "misc/entrance-exit.png";
set icon_z17;
- text: auto;
}
node[entrance=emergency] {
icon-image: "misc/entrance-emergency.png";
set icon_z17;
- text: auto;
}
node[building=entrance],
node[building:part] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/****************/
@@ -369,12 +358,10 @@ way[barrier=bollard] {
node[barrier=bollard] {
icon-image: "presets/bollard.png";
set icon_z17;
- text: auto;
}
node[barrier=gate] {
icon-image: "vehicle/gate.png";
set icon_z17;
- text: auto;
}
way[barrier=yes],
way[barrier=hedge],
@@ -404,47 +391,38 @@ node[barrier=retaining_wall],
node[barrier=ditch] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
node[barrier=kerb] {
icon-image: "vehicle/kerb.svg";
set icon_z17;
- text: auto;
}
node[barrier=block] {
icon-image: "vehicle/block.svg";
set icon_z17;
- text: auto;
}
node[barrier=chain] {
icon-image: "vehicle/chain.svg";
set icon_z17;
- text: auto;
}
node[barrier=stile] {
icon-image: "vehicle/stile.svg";
set icon_z17;
- text: auto;
}
node[barrier=turnstile] {
icon-image: "vehicle/turnstile.png";
set icon_z17;
- text: auto;
}
node[barrier=cycle_barrier] {
icon-image: "vehicle/cycle_barrier.png";
set icon_z17;
- text: auto;
}
node[barrier=lift_gate] {
icon-image: "vehicle/lift_gate.png";
set icon_z17;
- text: auto;
}
node[barrier=swing_gate] {
icon-image: "vehicle/swing_gate.png";
set icon_z17;
- text: auto;
}
area[barrier=toll_booth]:closed {
fill-color: barrier#F0F050;
@@ -452,32 +430,26 @@ area[barrier=toll_booth]:closed {
node[barrier=toll_booth] {
icon-image: "vehicle/toll_booth.png";
set icon_z17;
- text: auto;
}
node[barrier=entrance] {
icon-image: "vehicle/entrance.png";
set icon_z17;
- text: auto;
}
node[barrier=cattle_grid] {
icon-image: "vehicle/cattle_grid.png";
set icon_z17;
- text: auto;
}
node[barrier=border_control] {
icon-image: "vehicle/border_control.png";
set icon_z17;
- text: auto;
}
node[barrier=sally_port] {
icon-image: "vehicle/sally_port.png";
set icon_z17;
- text: auto;
}
node[barrier=spikes] {
icon-image: "vehicle/spikes.svg";
set icon_z17;
- text: auto;
}
node[barrier=fence][!is_prop_set(icon-image)],
node[barrier=kissing_gate][!is_prop_set(icon-image)],
@@ -489,7 +461,6 @@ node[barrier=jersey_barrier][!is_prop_set(icon-image)],
node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
/****************/
@@ -670,27 +641,22 @@ area[junction=yes] {
node[junction=yes] {
icon-image: "vehicle/junction.svg";
set icon_z17;
- text: auto;
}
node[highway=traffic_mirror] {
icon-image: "vehicle/traffic_mirror.svg";
set icon_z17;
- text: auto;
}
node[highway=milestone] {
icon-image: "vehicle/milestone.svg";
set icon_z17;
- text: auto;
}
node[direction=clockwise] {
icon-image: "vehicle/restriction/roundabout_left.svg";
set icon_z17;
- text: auto;
}
node[highway=mini_roundabout] {
icon-image: "vehicle/restriction/mini_roundabout_left.svg";
set icon_z17;
- text: auto;
}
node:righthandtraffic[highway=mini_roundabout] {
icon-image: "vehicle/restriction/mini_roundabout_right.svg";
@@ -699,92 +665,71 @@ node:righthandtraffic[highway=mini_roundabout] {
node[highway=stop] {
icon-image: "vehicle/restriction/stop.svg";
set icon_z17;
- text: auto;
}
node[highway=give_way] {
icon-image: "vehicle/restriction/give_way.svg";
set icon_z17;
- text: auto;
}
node[highway=traffic_signals] {
icon-image: "vehicle/traffic_signals.svg";
set icon_z17;
- text: auto;
}
node[highway=traffic_signals][crossing][crossing!=no] {
icon-image: "vehicle/traffic_signals_crossing.svg";
set icon_z17;
- text: auto;
}
node[highway=traffic_signals][crossing_ref=zebra] {
icon-image: "vehicle/traffic_signals_crossing_ref_zebra.svg";
set icon_z17;
- text: auto;
}
node[highway=traffic_signals][crossing=island] {
icon-image: "vehicle/traffic_signals_crossing_island.svg";
set icon_z17;
- text: auto;
}
node[highway=traffic_signals][crossing=traffic_signals] {
icon-image: "vehicle/traffic_signals_crossing_traffic_signals.svg";
set icon_z17;
- text: auto;
}
node[highway=street_lamp] {
icon-image: "misc/streetlamp.png";
set icon_z17;
- text: auto;
}
node[highway=speed_camera] {
icon-image: "vehicle/restriction/speed_camera.svg";
set icon_z17;
- text: auto;
}
relation[type=enforcement] >[role="device"] node {
icon-image: "vehicle/restriction/speed_camera.svg";
set icon_z17;
- text: auto;
}
node[traffic_sign=city_limit] {
icon-image: "vehicle/restriction/city_limit.svg";
set icon_z17;
- text: auto;
}
node[highway=crossing] {
icon-image: "vehicle/crossing.svg";
set icon_z17;
- text: auto;
}
node[highway=crossing][crossing=unmarked] {
icon-image: "vehicle/crossing_unmarked.svg";
set icon_z17;
- text: auto;
}
node[highway=crossing][crossing=island] {
icon-image: "vehicle/crossing_island.svg";
set icon_z17;
- text: auto;
}
node[highway=crossing][crossing_ref=zebra] {
icon-image: "vehicle/crossing_ref_zebra.svg";
set icon_z17;
- text: auto;
}
node[highway=crossing][crossing=traffic_signals] {
icon-image: "vehicle/crossing_traffic_signals.svg";
set icon_z17;
- text: auto;
-}
-node[highway=incline], node[highway=incline_steep] {
- icon-image: "vehicle/restriction/incline.png";
- set icon_z17;
- text: auto;
}
node[highway=motorway_junction] {
icon-image: "vehicle/motorway_junction.svg";
set icon_z17;
- text: auto;
+ text: eval(cond(has_tag_key(ref), concat(tag(name), " (", tag(ref), ")"), tag(name)));
}
area[highway=services] {
fill-color: services#c0c0c0;
@@ -792,7 +737,6 @@ area[highway=services] {
node[highway=services] {
icon-image: "vehicle/services.svg";
set icon_z17;
- text: auto;
}
area[highway=rest_area] {
fill-color: services#c0c0c0;
@@ -800,12 +744,10 @@ area[highway=rest_area] {
node[highway=rest_area] {
icon-image: "vehicle/rest_area.svg";
set icon_z17;
- text: auto;
}
node[highway=ford], node[ford?] {
icon-image: "misc/ford.svg";
set icon_z17;
- text: auto;
}
way[ford?]::core_ford {
z-index: 1;
@@ -823,17 +765,14 @@ way[highway=platform] {
node[highway=turning_circle] {
icon-image: "vehicle/turning_circle.svg";
set icon_z17;
- text: auto;
}
node[highway=turning_loop] {
icon-image: "vehicle/turning_loop.svg";
set icon_z17;
- text: auto;
}
node[highway=passing_place] {
icon-image: "vehicle/passing_place.svg";
set icon_z17;
- text: auto;
}
area[highway=elevator] {
fill-color: elevator#a6bace;
@@ -841,7 +780,6 @@ area[highway=elevator] {
node[highway=elevator] {
icon-image: "service/elevator.svg";
set icon_z17;
- text: auto;
}
way[highway=construction] {
width: 2;
@@ -851,7 +789,6 @@ way[highway=construction] {
node[highway=construction] {
icon-image: "misc/construction.png";
set icon_z17;
- text: auto;
}
area[highway=emergency_access_point] {
fill-color: emergency_access_point#c0c0c0;
@@ -859,7 +796,6 @@ area[highway=emergency_access_point] {
node[highway=emergency_access_point] {
icon-image: "service/emergency_access_point.svg";
set icon_z17;
- text: auto;
}
node[highway=motorway], node[highway=motorway_link],
node[highway=trunk], node[highway=trunk_link],
@@ -882,7 +818,6 @@ node[highway=bus_guideway],
node[highway=platform] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/************************/
@@ -892,47 +827,38 @@ node[highway=platform] {
node[traffic_calming] {
icon-image: "vehicle/traffic_calming.svg";
set icon_z17;
- text: auto;
}
node[traffic_calming=chicane] {
icon-image: "vehicle/chicane.svg";
set icon_z17;
- text: auto;
}
node[traffic_calming=choker] {
icon-image: "vehicle/choker.svg";
set icon_z17;
- text: auto;
}
node[traffic_calming=island] {
icon-image: "vehicle/island.svg";
set icon_z17;
- text: auto;
}
node[traffic_calming=bump] {
icon-image: "vehicle/bump.svg";
set icon_z17;
- text: auto;
}
node[traffic_calming=hump] {
icon-image: "vehicle/hump.svg";
set icon_z17;
- text: auto;
}
node[traffic_calming=table] {
icon-image: "vehicle/table.svg";
set icon_z17;
- text: auto;
}
node[traffic_calming=cushion] {
icon-image: "vehicle/cushion.svg";
set icon_z17;
- text: auto;
}
node[traffic_calming=rumble_strip] {
icon-image: "vehicle/rumble_strip.svg";
set icon_z17;
- text: auto;
}
/****************/
/* junction tag */
@@ -941,7 +867,6 @@ node[traffic_calming=rumble_strip] {
node[junction=roundabout] {
icon-image: "vehicle/restriction/roundabout_left.svg";
set icon_z17;
- text: auto;
}
node:righthandtraffic[junction=roundabout] {
icon-image: "vehicle/restriction/roundabout_right.svg";
@@ -1104,7 +1029,6 @@ node[cycleway=track], node[cycleway=opposite_track],
node[cycleway=opposite] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/******************/
@@ -1208,27 +1132,22 @@ node[piste:type=snow_park] {
node[power=portal] {
icon-image: "power/portal.svg";
set icon_z17;
- text: auto;
}
node[power=tower] {
icon-image: "power/tower.svg";
set icon_z17;
- text: auto;
}
node[power=pole] {
icon-image: "power/pole.svg";
set icon_z17;
- text: auto;
}
node[power=pole][transformer=distribution] {
icon-image: "power/pole_transformer.svg";
set icon_z17;
- text: auto;
}
node[power=insulator] {
icon-image: "power/insulator.svg";
set icon_z17;
- text: auto;
}
way[power=portal],
way[power=line],
@@ -1248,7 +1167,6 @@ node[power=cable],
node[power=minor_line] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
area[power=plant],
area[power=substation],
@@ -1260,43 +1178,35 @@ area[power=generator] {
node[man_made=street_cabinet][street_cabinet=power] {
icon-image: "power/cable_distribution_cabinet.svg";
set icon_z17;
- text: auto;
}
node[power=generator] {
icon-image: "power/generator.svg";
set icon_z17;
- text: auto;
}
node[power=substation] {
icon-image: "power/substation.svg";
set icon_z17;
- text: auto;
}
node[power=transformer] {
icon-image: "power/transformer.svg";
set icon_z17;
- text: auto;
}
node[power=switchgear] {
icon-image: "power/switchgear.svg";
set icon_z17;
- text: auto;
}
node[power=switch] {
icon-image: "power/switch.svg";
set icon_z17;
- text: auto;
}
node[power=converter] {
icon-image: "power/converter.svg";
set icon_z17;
- text: auto;
}
node[power=compensator] {
icon-image: "power/compensator.svg";
set icon_z17;
- text: auto;
}
@@ -1326,12 +1236,10 @@ area[generator:source=waste] {
node[generator:source=nuclear] {
icon-image: "presets/power_source-nuclear.svg";
set icon_z17;
- text: auto;
}
node[generator:source=wind] {
icon-image: "presets/power_source-wind.svg";
set icon_z17;
- text: auto;
}
node[generator:source=hydro],
node[generator:source=tidal],
@@ -1339,51 +1247,42 @@ node[generator:source=wave],
node[generator:source=osmotic] {
icon-image: "presets/power_source-water.svg";
set icon_z17;
- text: auto;
}
node[generator:source=geothermal] {
icon-image: "presets/power_source-geothermal.svg";
set icon_z17;
- text: auto;
}
node[generator:source=solar] {
icon-image: "presets/power_source-sun.svg";
set icon_z17;
- text: auto;
}
node[generator:source=coal] {
icon-image: "presets/power_source-coal.svg";
set icon_z17;
- text: auto;
}
node[generator:source=gas] {
icon-image: "presets/power_source-gas.svg";
set icon_z17;
- text: auto;
}
node[generator:source=biomass],
node[generator:source=biofuel],
node[generator:source=biogas] {
icon-image: "presets/power_source-biofuel.svg";
set icon_z17;
- text: auto;
}
node[generator:source=oil],
node[generator:source=diesel],
node[generator:source=gasoline] {
icon-image: "presets/power_source-oil.svg";
set icon_z17;
- text: auto;
}
node[generator:source=waste] {
icon-image: "presets/power_source-waste.svg";
set icon_z17;
- text: auto;
}
node[power_source] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/*****************/
/* man_made tags */
@@ -1405,50 +1304,41 @@ area[man_made=mineshaft] {
node[man_made=beacon] {
icon-image: "misc/landmark/beacon.png";
set icon_z17;
- text: auto;
}
node[man_made=bridge] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
node[bridge:support] {
icon-image: "transport/bridge/bridge_support.svg";
set icon_z17;
- text: auto;
}
node[man_made=chimney] {
icon-image: "misc/landmark/chimney.png";
set icon_z17;
- text: auto;
}
node[man_made=flagpole] {
icon-image: "misc/flag.png";
set icon_z17;
- text: auto;
}
node[man_made=gasometer] {
icon-image: "presets/gasometer.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[man_made=silo] {
icon-image: "presets/silo.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[man_made=storage_tank] {
icon-image: "presets/storage_tank.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[man_made=bunker_silo] {
icon-image: "bunker_silo.svg";
set icon_z17;
- text: auto;
}
area[man_made=groyne]:closed {
fill-color: manmade#d8d8d8;
@@ -1467,17 +1357,14 @@ way[man_made=breakwater] {
node[man_made=lighthouse] {
icon-image: "misc/landmark/lighthouse.png";
set icon_z17;
- text: auto;
}
node[man_made=monitoring_station] {
icon-image: "misc/landmark/measurement_station.png";
set icon_z17;
- text: auto;
}
node[man_made=mineshaft] {
icon-image: "misc/landmark/mine.png";
set icon_z17;
- text: auto;
}
area[man_made=crane]:closed {
fill-color: manmade#d8d8d8;
@@ -1489,12 +1376,10 @@ way[man_made=crane] {
node[man_made=crane] {
icon-image: "misc/landmark/crane.png";
set icon_z17;
- text: auto;
}
node[man_made=adit] {
icon-image: "misc/landmark/adit.png";
set icon_z17;
- text: auto;
}
area[man_made=pier]:closed {
fill-color: pier#660000;
@@ -1506,7 +1391,6 @@ way[man_made=pier] {
node[man_made=pier] {
icon-image: "nautical/pier.svg";
set icon_z17;
- text: auto;
}
way[embankment?][!highway][!railway][!waterway],
way[man_made=embankment][!highway][!railway][!waterway] {
@@ -1530,12 +1414,10 @@ way[man_made=pipeline] {
node[pipeline=marker] {
icon-image: "misc/pipeline_marker.svg";
set icon_z17;
- text: auto;
}
node[pipeline=valve] {
icon-image: "misc/valve.svg";
set icon_z17;
- text: auto;
}
node[man_made=breakwater],
node[man_made=groyne],
@@ -1543,12 +1425,10 @@ node[man_made=embankment],
node[man_made=pipeline] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
node[man_made=petroleum_well][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
area[man_made=reservoir_covered],
area[man_made=surveillance],
@@ -1565,58 +1445,47 @@ area[man_made=water_works] {
node[man_made=reservoir_covered] {
icon-image: "misc/landmark/reservoir_covered.png";
set icon_z17;
- text: auto;
}
node[man_made=surveillance] {
icon-image: "presets/surveillance.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[man_made=survey_point] {
icon-image: "misc/landmark/survey_point.png";
set icon_z17;
- text: auto;
}
node[man_made=tower] {
icon-image: "misc/landmark/tower.png";
set icon_z17;
- text: auto;
}
node[man_made=wastewater_plant] {
icon-image: "misc/landmark/wastewater_plant.png";
set icon_z17;
- text: auto;
}
node[man_made=watermill] {
icon-image: "misc/landmark/watermill.png";
set icon_z17;
- text: auto;
}
node[man_made=water_tower] {
icon-image: "misc/landmark/water_tower.svg";
set icon_z17;
- text: auto;
}
node[man_made=water_well] {
icon-image: "misc/landmark/water_well.png";
set icon_z17;
- text: auto;
}
node[man_made=windmill] {
icon-image: "misc/landmark/windmill.png";
set icon_z17;
- text: auto;
}
node[man_made=works] {
icon-image: "misc/landmark/works.png";
set icon_z17;
- text: auto;
}
node[man_made=water_works] {
icon-image: "misc/landmark/water_works.png";
set icon_z17;
- text: auto;
}
way[man_made=cutline] {
width: 2;
@@ -1625,7 +1494,6 @@ way[man_made=cutline] {
node[man_made=cutline] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/***************/
@@ -1659,112 +1527,90 @@ area[office=telecommunication] {
node[office=accountant] {
icon-image: "styles/standard/office/accountant.svg";
set icon_z17;
- text: auto;
}
node[office=administrative] {
icon-image: "styles/standard/office/administrative.svg";
set icon_z17;
- text: auto;
}
node[office=advertising_agency] {
icon-image: "styles/standard/office/advertising_agency.svg";
set icon_z17;
- text: auto;
}
node[office=architect] {
icon-image: "styles/standard/office/architect.svg";
set icon_z17;
- text: auto;
}
node[office=association] {
icon-image: "styles/standard/office/association.svg";
set icon_z17;
- text: auto;
}
node[office=company] {
icon-image: "styles/standard/office/private_company.svg";
set icon_z17;
- text: auto;
}
node[office=educational_institution] {
icon-image: "styles/standard/office/educational_institution.svg";
set icon_z17;
- text: auto;
}
node[office=employment_agency] {
icon-image: "styles/standard/office/employment_agency.svg";
set icon_z17;
- text: auto;
}
node[office=estate_agent] {
icon-image: "styles/standard/office/real_state.svg";
set icon_z17;
- text: auto;
}
node[office=foundation] {
icon-image: "styles/standard/office/foundation.svg";
set icon_z17;
- text: auto;
}
node[office=insurance] {
icon-image: "styles/standard/office/insurance.svg";
set icon_z17;
- text: auto;
}
node[office=it] {
icon-image: "styles/standard/office/it.svg";
set icon_z17;
- text: auto;
}
node[office=lawyer] {
icon-image: "styles/standard/office/lawyer.svg";
set icon_z17;
- text: auto;
}
node[office=newspaper] {
icon-image: "styles/standard/office/newspaper.svg";
set icon_z17;
- text: auto;
}
node[office=ngo] {
icon-image: "styles/standard/office/ong.svg";
set icon_z17;
- text: auto;
}
node[office=notary] {
icon-image: "styles/standard/office/notary.svg";
set icon_z17;
- text: auto;
}
node[office=political_party] {
icon-image: "styles/standard/office/political_party.svg";
set icon_z17;
- text: auto;
}
node[office=religion] {
icon-image: "styles/standard/office/religion.svg";
set icon_z17;
- text: auto;
}
node[office=research] {
icon-image: "styles/standard/office/research.svg";
set icon_z17;
- text: auto;
}
node[office=tax_advisor] {
icon-image: "styles/standard/office/tax_advisor.svg";
set icon_z17;
- text: auto;
}
node[office=telecommunication] {
icon-image: "styles/standard/office/telecommunication.svg";
set icon_z17;
- text: auto;
}
node[office=government] {
icon-image: "styles/standard/office/government.svg";
set icon_z17;
- text: auto;
}
/****************/
@@ -1780,23 +1626,19 @@ area[leisure=water_park] {
node[leisure=sports_centre] {
icon-image: "sport/centre.png";
set icon_z17;
- text: auto;
}
node[leisure=stadium] {
icon-image: "sport/stadium.png";
set icon_z17;
- text: auto;
}
node[leisure=horse_riding] {
icon-image: "presets/equestrian.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[leisure=water_park] {
icon-image: "leisure/water_park.png";
set icon_z17;
- text: auto;
}
area[leisure=track][!area?!]:closed {
fill-color: leisuretrack#d4f4b9;
@@ -1808,7 +1650,6 @@ way[leisure=track] {
node[leisure=track] {
icon-image: "sport/track.png";
set icon_z17;
- text: auto;
}
area[leisure=pitch] {
fill-color: pitch#baee8d;
@@ -1816,7 +1657,6 @@ area[leisure=pitch] {
node[leisure=pitch] {
icon-image: "sport/pitch.png";
set icon_z17;
- text: auto;
}
area[leisure=marina] {
fill-color: marina#0070cf;
@@ -1824,7 +1664,6 @@ area[leisure=marina] {
node[leisure=marina] {
icon-image: "nautical/marina.png";
set icon_z17;
- text: auto;
}
way[leisure=slipway] {
width: 2;
@@ -1833,9 +1672,9 @@ way[leisure=slipway] {
node[leisure=slipway] {
icon-image: "nautical/slipway.png";
set icon_z17;
- text: auto;
}
area[leisure=fishing],
+area[leisure=bird_hide],
area[leisure=nature_reserve],
area[leisure=park],
area[leisure=playground],
@@ -1847,42 +1686,38 @@ area[leisure=firepit] {
node[leisure=fishing] {
icon-image: "sport/fishing.png";
set icon_z17;
- text: auto;
+}
+node[leisure=bird_hide] {
+ icon-image: "leisure/bird_hide.svg";
+ set icon_z17;
}
node[leisure=nature_reserve] {
icon-image: "leisure/nature_reserve.png";
set icon_z17;
- text: auto;
}
node[leisure=park] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
node[leisure=playground] {
icon-image: "leisure/playground.png";
set icon_z17;
- text: auto;
}
node[leisure=garden] {
icon-image: "leisure/garden.png";
set icon_z17;
- text: auto;
}
node[leisure=common] {
icon-image: "leisure/common.png";
set icon_z17;
- text: auto;
}
node[leisure=firepit] {
icon-image: "leisure/firepit.svg";
- set icon_z17;
- text: auto;
+ set icon_z17;
}
node[leisure=picnic_table] {
icon-image: "leisure/picnic.png";
set icon_z17;
- text: auto;
}
area[leisure=swimming_pool] {
fill-color: swimming_pool#51c4ef;
@@ -1890,7 +1725,6 @@ area[leisure=swimming_pool] {
node[leisure=swimming_pool] {
icon-image: "sport/pool.png";
set icon_z17;
- text: auto;
}
area[leisure=fitness_station],
area[leisure=miniature_golf],
@@ -1902,28 +1736,23 @@ area[leisure=sauna] {
node[leisure=fitness_station] {
icon-image: "leisure/fitness_station.svg";
set icon_z17;
- text: auto;
}
node[leisure=miniature_golf] {
icon-image: "sport/miniature_golf.svg";
set icon_z17;
- text: auto;
}
node[leisure=dog_park] {
icon-image: "presets/dogpark.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[leisure=ice_rink] {
icon-image: "sport/ice_hockey.png";
set icon_z17;
- text: auto;
}
node[leisure=sauna] {
icon-image: "leisure/sauna.png";
set icon_z17;
- text: auto;
}
area[leisure=golf_course] {
fill-color: leisure#c7f1a3;
@@ -1931,7 +1760,6 @@ area[leisure=golf_course] {
node[leisure=golf_course] {
icon-image: "sport/golf/golf.svg";
set icon_z17;
- text: auto;
}
/*************/
@@ -1943,7 +1771,6 @@ area[golf=tee] {
node[golf=tee] {
icon-image: "sport/golf/tee.svg";
set icon_z17;
- text: auto;
}
way[golf=hole] {
width: 1;
@@ -1953,7 +1780,6 @@ way[golf=hole] {
node[golf=pin] {
icon-image: "sport/golf/pin.svg";
set icon_z17;
- text: auto;
}
area[golf=bunker] {
fill-color: golf_bunker#ffab00;
@@ -1977,7 +1803,6 @@ area[golf=driving_range] {
node[golf=driving_range] {
icon-image: "sport/golf/driving_range.svg";
set icon_z17;
- text: auto;
}
/********************/
@@ -1987,12 +1812,10 @@ node[golf=driving_range] {
node[advertising=column] {
icon-image: "leisure/advertising_column.svg";
set icon_z17;
- text: auto;
}
node[advertising=billboard] {
icon-image: "leisure/billboard.svg";
set icon_z17;
- text: auto;
}
/*************/
@@ -2090,426 +1913,342 @@ area[shop=bag] {
node[shop=supermarket] {
icon-image: "shop/supermarket.svg";
set icon_z17;
- text: auto;
}
node[shop=convenience] {
icon-image: "shop/convenience.png";
set icon_z17;
- text: auto;
}
node[shop=bakery] {
icon-image: "shop/groceries/bakery.png";
set icon_z17;
- text: auto;
}
node[shop=butcher] {
icon-image: "shop/groceries/butcher.png";
set icon_z17;
- text: auto;
}
node[shop=bicycle] {
icon-image: "sport/bicycle.png";
set icon_z17;
- text: auto;
}
node[shop=doityourself] {
icon-image: "shop/diy_store.png";
set icon_z17;
- text: auto;
}
node[shop=dry_cleaning],
node[shop=laundry] {
icon-image: "shop/laundry.png";
set icon_z17;
- text: auto;
}
node[shop=outdoor] {
icon-image: "shop/outdoor.png";
set icon_z17;
- text: auto;
}
node[shop=kiosk] {
icon-image: "shop/kiosk.png";
set icon_z17;
- text: auto;
}
node[shop=beverages] {
icon-image: "shop/beverages.png";
set icon_z17;
- text: auto;
}
node[shop=alcohol] {
icon-image: "shop/alcohol.png";
set icon_z17;
- text: auto;
}
node[shop=books] {
icon-image: "shop/book.svg";
set icon_z17;
- text: auto;
}
node[shop=boutique] {
icon-image: "shop/boutique.png";
set icon_z17;
- text: auto;
}
node[shop=car],
node[shop=car_dealer] {
icon-image: "vehicle.png";
set icon_z17;
- text: auto;
}
node[shop=car_repair] {
icon-image: "vehicle/repair_shop.png";
set icon_z17;
- text: auto;
}
node[shop=tyres] {
icon-image: "vehicle/tyres.png";
set icon_z17;
- text: auto;
}
node[shop=chemist] {
icon-image: "shop/chemist.png";
set icon_z17;
- text: auto;
}
node[shop=tobacco] {
icon-image: "shop/tobacco.svg";
set icon_z17;
- text: auto;
}
node[shop=clothes] {
icon-image: "shop/clothes.png";
set icon_z17;
- text: auto;
}
node[shop=computer] {
icon-image: "shop/computer.png";
set icon_z17;
- text: auto;
}
node[shop=confectionery] {
icon-image: "shop/groceries/confectionery.png";
set icon_z17;
- text: auto;
}
node[shop=copyshop] {
icon-image: "shop/copyshop.png";
set icon_z17;
- text: auto;
}
node[shop=curtain] {
icon-image: "shop/curtain.png";
set icon_z17;
- text: auto;
}
node[shop=cycle_repair] {
icon-image: "sport/bicycle.png";
set icon_z17;
- text: auto;
}
node[shop=department_store] {
icon-image: "shop/mall.png";
set icon_z17;
- text: auto;
}
node[shop=deli] {
icon-image: "shop/groceries/deli.png";
set icon_z17;
- text: auto;
}
node[shop=electronics] {
icon-image: "shop/electronics.png";
set icon_z17;
- text: auto;
}
node[shop=erotic] {
icon-image: "shop/erotic.png";
set icon_z17;
- text: auto;
}
node[shop=furniture] {
icon-image: "shop/furniture.png";
set icon_z17;
- text: auto;
}
node[shop=fabric] {
icon-image: "shop/fabric.png";
set icon_z17;
- text: auto;
}
node[shop=florist] {
icon-image: "shop/florist.png";
set icon_z17;
- text: auto;
}
node[shop=frame] {
icon-image: "shop/frame.png";
set icon_z17;
- text: auto;
}
node[shop=gift] {
icon-image: "presets/present.svg";
set icon_z17;
- text: auto;
}
node[shop=greengrocer] {
icon-image: "shop/groceries/greengrocer.png";
set icon_z17;
- text: auto;
}
node[shop=garden_centre] {
icon-image: "shop/garden_centre.png";
set icon_z17;
- text: auto;
}
node[shop=hairdresser] {
icon-image: "shop/hairdresser.png";
set icon_z17;
- text: auto;
}
node[shop=hardware] {
icon-image: "shop/hardware.png";
set icon_z17;
- text: auto;
}
node[shop=hearing_aids] {
icon-image: "shop/hearing_aids.png";
set icon_z17;
- text: auto;
}
node[shop=hifi] {
icon-image: "shop/hifi.svg";
set icon_z17;
- text: auto;
}
node[shop=houseware] {
icon-image: "shop/houseware.svg";
set icon_z17;
- text: auto;
}
node[shop=jewelry] {
icon-image: "shop/jewelry.png";
set icon_z17;
- text: auto;
}
node[shop=kitchen] {
icon-image: "shop/kitchen.png";
set icon_z17;
- text: auto;
}
node[shop=mall] {
icon-image: "shop/mall.png";
set icon_z17;
- text: auto;
}
node[shop=mobile_phone] {
icon-image: "shop/mobile_phone.png";
set icon_z17;
- text: auto;
}
node[shop=motorcycle] {
icon-image: "vehicle/motorbike.png";
set icon_z17;
- text: auto;
}
node[shop=musical_instrument] {
icon-image: "shop/musical_instrument.png";
set icon_z17;
- text: auto;
}
node[shop=newsagent] {
icon-image: "shop/news.svg";
set icon_z17;
- text: auto;
}
node[shop=optician] {
icon-image: "shop/optician.svg";
set icon_z17;
- text: auto;
}
node[shop=medical_supply] {
icon-image: "shop/medical_supply.svg";
set icon_z17;
- text: auto;
}
node[shop=paint] {
icon-image: "shop/paint.png";
set icon_z17;
- text: auto;
}
node[shop=pawnbroker] {
icon-image: "presets/pawnbroker.svg";
set icon_z17;
- text: auto;
}
node[shop=seafood] {
icon-image: "shop/groceries/seafood.png";
set icon_z17;
- text: auto;
}
node[shop=shoes] {
icon-image: "shop/shoes.png";
set icon_z17;
- text: auto;
}
node[shop=sports] {
icon-image: "sport/multi.png";
set icon_z17;
- text: auto;
}
node[shop=stationery] {
icon-image: "shop/stationery.png";
set icon_z17;
- text: auto;
}
node[shop=tailor] {
icon-image: "shop/tailor.png";
set icon_z17;
- text: auto;
}
node[shop=travel_agency] {
icon-image: "presets/travel.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[shop=toys] {
icon-image: "shop/toys.png";
set icon_z17;
- text: auto;
}
node[shop=vacuum_cleaner] {
icon-image: "shop/vacuum_cleaner.png";
set icon_z17;
- text: auto;
}
node[shop=variety_store] {
icon-image: "shop/variety_store.png";
set icon_z17;
- text: auto;
}
node[shop=video] {
icon-image: "shop/video.png";
set icon_z17;
- text: auto;
}
node[shop=bookmaker] {
icon-image: "presets/lottery.svg";
set icon_z17;
- text: auto;
}
node[shop=lottery] {
icon-image: "presets/lottery.svg";
set icon_z17;
- text: auto;
}
/* duplicate of shopping_centre? */
node[shop=shopping_centre] {
icon-image: "shop/mall.png";
set icon_z17;
- text: auto;
}
node[shop=pet] {
icon-image: "shop/pet.svg";
set icon_z17;
- text: auto;
}
node[shop=photo] {
icon-image: "shop/photo.svg";
set icon_z17;
- text: auto;
}
node[shop=ticket] {
icon-image: "shop/ticket.svg";
set icon_z17;
- text: auto;
}
node[shop=interior_decoration] {
icon-image: "shop/interior_decoration.svg";
set icon_z17;
- text: auto;
}
node[shop=car_parts] {
icon-image: "vehicle/car_parts.svg";
set icon_z17;
- text: auto;
}
node[shop=video_games] {
icon-image: "shop/video_games.png";
set icon_z17;
- text: auto;
}
node[shop=bed] {
icon-image: "shop/bed.svg";
set icon_z17;
- text: auto;
}
node[shop=beauty] {
icon-image: "shop/beauty.svg";
set icon_z17;
- text: auto;
}
node[shop=cosmetics] {
icon-image: "shop/cosmetics.svg";
set icon_z17;
- text: auto;
}
node[shop=perfumery] {
icon-image: "shop/perfumery.svg";
set icon_z17;
- text: auto;
}
node[shop=tea] {
icon-image: "shop/groceries/tea.svg";
set icon_z17;
- text: auto;
}
node[shop=coffee] {
icon-image: "shop/groceries/coffee.svg";
set icon_z17;
- text: auto;
}
node[shop=antiques] {
icon-image: "shop/antique.svg";
set icon_z17;
- text: auto;
}
node[shop=music] {
icon-image: "shop/music.svg";
set icon_z17;
- text: auto;
}
node[shop=funeral_directors] {
icon-image: "shop/funeral_directors.svg";
set icon_z17;
- text: auto;
}
node[shop=wine] {
icon-image: "shop/wine.svg";
set icon_z17;
- text: auto;
}
node[shop=farm] {
icon-image: "presets/apple.png";
set icon_z17;
- text: auto;
}
node[shop=tattoo] {
icon-image: "shop/tattoo.svg";
set icon_z17;
- text: auto;
}
node[shop=art] {
icon-image: "shop/art.svg";
set icon_z17;
- text: auto;
}
node[shop=bag] {
icon-image: "shop/bag.svg";
set icon_z17;
- text: auto;
}
/******************/
@@ -2522,47 +2261,38 @@ area[emergency=water_tank] {
node[emergency=ambulance_station] {
icon-image: "emergency/ambulance_station.svg";
set icon_z17;
- text: auto;
}
node[emergency=water_tank] {
icon-image: "emergency/water_tank.svg";
set icon_z17;
- text: auto;
}
node[emergency=phone] {
icon-image: "vehicle/emergency_phone.png";
set icon_z17;
- text: auto;
}
node[emergency=defibrillator] {
icon-image: "presets/aed.svg";
set icon_z17;
- text: auto;
}
node[emergency=fire_hydrant] {
icon-image: "service/fire_hydrant.png";
set icon_z17;
- text: auto;
}
node[emergency=fire_extinguisher] {
icon-image: "emergency/fire_extinguisher.svg";
set icon_z17;
- text: auto;
}
node[emergency=fire_hose] {
icon-image: "emergency/fire_hose.svg";
set icon_z17;
- text: auto;
}
node[emergency=assembly_point] {
icon-image: "emergency/assembly_point.svg";
set icon_z17;
- text: auto;
}
node[emergency=siren] {
icon-image: "emergency/siren.svg";
set icon_z17;
- text: auto;
}
/****************/
@@ -2586,62 +2316,50 @@ area[amenity=ice_cream] {
node[amenity=pub] {
icon-image: "food/pub.png";
set icon_z17;
- text: auto;
}
node[amenity=biergarten] {
icon-image: "food/biergarten.png";
set icon_z17;
- text: auto;
}
node[amenity=nightclub] {
icon-image: "leisure/discoball.svg";
set icon_z17;
- text: auto;
}
node[amenity=stripclub] {
icon-image: "leisure/nightclub.png";
set icon_z17;
- text: auto;
}
node[amenity=casino] {
icon-image: "leisure/casino.svg";
set icon_z17;
- text: auto;
}
node[amenity=brothel] {
icon-image: "leisure/stripclub.png";
set icon_z17;
- text: auto;
}
node[amenity=cafe] {
icon-image: "food/cafe.png";
set icon_z17;
- text: auto;
}
node[amenity=restaurant] {
icon-image: "food/restaurant.svg";
set icon_z17;
- text: auto;
}
node[amenity=food_court] {
icon-image: "food/restaurant.png";
set icon_z17;
- text: auto;
}
node[amenity=fast_food] {
icon-image: "food/fastfood.png";
set icon_z17;
- text: auto;
}
node[amenity=bar] {
icon-image: "food/bar.png";
set icon_z17;
- text: auto;
}
node[amenity=ice_cream] {
icon-image: "food/icecream.png";
set icon_z17;
- text: auto;
}
area[amenity=bicycle_parking]:closed {
fill-color: amenity_traffic#f7efb7;
@@ -2665,104 +2383,84 @@ area[amenity=fuel] {
node[amenity=parking_space] {
icon-image: "vehicle/parking/parking_space.svg";
set icon_z17;
- text: auto;
}
node[amenity=parking] {
icon-image: "vehicle/parking.png";
set icon_z17;
- text: auto;
}
node[amenity=parking_entrance] {
icon-image: "vehicle/parking.png";
set icon_z17;
- text: auto;
}
node[amenity=parking_entrance][parking=multi-storey],
node[amenity=parking][parking=multi-storey] {
icon-image: "vehicle/parking/multi-storey.png";
set icon_z17;
- text: auto;
}
node[amenity=parking_entrance][parking=underground],
node[amenity=parking][parking=underground] {
icon-image: "vehicle/parking/underground.png";
set icon_z17;
- text: auto;
}
node[amenity=motorcycle_parking] {
icon-image: "vehicle/parking/motorbike.png";
set icon_z17;
- text: auto;
}
node[amenity=bicycle_parking] {
icon-image: "vehicle/parking/bicycle.png";
set icon_z17;
- text: auto;
}
node[park_ride][park_ride!=no] {
icon-image: "vehicle/parking/park_ride.svg";
set icon_z17;
- text: auto;
}
node[amenity=parking_space][wheelchair?] {
icon-image: "vehicle/parking/handicapped.png";
set icon_z17;
- text: auto;
}
node[amenity=bicycle_rental] {
icon-image: "vehicle/rental/bicycle.png";
set icon_z17;
- text: auto;
}
node[amenity=bicycle_repair_station] {
icon-image: "vehicle/bicycle_repair_station.svg";
set icon_z17;
- text: auto;
}
node[amenity=car_rental] {
icon-image: "vehicle/rental/car.png";
set icon_z17;
- text: auto;
}
node[amenity=car_sharing] {
icon-image: "vehicle/car_sharing.png";
set icon_z17;
- text: auto;
}
node[amenity=car_wash] {
icon-image: "vehicle/car_wash.png";
set icon_z17;
- text: auto;
}
node[amenity=taxi] {
icon-image: "transport/taxi.png";
set icon_z17;
- text: auto;
}
node[amenity=fuel] {
icon-image: "vehicle/fuel.png";
set icon_z17;
- text: auto;
}
node[amenity=charging_station] {
icon-image: "vehicle/fuel/charging_station.png";
set icon_z17;
- text: auto;
}
node[amenity=grit_bin] {
icon-image: "misc/grit_bin.svg";
set icon_z17;
- text: auto;
}
node[amenity=telephone] {
icon-image: "service/telephone.png";
set icon_z17;
- text: auto;
}
node[amenity=clock] {
icon-image: "service/clock.svg";
set icon_z17;
- text: auto;
}
area[amenity=toilets],
area[amenity=shower],
@@ -2773,17 +2471,14 @@ area[amenity=sanitary_dump_station] {
node[amenity=toilets] {
icon-image: "service/toilets.png";
set icon_z17;
- text: auto;
}
node[amenity=shower] {
icon-image: "service/shower.svg";
- set icon_z17;
- text: auto;
+ set icon_z17;
}
node[amenity=recycling] {
icon-image: "service/recycling/recycling.svg";
set icon_z17;
- text: auto;
}
node[amenity=recycling][recycling_type=container] {
icon-image: "service/recycling/recycling_container.svg";
@@ -2794,43 +2489,31 @@ node[amenity=recycling][recycling_type=centre] {
node[amenity=waste_basket] {
icon-image: "service/recycling/trash-bin.png";
set icon_z17;
- text: auto;
}
node[amenity=waste_disposal] {
icon-image: "service/recycling/waste_disposal.png";
set icon_z17;
- text: auto;
}
node[amenity=sanitary_dump_station] {
icon-image: "service/recycling/sanitary_dump_station.svg";
set icon_z17;
- text: auto;
}
-area[amenity=public_building],
area[amenity=townhall],
area[amenity=embassy],
area[amenity=community_centre] {
fill-color: amenity_light#f7efb7;
}
-node[amenity=public_building] {
- icon-image: "service.png";
- set icon_z17;
- text: auto;
-}
node[amenity=townhall] {
icon-image: "presets/townhall.png";
set icon_z17;
- text: auto;
}
node[amenity=embassy] {
icon-image: "service/administration/embassy.png";
set icon_z17;
- text: auto;
}
node[amenity=community_centre] {
icon-image: "service/community_centre.png";
set icon_z17;
- text: auto;
}
area[amenity=water_point],
area[amenity=fountain] {
@@ -2839,17 +2522,14 @@ area[amenity=fountain] {
node[amenity=drinking_water] {
icon-image: "food/drinking_water.png";
set icon_z17;
- text: auto;
}
node[amenity=water_point] {
icon-image: "accommodation/camping/water.png";
set icon_z17;
- text: auto;
}
node[amenity=fountain] {
icon-image: "misc/fountain.png";
set icon_z17;
- text: auto;
}
area[amenity=place_of_worship],
area[amenity=grave_yard],
@@ -2866,122 +2546,98 @@ area[amenity=driving_school] {
node[amenity=place_of_worship] {
icon-image: "religion.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=bahai] {
icon-image: "religion/bahai.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=buddhist] {
icon-image: "religion/buddhism.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=christian] {
icon-image: "religion/church.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=hindu] {
icon-image: "religion/hinduism.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=jain] {
icon-image: "religion/jainism.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=jewish] {
icon-image: "religion/jewish.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=muslim] {
icon-image: "religion/muslim.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=sikh] {
icon-image: "religion/sikhism.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=shinto] {
icon-image: "religion/shinto.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=taoist] {
icon-image: "religion/taoism.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[amenity=grave_yard] {
icon-image: "rendering/landuse/cemetery.png";
set icon_z17;
- text: auto;
}
node[amenity=crematorium][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[amenity=post_office] {
icon-image: "service/post_office.png";
set icon_z17;
- text: auto;
}
node[amenity=post_box] {
icon-image: "service/post_box.png";
set icon_z17;
- text: auto;
}
node[amenity=studio] {
icon-image: "service/studio.png";
set icon_z17;
- text: auto;
}
node[amenity=school] {
icon-image: "education/school.png";
set icon_z17;
- text: auto;
}
node[amenity=university] {
icon-image: "education/university.png";
set icon_z17;
- text: auto;
}
node[amenity=college] {
icon-image: "education/college.png";
set icon_z17;
- text: auto;
}
node[amenity=kindergarten] {
icon-image: "education/kindergarten.png";
set icon_z17;
- text: auto;
}
node[amenity=driving_school] {
icon-image: "education/driving_school.png";
set icon_z17;
- text: auto;
}
area[amenity=pharmacy],
area[amenity=hospital],
@@ -2997,67 +2653,54 @@ area[amenity=veterinary] {
node[amenity=pharmacy] {
icon-image: "health/pharmacy.svg";
set icon_z17;
- text: auto;
}
node[amenity=hospital] {
icon-image: "health/hospital.svg";
set icon_z17;
- text: auto;
}
node[amenity=clinic] {
icon-image: "health/clinic.svg";
set icon_z17;
- text: auto;
}
node[amenity=nursing_home] {
icon-image: "social_facility/nursing_home.svg";
set icon_z17;
- text: auto;
}
node[amenity=social_facility][social_facility=group_home] {
icon-image: "social_facility/group_home.svg";
set icon_z17;
- text: auto;
}
node[amenity=social_facility][social_facility=assisted_living] {
icon-image: "social_facility/assisted_living.svg";
set icon_z17;
- text: auto;
}
node[amenity=social_facility][social_facility=outreach] {
icon-image: "social_facility/outreach.svg";
set icon_z17;
- text: auto;
}
node[amenity=social_facility][social_facility=shelter] {
icon-image: "social_facility/shelter.svg";
set icon_z17;
- text: auto;
}
node[amenity=social_facility][social_facility=food_bank] {
icon-image: "social_facility/food_bank.svg";
set icon_z17;
- text: auto;
}
node[amenity=baby_hatch] {
icon-image: "health/baby_hatch.svg";
set icon_z17;
- text: auto;
}
node[amenity=doctors] {
icon-image: "health/doctors.svg";
set icon_z17;
- text: auto;
}
node[amenity=dentist] {
icon-image: "health/dentist.svg";
set icon_z17;
- text: auto;
}
node[amenity=veterinary] {
icon-image: "health/veterinary.svg";
set icon_z17;
- text: auto;
}
area[amenity=library],
area[amenity=police],
@@ -3078,74 +2721,60 @@ area[amenity=bbq] {
node[amenity=library] {
icon-image: "shop/library.png";
set icon_z17;
- text: auto;
}
node[amenity=police] {
icon-image: "service/police.png";
set icon_z17;
- text: auto;
}
node[amenity=ranger_station] {
icon-image: "service/ranger_station.svg";
set icon_z17;
- text: auto;
}
node[amenity=fire_station] {
icon-image: "service/firebrigade.png";
set icon_z17;
- text: auto;
}
node[amenity=bus_station] {
icon-image: "transport/bus.png";
set icon_z17;
- text: auto;
}
node[amenity=ferry_terminal] {
icon-image: "nautical/ferry.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[amenity=theatre] {
icon-image: "presets/theater.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[amenity=cinema] {
icon-image: "leisure/cinema.png";
set icon_z17;
- text: auto;
}
node[amenity=arts_centre] {
icon-image: "service/arts_centre.png";
set icon_z17;
- text: auto;
}
node[amenity=courthouse] {
icon-image: "service/administration/courthouse.svg";
set icon_z17;
- text: auto;
}
node[amenity=prison] {
icon-image: "service/administration/prison.svg";
set icon_z17;
- text: auto;
}
node[amenity=bank] {
icon-image: "money/bank.png";
set icon_z17;
- text: auto;
}
node[amenity=bureau_de_change] {
icon-image: "money/exchange.png";
set icon_z17;
- text: auto;
}
node[amenity=atm] {
icon-image: "money/atm.png";
set icon_z17;
- text: auto;
}
way[amenity=bench] {
width: 2;
@@ -3154,17 +2783,14 @@ way[amenity=bench] {
node[amenity=bench] {
icon-image: "leisure/bench.png";
set icon_z17;
- text: auto;
}
node[amenity=bbq] {
icon-image: "leisure/bbq.png";
set icon_z17;
- text: auto;
}
node[amenity=compressed_air] {
icon-image: "vehicle/compressed_air.svg";
set icon_z17;
- text: auto;
}
area[amenity=shelter],
area[amenity=marketplace],
@@ -3174,42 +2800,34 @@ area[amenity=wlan] {
node[amenity=shelter] {
icon-image: "accommodation/shelter.png";
set icon_z17;
- text: auto;
}
node[amenity=shelter][shelter_type=public_transport] {
icon-image: "accommodation/shelter_public_transport_brown.png";
set icon_z17;
- text: auto;
}
node[amenity=shelter][shelter_type=picnic_shelter] {
icon-image: "accommodation/shelter_picnic_brown.png";
set icon_z17;
- text: auto;
}
node[amenity=shelter][shelter_type=basic_hut] {
icon-image: "accommodation/basic_hut_blue.png";
set icon_z17;
- text: auto;
}
node[amenity=shelter][shelter_type=lean_to] {
icon-image: "accommodation/shelter_lean_to.svg";
set icon_z17;
- text: auto;
}
node[amenity=hunting_stand] {
icon-image: "hunting_stand.png";
set icon_z17;
- text: auto;
}
node[amenity=marketplace] {
icon-image: "place/marketplace.png";
set icon_z17;
- text: auto;
}
node[amenity=wlan] {
icon-image: "wlan.png";
set icon_z17;
- text: auto;
}
node[amenity=vending_machine] {
icon-image: "transport/ticket-machine.png";
@@ -3218,7 +2836,6 @@ node[amenity=vending_machine] {
node[vending=excrement_bags] {
icon-image: "service/excrement_bags.png";
set icon_z17;
- text: auto;
}
/**************/
@@ -3254,121 +2871,97 @@ area[craft=tiler] {
node[craft=carpenter][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=shoemaker][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=photographer][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=metal_construction][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}node[craft=electrician][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=brewery][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=plumber] {
icon-image: "craft/plumber.png";
set icon_z17;
- text: auto;
}
node[craft=sawmill][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=gardener][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=winery][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=hvac][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=painter] {
icon-image: "craft/painter.png";
set icon_z17;
- text: auto;
}
node[craft=stonemason][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=handicraft][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=pottery] {
icon-image: "craft/pottery.png";
set icon_z17;
- text: auto;
}
node[craft=key_cutter][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=caterer][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=roofer][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=beekeeper][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=blacksmith][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=locksmith][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=window_construction] {
icon-image: "craft/window_construction.png";
set icon_z17;
- text: auto;
}
node[craft=upholsterer][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[craft=tiler] {
icon-image: "craft/tiler.png";
set icon_z17;
- text: auto;
}
/****************/
@@ -3389,47 +2982,38 @@ area[tourism=caravan_site] {
node[tourism=hotel] {
icon-image: "accommodation/hotel.svg";
set icon_z17;
- text: auto;
}
node[tourism=motel] {
icon-image: "accommodation/motel.svg";
set icon_z17;
- text: auto;
}
node[tourism=guest_house] {
icon-image: "accommodation/guest_house.png";
set icon_z17;
- text: auto;
}
node[tourism=hostel] {
icon-image: "accommodation/hostel.svg";
set icon_z17;
- text: auto;
}
node[tourism=chalet] {
icon-image: "accommodation/chalet.png";
set icon_z17;
- text: auto;
}
node[tourism=alpine_hut] {
icon-image: "accommodation/alpine_hut_blue.png";
set icon_z17;
- text: auto;
}
node[tourism=wilderness_hut] {
icon-image: "accommodation/wilderness_hut_blue.png";
set icon_z17;
- text: auto;
}
node[tourism=camp_site] {
icon-image: "accommodation/camping.png";
set icon_z17;
- text: auto;
}
node[tourism=caravan_site] {
icon-image: "accommodation/camping/caravan.png";
set icon_z17;
- text: auto;
}
area[tourism=picnic_site],
area[tourism=viewpoint],
@@ -3442,27 +3026,22 @@ area[tourism=museum] {
node[tourism=picnic_site] {
icon-image: "leisure/picnic.png";
set icon_z17;
- text: auto;
}
node[tourism=viewpoint] {
icon-image: "sightseeing/viewpoint.png";
set icon_z17;
- text: auto;
}
node[tourism=theme_park] {
icon-image: "leisure/theme_park.png";
set icon_z17;
- text: auto;
}
node[tourism=attraction] {
icon-image: "sightseeing.png";
set icon_z17;
- text: auto;
}
node[tourism=zoo] {
icon-image: "leisure/zoo.png";
set icon_z17;
- text: auto;
}
area[tourism=artwork]:closed {
fill-color: tourism#e180a2;
@@ -3474,12 +3053,10 @@ way[tourism=artwork] {
node[tourism=artwork] {
icon-image: "service/arts_centre.png";
set icon_z17;
- text: auto;
}
node[tourism=museum] {
icon-image: "sightseeing/museum.svg";
set icon_z17;
- text: auto;
}
/********************/
@@ -3492,12 +3069,10 @@ area[tourism=information] {
node[tourism=information] {
icon-image: "misc/information.png";
set icon_z17;
- text: auto;
}
node[tourism=information][information=guidepost] {
icon-image: "misc/information/guidepost.png";
set icon_z17;
- text: auto;
}
area[tourism=information][information=office] {
fill-color: tourism#e180a2;
@@ -3505,17 +3080,14 @@ area[tourism=information][information=office] {
node[tourism=information][information=office] {
icon-image: "misc/information/informationoffice.png";
set icon_z17;
- text: auto;
}
node[tourism=information][information=map] {
icon-image: "misc/information/map.png";
set icon_z17;
- text: auto;
}
node[tourism=information][information=board] {
icon-image: "misc/information/board.png";
set icon_z17;
- text: auto;
}
/*****************/
@@ -3537,52 +3109,42 @@ area[historic=boundary_stone] {
node[historic=castle] {
icon-image: "sightseeing/castle.svg";
set icon_z17;
- text: auto;
}
node[historic=monument] {
icon-image: "sightseeing/monument.png";
set icon_z17;
- text: auto;
}
node[historic=memorial] {
icon-image: "sightseeing/memorial.png";
set icon_z17;
- text: auto;
}
node[historic=archaeological_site] {
icon-image: "sightseeing/archaeological.png";
set icon_z17;
- text: auto;
}
node[historic=ruins] {
icon-image: "sightseeing/ruins.png";
set icon_z17;
- text: auto;
}
node[historic=battlefield] {
icon-image: "sightseeing/battlefield.png";
set icon_z17;
- text: auto;
}
node[geological=palaeontological_site] {
icon-image: "historic/palaeontological_site.png";
set icon_z17;
- text: auto;
}
node[historic=wayside_cross] {
icon-image: "religion/wayside_cross.png";
set icon_z17;
- text: auto;
}
node[historic=wayside_shrine] {
icon-image: "religion/wayside_shrine.png";
set icon_z17;
- text: auto;
}
node[historic=boundary_stone] {
icon-image: "historic/boundary_stone.png";
set icon_z17;
- text: auto;
}
/****************/
@@ -3681,7 +3243,6 @@ area[landuse=recreation_ground] {
node[landuse] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/*****************/
@@ -3698,27 +3259,22 @@ area[military=range] {
node[military=airfield] {
icon-image: "transport/airport/airfield.png";
set icon_z17;
- text: auto;
}
node[military=bunker] {
icon-image: "misc/landmark/bunker.png";
set icon_z17;
- text: auto;
}
node[military=barracks][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[military=danger_area] {
icon-image: "misc/danger.png";
set icon_z17;
- text: auto;
}
node[military=range] {
icon-image: "misc/landmark/range.png";
set icon_z17;
- text: auto;
}
/*************************/
@@ -3728,37 +3284,30 @@ node[military=range] {
node[public_transport=stop_position] {
icon-image: "transport/railway_small.png";
set icon_z17;
- text: auto;
}
node[highway=bus_stop] {
icon-image: "transport/bus_small.png";
set icon_z17;
- text: auto;
}
node[public_transport=stop_position][bus=yes] {
icon-image: "transport/bus_small.png";
set icon_z17;
- text: auto;
}
node[public_transport=stop_position][aerial=yes] {
icon-image: "transport/aerialway.png";
set icon_z17;
- text: auto;
}
node[public_transport=stop_position][ferry=yes] {
icon-image: "transport/ferry.png";
set icon_z17;
- text: auto;
}
node[public_transport=stop_position][tram=yes] {
icon-image: "transport/tram.png";
set icon_z17;
- text: auto;
}
node[public_transport=stop_position][train=yes] {
icon-image: "transport/railway_small.png";
set icon_z17;
- text: auto;
}
area[public_transport=platform]:closed {
fill-color: service#809bc0;
@@ -3771,28 +3320,23 @@ way[public_transport=platform]!:closed {
node[public_transport=platform] {
icon-image: "transport/bus_small.png";
set icon_z17;
- text: auto;
}
node[public_transport=platform][bus=yes] {
icon-image: "transport/bus_small.png";
set icon_z17;
- text: auto;
}
node[public_transport=platform][aerial=yes] {
icon-image: "transport/aerialway/station.png";
set icon_z17;
- text: auto;
}
node[public_transport=platform][ferry=yes] {
icon-image: "transport/ferry.png";
set icon_z17;
- text: auto;
}
node[public_transport=platform][tram=yes],
node[public_transport=platform][train=yes] {
icon-image: "transport/railway_station.png";
set icon_z17;
- text: auto;
}
/****************/
@@ -3807,33 +3351,27 @@ area[railway=subway_entrance] {
node[railway=station], node[railway=tram_station] {
icon-image: "transport/railway_station.png";
set icon_z17;
- text: auto;
}
node[railway=halt] {
icon-image: "transport/railway_small.png";
set icon_z17;
- text: auto;
}
node[railway=tram_stop] {
icon-image: "transport/tram.png";
set icon_z17;
- text: auto;
}
node[railway=subway_entrance] {
icon-image: "transport/underground.png";
set icon_z17;
- text: auto;
}
node[railway=crossing] {
icon-image: "transport/railway/crossing.svg";
set icon_z17;
- text: auto;
}
node[railway=level_crossing] {
icon-image: "transport/railway/level_crossing.svg";
icon-width: 16;
set icon_z17;
- text: auto;
}
way[railway=rail] {
width: 2;
@@ -3841,17 +3379,19 @@ way[railway=rail] {
dashes: 9,9;
dashes-background-color: raildashed#ffffff;
}
+way[railway=rail][service=crossover],
way[railway=rail][service=siding] {
width: 1;
}
way[railway=rail][service=yard],
way[railway=rail][service=spur] {
width: 1;
- color: railyard#552200
+ color: railyard#552200;
}
/* draw tram on top of other way (highway=*) or
as a standalone style */
-way[highway][railway=tram]::core_railway, way[!highway][railway=tram] {
+way[highway][railway=tram]::core_railway,
+way[!highway][railway=tram] {
object-z-index: 1;
modifier: false; /* don't draw default way if there is no line on default layer */
width: 1;
@@ -3862,6 +3402,18 @@ way[highway][railway=tram]::core_railway, way[!highway][railway=tram] {
casing-linecap: round;
casing-dashes: 9,9;
}
+way[highway][railway=tram][service=crossover]::core_railway,
+way[!highway][railway=tram][service=crossover],
+way[highway][railway=tram][service=siding]::core_railway,
+way[!highway][railway=tram][service=siding],
+way[highway][railway=tram][service=yard]::core_railway,
+way[!highway][railway=tram][service=yard],
+way[highway][railway=tram][service=spur]::core_railway,
+way[!highway][railway=tram][service=spur] {
+ dashes: 6,6;
+ casing-dashes: 6,6;
+}
+
way[railway=light_rail] {
width: 2;
color: otherrail#808080;
@@ -3877,6 +3429,20 @@ way[railway=preserved] {
color: oldrail#404040;
dashes: 9,9;
}
+way[railway=light_rail][service=crossover],
+way[railway=light_rail][service=siding],
+way[railway=light_rail][service=yard],
+way[railway=light_rail][service=spur],
+way[railway=subway][service=crossover],
+way[railway=subway][service=siding],
+way[railway=subway][service=yard],
+way[railway=subway][service=spur],
+way[railway=preserved][service=crossover],
+way[railway=preserved][service=siding],
+way[railway=preserved][service=yard],
+way[railway=preserved][service=spur] {
+ dashes: 6,6;
+}
/* disused often appears together with highway=xy */
/* -> draw on separate layer with higher z-index, but use */
/* modifier: false; to suppress default line when used alone. */
@@ -3897,18 +3463,26 @@ way[railway=monorail] {
color: rail#404040;
dashes: 9,9;
}
+way[railway=narrow_gauge][service=crossover],
+way[railway=narrow_gauge][service=siding],
+way[railway=narrow_gauge][service=yard],
+way[railway=narrow_gauge][service=spur],
+way[railway=monorail][service=crossover],
+way[railway=monorail][service=siding],
+way[railway=monorail][service=yard],
+way[railway=monorail][service=spur] {
+ dashes: 6,6;
+}
area[railway=turntable] {
fill-color: rail#404040;
}
node[railway=turntable] {
icon-image: "transport/railway/turntable.svg";
set icon_z17;
- text: auto;
}
node[railway=buffer_stop] {
icon-image: "transport/railway/buffer_stop.svg";
set icon_z17;
- text: auto;
}
area[railway=platform]:closed {
fill-color: rail#404040;
@@ -3926,17 +3500,14 @@ node[railway=switch] {
icon-image: "transport/railway/switch.svg";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[railway=signal] {
icon-image: "transport/railway/signal.svg";
set icon_z17;
- text: auto;
}
node[railway=milestone] {
icon-image: "transport/railway/milestone.svg";
set icon_z17;
- text: auto;
}
node[railway=rail], node[railway=tram], node[railway=light_rail],
node[railway=subway], node[railway=preserved],
@@ -3946,7 +3517,6 @@ node[railway=platform], node[railway=funicular],
node[service=yard], node[service=siding], node[service=spur] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
way[railway=construction][!highway] {
width: 1;
@@ -3986,7 +3556,6 @@ area[aeroway=aerodrome] {
node[aeroway=aerodrome][military!=airfield] {
icon-image: "transport/airport.png";
set icon_z17;
- text: auto;
}
area[aeroway=terminal] {
fill-color: terminal#bb0000;
@@ -3994,7 +3563,6 @@ area[aeroway=terminal] {
node[aeroway=terminal] {
icon-image: "transport/airport/terminal.png";
set icon_z17;
- text: auto;
}
area[aeroway=helipad] {
fill-color: aeroway_dark#330000;
@@ -4002,7 +3570,6 @@ area[aeroway=helipad] {
node[aeroway=helipad] {
icon-image: "transport/airport/helipad.png";
set icon_z17;
- text: auto;
}
area[aeroway=runway]:closed {
fill-color: aeroway_dark#330000;
@@ -4025,7 +3592,6 @@ way[aeroway=parking_position] {
node[aeroway=parking_position] {
icon-image: "transport/airport/parking_position.png";
set icon_z17;
- text: auto;
}
area[aeroway=apron],
area[aeroway=hangar] {
@@ -4036,22 +3602,18 @@ node[aeroway=runway],
node[aeroway=taxiway] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
node[aeroway=hangar] {
icon-image: "transport/airport/hangar.png";
set icon_z17;
- text: auto;
}
node[aeroway=gate] {
icon-image: "transport/airport/gate.png";
set icon_z17;
- text: auto;
}
node[aeroway=windsock] {
icon-image: "transport/airport/windsock.png";
set icon_z17;
- text: auto;
}
/******************/
@@ -4099,12 +3661,10 @@ area[aerialway=station] {
node[aerialway=station] {
icon-image: "transport/aerialway/station.png";
set icon_z17;
- text: auto;
}
node[aerialway=pylon] {
icon-image: "transport/aerialway/pylon.svg";
set icon_z17;
- text: auto;
}
node[aerialway=cable_car],
node[aerialway=gondola],
@@ -4119,7 +3679,6 @@ node[aerialway=rope_tow],
node[aerialway=goods] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/**************/
@@ -4142,28 +3701,23 @@ area[sport=rugby_union] {
node[sport="9pin"] {
icon-image: "sport/10pin.png";
set icon_z17;
- text: auto;
}
node[sport="10pin"] {
icon-image: "sport/10pin.png";
set icon_z17;
- text: auto;
}
node[sport=athletics] {
icon-image: "sport/athletics.png";
set icon_z17;
- text: auto;
}
node[sport=running] {
icon-image: "sport/running.svg";
set icon_z17;
- text: auto;
}
node[sport=soccer],
node[sport=gaelic_games] {
icon-image: "sport/soccer.png";
set icon_z17;
- text: auto;
}
node[sport=australian_football],
node[sport=american_football],
@@ -4172,7 +3726,6 @@ node[sport=rugby_league],
node[sport=rugby_union] {
icon-image: "sport/football.png";
set icon_z17;
- text: auto;
}
area[sport=baseball],
area[sport=basketball],
@@ -4188,47 +3741,38 @@ area[sport=croquet] {
node[sport=baseball] {
icon-image: "sport/baseball.png";
set icon_z17;
- text: auto;
}
node[sport=basketball] {
icon-image: "sport/basketball.png";
set icon_z17;
- text: auto;
}
node[sport=boules] {
icon-image: "sport/boule.png";
set icon_z17;
- text: auto;
}
node[sport=bowls] {
icon-image: "sport/boule.png";
set icon_z17;
- text: auto;
}
node[sport=canoe] {
icon-image: "sport/canoe.svg";
set icon_z17;
- text: auto;
}
node[sport=chess] {
icon-image: "sport/chess.png";
set icon_z17;
- text: auto;
}
node[sport=climbing] {
icon-image: "sport/climbing.png";
set icon_z17;
- text: auto;
}
node[sport=cricket] {
icon-image: "sport/cricket.png";
set icon_z17;
- text: auto;
}
node[sport=croquet] {
icon-image: "sport/croquet.png";
set icon_z17;
- text: auto;
}
area[sport=cycling],
area[sport=dog_racing],
@@ -4249,59 +3793,48 @@ area[sport=motor][highway=raceway][area=yes] {
node[sport=cycling] {
icon-image: "sport/cycling.png";
set icon_z17;
- text: auto;
}
node[sport=dog_racing] {
icon-image: "leisure/dog.png";
set icon_z17;
- text: auto;
}
node[sport=equestrian] {
icon-image: "presets/equestrian.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[sport=golf] {
icon-image: "sport/golf.svg";
set icon_z17;
- text: auto;
}
node[sport=gymnastics] {
icon-image: "presets/gymnastics.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[sport=field_hockey] {
icon-image: "sport/field_hockey.png";
set icon_z17;
- text: auto;
}
node[sport=ice_hockey] {
icon-image: "sport/ice_hockey.png";
set icon_z17;
- text: auto;
}
node[sport=horse_racing] {
icon-image: "sport/riding.png";
set icon_z17;
- text: auto;
}
node[sport=karting] {
icon-image: "sport/karting.png";
set icon_z17;
- text: auto;
}
node[sport=motocross] {
icon-image: "sport/motocross.png";
set icon_z17;
- text: auto;
}
node[sport=motor] {
icon-image: "sport/motor.png";
set icon_z17;
- text: auto;
}
area[sport=multi],
area[sport=pelota],
@@ -4314,37 +3847,30 @@ area[sport=skateboard] {
node[sport=multi] {
icon-image: "sport/multi.png";
set icon_z17;
- text: auto;
}
node[sport=pelota] {
icon-image: "sport/pelota.png";
set icon_z17;
- text: auto;
}
node[sport=racquet] {
icon-image: "sport/racquetball.png";
set icon_z17;
- text: auto;
}
node[sport=ice_skating] {
icon-image: "sport/skating.png";
set icon_z17;
- text: auto;
}
node[sport=roller_skating] {
icon-image: "sport/roller_skating.svg";
set icon_z17;
- text: auto;
}
node[sport=skating] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
node[sport=skateboard] {
icon-image: "sport/skateboard.png";
set icon_z17;
- text: auto;
}
area[sport=swimming] {
fill-color: swimming_pool#51c4ef;
@@ -4352,7 +3878,6 @@ area[sport=swimming] {
node[sport=swimming] {
icon-image: "sport/pool.png";
set icon_z17;
- text: auto;
}
area[sport=table_tennis],
area[sport=tennis],
@@ -4362,17 +3887,14 @@ area[sport=paintball] {
node[sport=table_tennis] {
icon-image: "sport/table_tennis.png";
set icon_z17;
- text: auto;
}
node[sport=tennis] {
icon-image: "sport/tennis.png";
set icon_z17;
- text: auto;
}
node[sport=paintball][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
area[sport=squash],
area[sport=shooting],
@@ -4390,58 +3912,47 @@ area[sport=badminton] {
node[sport=squash][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[sport=shooting] {
icon-image: "presets/range.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
node[sport=volleyball] {
icon-image: "sport/volleyball.png";
set icon_z17;
- text: auto;
}
node[sport=beachvolleyball] {
icon-image: "sport/beachvolleyball.png";
set icon_z17;
- text: auto;
}
node[sport=billiards] {
icon-image: "sport/billiards.svg";
set icon_z17;
- text: auto;
}
node[sport=bowling] {
icon-image: "sport/10pin.png";
set icon_z17;
- text: auto;
}
node[sport=handball] {
icon-image: "sport/handball.png";
set icon_z17;
- text: auto;
}
node[sport=rowing] {
icon-image: "sport/rowing.png";
set icon_z17;
- text: auto;
}
node[sport=sailing][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
node[sport=scuba_diving] {
icon-image: "sport/scuba_diving.svg";
set icon_z17;
- text: auto;
}
node[sport=badminton][!is_prop_set(icon-image)] {
icon-image: "misc/no_icon.png";
set icon_z17;
- text: auto;
}
area[sport=archery],
area[sport=fishing],
@@ -4452,22 +3963,18 @@ area[sport=rc_car] {
node[sport=archery] {
icon-image: "sport/archery.png";
set icon_z17;
- text: auto;
}
node[sport=fishing] {
icon-image: "sport/fishing.png";
set icon_z17;
- text: auto;
}
node[sport=model_aerodrome] {
icon-image: "transport/airport.png";
set icon_z17;
- text: auto;
}
node[sport=rc_car] {
icon-image: "transport/car.png";
set icon_z17;
- text: auto;
}
/****************/
@@ -4480,24 +3987,20 @@ area[natural=spring] {
node[natural=spring] {
icon-image: "misc/landmark/spring.svg";
set icon_z17;
- text: auto;
}
node[natural=saddle] {
icon-image: "presets/saddle.svg";
set icon_z0;
- text: auto;
set text_z0;
}
node[natural=peak] {
icon-image: "presets/peak.svg";
set icon_z0;
- text: auto;
set text_z0;
}
node[natural=peak][tourism=viewpoint] {
icon-image: "sightseeing/peak_viewpoint.svg";
set icon_z0;
- text: auto;
set text_z0;
}
area[natural=glacier] {
@@ -4506,7 +4009,6 @@ area[natural=glacier] {
node[natural=volcano] {
icon-image: "misc/landmark/volcano_small.png";
set icon_z0;
- text: auto;
set text_z0;
}
area[natural=cliff]:closed {
@@ -4521,7 +4023,6 @@ way[natural=cliff] {
node[natural=cliff] {
icon-image: "misc/cliff.svg";
set icon_z17;
- text: auto;
}
way[natural=ridge] {
width: 1;
@@ -4559,6 +4060,10 @@ area[natural=wetland] {
area[natural=water] {
fill-color: water#0000ff;
}
+way[natural=water][intermittent=yes] {
+ width: 2;
+ dashes: 15, 5;
+}
way[natural=coastline] {
width: 2;
color: water#0000ff;
@@ -4584,7 +4089,6 @@ area[natural=rock] {
node[natural=rock] {
icon-image: "misc/rock.svg";
set icon_z17;
- text: auto;
}
area[natural=stone] {
fill-color: stone#f8f8c7;
@@ -4592,7 +4096,6 @@ area[natural=stone] {
node[natural=stone] {
icon-image: "misc/stone.svg";
set icon_z17;
- text: auto;
}
area[natural=bay],
area[natural=cave_entrance] {
@@ -4601,34 +4104,28 @@ area[natural=cave_entrance] {
node[natural=bay] {
icon-image: "nautical/bay.svg";
set icon_z17;
- text: auto;
}
node[natural=cave_entrance] {
icon-image: "misc/landmark/cave_entrance.png";
set icon_z17;
- text: auto;
}
node[natural=tree] {
icon-image: "misc/landmark/trees.png";
set icon_z17;
- text: auto;
}
node[natural=tree][type=conifer],
node[natural=tree][leaf_type=needleleaved] {
icon-image: "misc/landmark/trees_conifer.png";
set icon_z17;
- text: auto;
}
node[natural=tree][type=broad_leaved],
node[natural=tree][leaf_type=broadleaved] {
icon-image: "misc/landmark/trees_broad_leaved.png";
set icon_z17;
- text: auto;
}
node[natural=tree][type=palm] {
icon-image: "misc/landmark/trees_palm.png";
set icon_z17;
- text: auto;
}
node[natural=glacier],
node[natural=scree],
@@ -4650,7 +4147,6 @@ node[natural=ridge],
node[natural=valley] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/*****************/
/* waterway tags */
@@ -4673,27 +4169,33 @@ way[waterway=stream] {
width: 1;
color: stream#6600cc;
}
-way[waterway=ditch], way[waterway=drain] {
+way[waterway=ditch],
+way[waterway=drain] {
width: 1;
color: water#0000ff;
}
+way[waterway=river][intermittent=yes],
+way[waterway=riverbank][intermittent=yes],
+way[waterway=canal][intermittent=yes],
+way[waterway=stream][intermittent=yes],
+way[waterway=ditch][intermittent=yes],
+way[waterway=drain][intermittent=yes] {
+ dashes: 15, 5;
+}
area[waterway=dock] {
fill-color: dock#0000cf;
}
node[waterway=dock] {
icon-image: "nautical/boatyard.png";
set icon_z17;
- text: auto;
}
node[waterway=lock_gate] {
icon-image: "nautical/lock_gate.png";
set icon_z17;
- text: auto;
}
node[waterway=turning_point] {
icon-image: "nautical/turning.png";
set icon_z17;
- text: auto;
}
area[waterway=boatyard] {
fill-color: manmade#d8d8d8;
@@ -4701,19 +4203,16 @@ area[waterway=boatyard] {
node[waterway=boatyard] {
icon-image: "nautical/boatyard.png";
set icon_z17;
- text: auto;
}
node[waterway=water_point],
node[waterway=waste_disposal],
node[waterway=mooring] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
node[mooring] {
icon-image: "nautical/marina.png";
set icon_z17;
- text: auto;
}
area[waterway=fuel] {
fill-color: amenity_traffic#f7efb7;
@@ -4722,7 +4221,6 @@ node[waterway=fuel] {
icon-image: "nautical/marine_fuel.png";
icon-width: 16;
set icon_z17;
- text: auto;
}
way[waterway=weir] {
width: 2;
@@ -4731,7 +4229,6 @@ way[waterway=weir] {
node[waterway=weir] {
icon-image: "nautical/weir.svg";
set icon_z17;
- text: auto;
}
area[waterway=dam]:closed {
fill-color: manmade#d8d8d8;
@@ -4743,7 +4240,6 @@ way[waterway=dam] {
node[waterway=dam] {
icon-image: "nautical/dam.svg";
set icon_z17;
- text: auto;
}
/* it's not possible to have both line and area, line seems more likely */
way[waterway=waterfall] {
@@ -4753,7 +4249,6 @@ way[waterway=waterfall] {
node[waterway=waterfall] {
icon-image: "nautical/waterfall.svg";
set icon_z17;
- text: auto;
}
node[waterway=river], node[waterway=riverbank],
node[waterway=canal], node[waterway=wadi],
@@ -4761,7 +4256,6 @@ node[waterway=stream],
node[waterway=ditch], node[waterway=drain] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/**************/
@@ -4783,7 +4277,6 @@ node[route=tour],
node[route=pub_crawl] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/*******************/
@@ -4793,7 +4286,6 @@ node[route=pub_crawl] {
node[mountain_pass?] {
icon-image: "misc/landmark/mountain_pass.svg";
set icon_z0;
- text: auto;
set text_z0;
}
@@ -4870,7 +4362,6 @@ node[boundary=political],
node[boundary=national_park] {
icon-image: "misc/deprecated.png";
set icon_z17;
- text: auto;
}
/******************/
@@ -4954,7 +4445,6 @@ node["openGeoDB:type"=District],
node["openGeoDB:location"=locality] {
icon-image: "place/settlement/openGeoDB.png";
set icon_z0;
- text: auto;
set text_z0;
font-size: 10;
font-weight: bold;
@@ -4984,118 +4474,69 @@ node[place=continent],
node[place=country],
node[place=state],
node[place=region],
-node[place=county] {
- icon-image: "place/settlement/capital.png";
+node[place=county],
+node[place=city],
+node[place=town],
+node[place=suburb],
+node[place=village],
+node[place=neighbourhood],
+node[place=hamlet],
+node[place=isolated_dwelling],
+node[place=farm],
+node[place=island],
+node[place=islet] {
set icon_z0;
- text: auto;
set text_z0;
font-size: 10;
font-weight: bold;
text-color:black;
text-halo-color: white;
text-halo-radius: 1;
+}
+
+node[place=continent],
+node[place=country],
+node[place=state],
+node[place=region],
+node[place=county] {
+ icon-image: "place/settlement/capital.png";
z-index: 2.9;
}
node[place=city] {
icon-image: "place/settlement/city.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
z-index: 2.8;
}
node[place=town] {
icon-image: "place/settlement/town.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
z-index: 2.7;
}
node[place=suburb] {
icon-image: "place/settlement/suburb.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
z-index: 2.6;
}
node[place=village] {
icon-image: "place/settlement/village.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
z-index: 2.5;
}
node[place=neighbourhood] {
icon-image: "place/settlement/neighbourhood.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
z-index: 2.4;
}
node[place=hamlet] {
icon-image: "place/settlement/hamlet.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
z-index: 2.3;
}
node[place=isolated_dwelling] {
icon-image: "place/settlement/isolated_dwelling.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
z-index: 2.2;
}
node[place=farm] {
icon-image: "place/settlement/farm.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
z-index: 2.1;
}
node|z15-[place=locality],
node|z-14[place=locality][!setting("hide_icons")] {
icon-image: "place/locality.png";
- text: auto;
font-size: 10;
font-weight: bold;
text-color:black;
@@ -5104,25 +4545,9 @@ node|z-14[place=locality][!setting("hide_icons")] {
}
node[place=island] {
icon-image: "place/island.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
}
node[place=islet] {
icon-image: "place/islet.png";
- set icon_z0;
- text: auto;
- set text_z0;
- font-size: 10;
- font-weight: bold;
- text-color:black;
- text-halo-color: white;
- text-halo-radius: 1;
}
/***************************/
@@ -5175,9 +4600,6 @@ Summary of different zoom levels:
*/
-node {
- text: auto;
-}
node|z-16[setting("hide_icons")],
node|z17-[!is_prop_set("icon-image")][setting("hide_icons")]!.maxspeedclass,
node[!is_prop_set("icon-image")][!setting("hide_icons")]!.maxspeedclass {
diff --git a/test/data/regress/12639/history.xml b/test/data/regress/12639/history.xml
new file mode 100644
index 0000000..6f04844
--- /dev/null
+++ b/test/data/regress/12639/history.xml
@@ -0,0 +1,21137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<osm version="0.6" generator="OpenStreetMap server" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
+ <relation id="1350901" changeset="6818584" timestamp="2010-12-31T11:36:42Z" version="1" visible="true" user="mikes" uid="6270">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="4566204" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="6910606" timestamp="2011-01-08T23:54:49Z" version="2" visible="true" user="Ewi" uid="27109">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="4566204" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="6928231" timestamp="2011-01-10T17:03:20Z" version="3" visible="true" user="mikes" uid="6270">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="4566204" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="7690069" timestamp="2011-03-27T19:26:47Z" version="4" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="4566204" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="7699192" timestamp="2011-03-28T17:39:14Z" version="5" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="4566204" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="7700091" timestamp="2011-03-28T19:00:02Z" version="6" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="106299776" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="4566204" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="7972334" timestamp="2011-04-26T08:48:57Z" version="7" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="106299776" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="110364160" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="4566204" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="7972403" timestamp="2011-04-26T08:57:41Z" version="8" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="106299776" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="110364160" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="4566204" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="7972446" timestamp="2011-04-26T09:02:22Z" version="9" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="106299776" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="110364160" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="7973486" timestamp="2011-04-26T11:09:31Z" version="10" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="106299776" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="110364160" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="8002758" timestamp="2011-04-29T11:48:21Z" version="11" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="80126585" role=""/>
+ <member type="way" ref="106299776" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="110364160" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="8151799" timestamp="2011-05-15T13:24:50Z" version="12" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="110364160" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="8164969" timestamp="2011-05-16T18:24:13Z" version="13" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="8275923" timestamp="2011-05-28T21:27:34Z" version="14" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="8276482" timestamp="2011-05-28T22:48:31Z" version="15" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="8408152" timestamp="2011-06-11T17:55:36Z" version="16" visible="true" user="RufusB" uid="28000">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="8639522" timestamp="2011-07-05T14:16:29Z" version="17" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="9207955" timestamp="2011-09-04T11:39:05Z" version="18" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="9210907" timestamp="2011-09-04T17:36:11Z" version="19" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="9211212" timestamp="2011-09-04T18:16:03Z" version="20" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="9764847" timestamp="2011-11-07T13:37:16Z" version="21" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="9772125" timestamp="2011-11-08T10:55:07Z" version="22" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="9772324" timestamp="2011-11-08T11:24:47Z" version="23" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="9998914" timestamp="2011-11-30T13:37:31Z" version="24" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="10026034" timestamp="2011-12-03T16:27:39Z" version="25" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="10097380" timestamp="2011-12-12T10:01:16Z" version="26" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="140832869" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="10097708" timestamp="2011-12-12T10:44:29Z" version="27" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="140832869" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="10098147" timestamp="2011-12-12T11:41:10Z" version="28" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="140832869" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="10362473" timestamp="2012-01-11T17:35:30Z" version="29" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="140832869" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="10362792" timestamp="2012-01-11T18:08:38Z" version="30" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="140832869" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="10423264" timestamp="2012-01-17T23:04:07Z" version="31" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="140832869" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="10594102" timestamp="2012-02-05T14:38:26Z" version="32" visible="true" user="Joerg Fischer" uid="7186">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="140832869" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11102065" timestamp="2012-03-26T05:13:27Z" version="33" visible="true" user="Joerg Fischer" uid="7186">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="44049058" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11201819" timestamp="2012-04-06T13:35:41Z" version="34" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11257292" timestamp="2012-04-10T19:51:53Z" version="35" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="110897271" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11477564" timestamp="2012-05-02T09:20:12Z" version="36" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="161852095" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11477564" timestamp="2012-05-02T09:23:15Z" version="37" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="31822771" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11691670" timestamp="2012-05-24T17:22:42Z" version="38" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="31822769" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11691733" timestamp="2012-05-24T17:28:58Z" version="39" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="31822770" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164839576" role="backward"/>
+ <member type="way" ref="31822768" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11693747" timestamp="2012-05-24T21:19:47Z" version="40" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="164863127" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164839576" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11788863" timestamp="2012-06-03T17:08:06Z" version="41" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="44049016" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="120427836" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="42185247" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="164863127" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164839576" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="11859459" timestamp="2012-06-10T21:13:49Z" version="42" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="164863127" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164839576" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="12448717" timestamp="2012-07-23T11:14:32Z" version="43" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="164863127" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164839576" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="12459121" timestamp="2012-07-24T00:58:22Z" version="44" visible="true" user="zonk15" uid="183791">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="117230973" role=""/>
+ <member type="way" ref="148828514" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="164863127" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164839576" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="12860583" timestamp="2012-08-25T21:35:25Z" version="45" visible="true" user="Rockus" uid="186626">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="164863127" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164839576" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="13187284" timestamp="2012-09-20T18:59:20Z" version="46" visible="true" user="sky-tracker" uid="661655">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="164863127" role="forward"/>
+ <member type="way" ref="164838941" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164839576" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="48526654" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="14052961" timestamp="2012-11-26T23:47:53Z" version="47" visible="true" user="Achterin" uid="579793">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="14264833" timestamp="2012-12-13T21:11:44Z" version="48" visible="true" user="theonlytruth" uid="67931">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="14641658" timestamp="2013-01-13T21:54:02Z" version="49" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="14890108" timestamp="2013-02-02T23:19:21Z" version="50" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15081773" timestamp="2013-02-18T20:12:26Z" version="51" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15361639" timestamp="2013-03-14T12:01:01Z" version="52" visible="true" user="yvonoe" uid="230452">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15450751" timestamp="2013-03-22T06:59:31Z" version="53" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="211411118" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15485733" timestamp="2013-03-24T22:52:46Z" version="54" visible="true" user="yvonoe" uid="230452">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="211411118" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15496169" timestamp="2013-03-25T20:36:10Z" version="55" visible="true" user="yvonoe" uid="230452">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="24158022" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="211411118" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15529592" timestamp="2013-03-28T18:18:31Z" version="56" visible="true" user="sfrank" uid="18052">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="211411118" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15565819" timestamp="2013-04-01T10:39:58Z" version="57" visible="true" user="cyankahly" uid="385428">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15567578" timestamp="2013-04-01T12:55:17Z" version="58" visible="true" user="yvonoe" uid="230452">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15730313" timestamp="2013-04-14T21:07:52Z" version="59" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="15837693" timestamp="2013-04-23T14:52:21Z" version="60" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="17103097" timestamp="2013-07-26T15:16:10Z" version="61" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="18128590" timestamp="2013-10-01T14:54:40Z" version="62" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="18573768" timestamp="2013-10-27T20:24:39Z" version="63" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="19954411" timestamp="2014-01-12T15:39:44Z" version="64" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="19958119" timestamp="2014-01-12T18:51:48Z" version="65" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="20023512" timestamp="2014-01-15T21:53:19Z" version="66" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="20177884" timestamp="2014-01-24T14:16:19Z" version="67" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="20178125" timestamp="2014-01-24T14:33:21Z" version="68" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="20288218" timestamp="2014-01-30T18:50:58Z" version="69" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="20290590" timestamp="2014-01-30T21:10:03Z" version="70" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="20291270" timestamp="2014-01-30T21:52:01Z" version="71" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="21630319" timestamp="2014-04-11T16:47:56Z" version="72" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="22735941" timestamp="2014-06-04T14:28:04Z" version="73" visible="true" user="t2425b" uid="1260731">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="22735941" timestamp="2014-06-04T14:41:10Z" version="74" visible="true" user="t2425b" uid="1260731">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="23653985" timestamp="2014-07-02T20:45:55Z" version="75" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="23909569" timestamp="2014-07-03T22:09:15Z" version="76" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576689" role="forward"/>
+ <member type="way" ref="68576692" role="forward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="24381862" timestamp="2014-07-27T11:01:31Z" version="77" visible="true" user="flierfy" uid="445671">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="24444055" timestamp="2014-07-30T14:21:12Z" version="78" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="25894768" timestamp="2014-10-06T11:27:07Z" version="79" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="26180691" timestamp="2014-10-18T22:21:46Z" version="80" visible="true" user="Osmose" uid="140038">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="26514501" timestamp="2014-11-02T22:11:12Z" version="81" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="26908041" timestamp="2014-11-20T13:38:18Z" version="82" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="26908141" timestamp="2014-11-20T13:43:40Z" version="83" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="26953559" timestamp="2014-11-22T15:11:19Z" version="84" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="26991357" timestamp="2014-11-24T09:42:42Z" version="85" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="115429763" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="106153792" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27033955" timestamp="2014-11-25T23:07:05Z" version="86" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="172637131" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="106153721" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914701" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27034055" timestamp="2014-11-25T23:16:17Z" version="87" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="4652413" role=""/>
+ <member type="way" ref="4768614" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27034248" timestamp="2014-11-25T23:30:16Z" version="88" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27074519" timestamp="2014-11-27T18:51:51Z" version="89" visible="true" user="Achterin" uid="579793">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27074693" timestamp="2014-11-27T18:57:55Z" version="90" visible="true" user="Achterin" uid="579793">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="32460002" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27097558" timestamp="2014-11-28T19:36:00Z" version="91" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27139290" timestamp="2014-11-30T19:32:01Z" version="92" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27152813" timestamp="2014-12-01T12:47:19Z" version="93" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="41571765" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="145160596" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27190115" timestamp="2014-12-02T22:27:32Z" version="94" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="27446429" timestamp="2014-12-13T16:59:36Z" version="95" visible="true" user="Esse2010" uid="239295">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="317110548" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="29439052" timestamp="2015-03-12T23:59:02Z" version="96" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="317110548" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="29514251" timestamp="2015-03-16T10:27:39Z" version="97" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="317110548" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="30074535" timestamp="2015-04-08T20:51:40Z" version="98" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="317110548" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="30094304" timestamp="2015-04-09T13:48:55Z" version="99" visible="true" user="Esse2010" uid="239295">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="30095176" timestamp="2015-04-09T14:39:45Z" version="100" visible="true" user="Esse2010" uid="239295">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="31748743" timestamp="2015-06-05T15:29:04Z" version="101" visible="true" user="okilimu" uid="212111">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="70101277" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="351676307" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="32835477" timestamp="2015-07-23T19:50:19Z" version="102" visible="true" user="loml" uid="62342">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="68576696" role="backward"/>
+ <member type="way" ref="115429735" role="backward"/>
+ <member type="way" ref="115429734" role="backward"/>
+ <member type="way" ref="115429746" role="backward"/>
+ <member type="way" ref="351676307" role="backward"/>
+ <member type="way" ref="115429742" role="backward"/>
+ <member type="way" ref="68576695" role="backward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="32888825" timestamp="2015-07-26T13:04:07Z" version="103" visible="true" user="MKnight" uid="39774">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="362392597" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="33477959" timestamp="2015-08-21T08:25:00Z" version="104" visible="true" user="Saxonyking" uid="405966">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="362392597" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="34009489" timestamp="2015-09-13T21:48:28Z" version="105" visible="true" user="Hedaja" uid="339917">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="48525629" role=""/>
+ <member type="way" ref="290965945" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="290965946" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="362392597" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="34243588" timestamp="2015-09-25T12:38:33Z" version="106" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role="forward"/>
+ <member type="way" ref="145155263" role="backward"/>
+ <member type="way" ref="70101291" role="backward"/>
+ <member type="way" ref="13214258" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="362392597" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="110375809" role="forward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="110375810" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="34248243" timestamp="2015-09-25T16:54:49Z" version="107" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="68493443" role=""/>
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="362392597" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="34252448" timestamp="2015-09-25T20:33:13Z" version="108" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="362392597" role=""/>
+ <member type="way" ref="48525926" role="forward"/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="34331638" timestamp="2015-09-29T17:54:27Z" version="109" visible="true" user="fireball2" uid="147674">
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="35846305" timestamp="2015-12-09T13:27:35Z" version="110" visible="true" user="Klumbumbus" uid="550300">
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="385115620" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="35901303" timestamp="2015-12-12T01:33:04Z" version="111" visible="true" user="BassTii" uid="2670290">
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="36925857" timestamp="2016-01-31T21:00:21Z" version="112" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="395167132" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="36964543" timestamp="2016-02-02T19:42:26Z" version="113" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="395653343" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="395653341" role=""/>
+ <member type="way" ref="395653342" role=""/>
+ <member type="way" ref="395167132" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="395653344" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="36994524" timestamp="2016-02-04T10:14:51Z" version="114" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="395653343" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="395653341" role=""/>
+ <member type="way" ref="395653342" role=""/>
+ <member type="way" ref="395167132" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="395962359" role=""/>
+ <member type="way" ref="395962358" role=""/>
+ <member type="way" ref="395962360" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="395653344" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+ <relation id="1350901" changeset="37205778" timestamp="2016-02-14T15:13:24Z" version="115" visible="true" user="aw_stl" uid="393803">
+ <member type="way" ref="315202234" role=""/>
+ <member type="way" ref="74690048" role=""/>
+ <member type="way" ref="38050870" role=""/>
+ <member type="way" ref="70101269" role=""/>
+ <member type="way" ref="110375809" role=""/>
+ <member type="way" ref="43694053" role=""/>
+ <member type="way" ref="42224818" role=""/>
+ <member type="way" ref="362392558" role=""/>
+ <member type="way" ref="145160597" role=""/>
+ <member type="way" ref="231353771" role=""/>
+ <member type="way" ref="231353772" role=""/>
+ <member type="way" ref="115416629" role=""/>
+ <member type="way" ref="115416618" role=""/>
+ <member type="way" ref="362392557" role=""/>
+ <member type="way" ref="362392559" role=""/>
+ <member type="way" ref="333037131" role=""/>
+ <member type="way" ref="333037130" role=""/>
+ <member type="way" ref="41571784" role=""/>
+ <member type="way" ref="60219610" role=""/>
+ <member type="way" ref="42224366" role=""/>
+ <member type="way" ref="362392618" role=""/>
+ <member type="way" ref="362392589" role=""/>
+ <member type="way" ref="362392585" role=""/>
+ <member type="way" ref="362392592" role=""/>
+ <member type="way" ref="362392602" role=""/>
+ <member type="way" ref="172728908" role="forward"/>
+ <member type="way" ref="362392607" role="forward"/>
+ <member type="way" ref="362392614" role="forward"/>
+ <member type="way" ref="362392610" role="forward"/>
+ <member type="way" ref="39020275" role="forward"/>
+ <member type="way" ref="362392621" role="forward"/>
+ <member type="way" ref="362392619" role="forward"/>
+ <member type="way" ref="362392620" role="forward"/>
+ <member type="way" ref="362392616" role="forward"/>
+ <member type="way" ref="362392617" role="forward"/>
+ <member type="way" ref="351676302" role=""/>
+ <member type="way" ref="48526100" role=""/>
+ <member type="way" ref="68576688" role=""/>
+ <member type="way" ref="306522423" role="backward"/>
+ <member type="way" ref="395653343" role="backward"/>
+ <member type="way" ref="295101389" role="backward"/>
+ <member type="way" ref="351676304" role="backward"/>
+ <member type="way" ref="351676303" role="backward"/>
+ <member type="way" ref="68576687" role="backward"/>
+ <member type="way" ref="68576691" role="backward"/>
+ <member type="way" ref="68576693" role="backward"/>
+ <member type="way" ref="44049059" role=""/>
+ <member type="way" ref="158212119" role=""/>
+ <member type="way" ref="395653341" role=""/>
+ <member type="way" ref="395653342" role=""/>
+ <member type="way" ref="395167132" role=""/>
+ <member type="way" ref="42793102" role=""/>
+ <member type="way" ref="24158023" role=""/>
+ <member type="way" ref="217491227" role=""/>
+ <member type="way" ref="315290234" role=""/>
+ <member type="way" ref="158932630" role=""/>
+ <member type="way" ref="332481294" role=""/>
+ <member type="way" ref="158212125" role=""/>
+ <member type="way" ref="213547158" role=""/>
+ <member type="way" ref="217491231" role=""/>
+ <member type="way" ref="217491230" role=""/>
+ <member type="way" ref="44049057" role=""/>
+ <member type="way" ref="397790818" role=""/>
+ <member type="way" ref="113601249" role=""/>
+ <member type="way" ref="315290235" role=""/>
+ <member type="way" ref="217491228" role=""/>
+ <member type="way" ref="80126591" role=""/>
+ <member type="way" ref="395962359" role=""/>
+ <member type="way" ref="395962358" role=""/>
+ <member type="way" ref="395962360" role=""/>
+ <member type="way" ref="146287196" role=""/>
+ <member type="way" ref="106291957" role=""/>
+ <member type="way" ref="314229852" role=""/>
+ <member type="way" ref="314229853" role=""/>
+ <member type="way" ref="314229854" role=""/>
+ <member type="way" ref="128911082" role=""/>
+ <member type="way" ref="128914026" role=""/>
+ <member type="way" ref="211411117" role=""/>
+ <member type="way" ref="313959941" role=""/>
+ <member type="way" ref="128914024" role=""/>
+ <member type="way" ref="128872482" role=""/>
+ <member type="way" ref="106153799" role=""/>
+ <member type="way" ref="313959937" role=""/>
+ <member type="way" ref="313959936" role=""/>
+ <member type="way" ref="313685672" role=""/>
+ <member type="way" ref="313685673" role=""/>
+ <member type="way" ref="106299792" role=""/>
+ <member type="way" ref="313685671" role=""/>
+ <member type="way" ref="313685670" role=""/>
+ <member type="way" ref="313959938" role=""/>
+ <member type="way" ref="32458604" role=""/>
+ <member type="way" ref="314494959" role=""/>
+ <member type="way" ref="313686203" role=""/>
+ <member type="way" ref="106299807" role=""/>
+ <member type="way" ref="39496746" role=""/>
+ <member type="way" ref="314494956" role=""/>
+ <member type="way" ref="39496745" role=""/>
+ <member type="way" ref="314494955" role=""/>
+ <member type="way" ref="314494957" role=""/>
+ <member type="way" ref="161852406" role=""/>
+ <member type="way" ref="106153773" role=""/>
+ <member type="way" ref="314494958" role=""/>
+ <member type="way" ref="106153741" role=""/>
+ <member type="way" ref="4652415" role=""/>
+ <member type="way" ref="110364559" role=""/>
+ <member type="way" ref="314493009" role=""/>
+ <member type="way" ref="314493008" role=""/>
+ <member type="way" ref="337464341" role=""/>
+ <member type="way" ref="337464343" role=""/>
+ <member type="way" ref="44049017" role=""/>
+ <member type="way" ref="4652414" role=""/>
+ <member type="way" ref="314492279" role=""/>
+ <member type="way" ref="314492280" role=""/>
+ <member type="way" ref="314492281" role=""/>
+ <member type="way" ref="44049015" role=""/>
+ <member type="way" ref="115429739" role=""/>
+ <member type="way" ref="314492282" role=""/>
+ <member type="way" ref="106153675" role=""/>
+ <member type="way" ref="110364757" role=""/>
+ <member type="way" ref="370497314" role=""/>
+ <member type="way" ref="42185246" role=""/>
+ <member type="way" ref="110364758" role=""/>
+ <member type="way" ref="187719068" role=""/>
+ <member type="way" ref="206158135" role=""/>
+ <member type="way" ref="4453683" role=""/>
+ <member type="way" ref="240142895" role=""/>
+ <member type="way" ref="240142896" role=""/>
+ <member type="way" ref="196200679" role=""/>
+ <member type="way" ref="182056932" role=""/>
+ <member type="way" ref="196200682" role=""/>
+ <member type="way" ref="139097461" role=""/>
+ <member type="way" ref="310874683" role=""/>
+ <member type="way" ref="310874688" role=""/>
+ <member type="way" ref="32122749" role=""/>
+ <member type="way" ref="52724446" role=""/>
+ <member type="way" ref="33523240" role="forward"/>
+ <member type="way" ref="314903860" role="forward"/>
+ <member type="way" ref="212101253" role="forward"/>
+ <member type="way" ref="314903861" role="forward"/>
+ <member type="way" ref="166015706" role="forward"/>
+ <member type="way" ref="258110138" role="forward"/>
+ <member type="way" ref="258110136" role="forward"/>
+ <member type="way" ref="258110141" role="forward"/>
+ <member type="way" ref="258110139" role="forward"/>
+ <member type="way" ref="258110137" role="forward"/>
+ <member type="way" ref="258110135" role="forward"/>
+ <member type="way" ref="52724464" role="forward"/>
+ <member type="way" ref="52724462" role="forward"/>
+ <member type="way" ref="140851386" role="forward"/>
+ <member type="way" ref="52724467" role="forward"/>
+ <member type="way" ref="258110134" role="forward"/>
+ <member type="way" ref="52724459" role="forward"/>
+ <member type="way" ref="258110133" role="forward"/>
+ <member type="way" ref="24308221" role="forward"/>
+ <member type="way" ref="258112645" role="forward"/>
+ <member type="way" ref="259091491" role="forward"/>
+ <member type="way" ref="259091495" role="forward"/>
+ <member type="way" ref="259091492" role="forward"/>
+ <member type="way" ref="259091496" role="forward"/>
+ <member type="way" ref="32464827" role="forward"/>
+ <member type="way" ref="286271156" role="forward"/>
+ <member type="way" ref="259113328" role="forward"/>
+ <member type="way" ref="259113325" role="forward"/>
+ <member type="way" ref="32462685" role="forward"/>
+ <member type="way" ref="286271155" role="forward"/>
+ <member type="way" ref="27022997" role="forward"/>
+ <member type="way" ref="259120851" role="forward"/>
+ <member type="way" ref="286270014" role="forward"/>
+ <member type="way" ref="140851400" role="forward"/>
+ <member type="way" ref="256317337" role="forward"/>
+ <member type="way" ref="52674598" role="forward"/>
+ <member type="way" ref="259120849" role="forward"/>
+ <member type="way" ref="136285681" role="forward"/>
+ <member type="way" ref="4312324" role="forward"/>
+ <member type="way" ref="259120846" role="forward"/>
+ <member type="way" ref="3987728" role="forward"/>
+ <member type="way" ref="42019559" role="forward"/>
+ <member type="way" ref="259120855" role="forward"/>
+ <member type="way" ref="314756315" role="forward"/>
+ <member type="way" ref="78032091" role="forward"/>
+ <member type="way" ref="209995728" role="forward"/>
+ <member type="way" ref="314756316" role="forward"/>
+ <member type="way" ref="136176598" role="forward"/>
+ <member type="way" ref="209995730" role="forward"/>
+ <member type="way" ref="314757710" role="forward"/>
+ <member type="way" ref="212474426" role="forward"/>
+ <member type="way" ref="37289330" role="forward"/>
+ <member type="way" ref="243703847" role="forward"/>
+ <member type="way" ref="366784282" role="forward"/>
+ <member type="way" ref="366784283" role="forward"/>
+ <member type="way" ref="37042206" role="forward"/>
+ <member type="way" ref="37042205" role="forward"/>
+ <member type="way" ref="71884470" role="forward"/>
+ <member type="way" ref="203950884" role="backward"/>
+ <member type="way" ref="4444573" role="backward"/>
+ <member type="way" ref="139541745" role="backward"/>
+ <member type="way" ref="314903863" role="backward"/>
+ <member type="way" ref="314903862" role="backward"/>
+ <member type="way" ref="314903866" role="backward"/>
+ <member type="way" ref="258110140" role="backward"/>
+ <member type="way" ref="32460003" role="backward"/>
+ <member type="way" ref="258112642" role="backward"/>
+ <member type="way" ref="52724457" role="backward"/>
+ <member type="way" ref="13040627" role="backward"/>
+ <member type="way" ref="258112648" role="backward"/>
+ <member type="way" ref="259091498" role="backward"/>
+ <member type="way" ref="259091494" role="backward"/>
+ <member type="way" ref="256773165" role="backward"/>
+ <member type="way" ref="37290175" role="backward"/>
+ <member type="way" ref="286271157" role="backward"/>
+ <member type="way" ref="218606572" role="backward"/>
+ <member type="way" ref="218606570" role="backward"/>
+ <member type="way" ref="4681398" role="backward"/>
+ <member type="way" ref="136283527" role="backward"/>
+ <member type="way" ref="259113319" role="backward"/>
+ <member type="way" ref="259113323" role="backward"/>
+ <member type="way" ref="27022999" role="backward"/>
+ <member type="way" ref="286270011" role="backward"/>
+ <member type="way" ref="259113322" role="backward"/>
+ <member type="way" ref="164863128" role="backward"/>
+ <member type="way" ref="214737495" role="backward"/>
+ <member type="way" ref="259120850" role="backward"/>
+ <member type="way" ref="52674599" role="backward"/>
+ <member type="way" ref="256345452" role="backward"/>
+ <member type="way" ref="256345447" role="backward"/>
+ <member type="way" ref="273525356" role="backward"/>
+ <member type="way" ref="273525352" role="backward"/>
+ <member type="way" ref="85354297" role="backward"/>
+ <member type="way" ref="3237220" role="backward"/>
+ <member type="way" ref="53845609" role="backward"/>
+ <member type="way" ref="4312325" role="backward"/>
+ <member type="way" ref="94398079" role="backward"/>
+ <member type="way" ref="259120845" role="backward"/>
+ <member type="way" ref="259120844" role="backward"/>
+ <member type="way" ref="20480339" role="backward"/>
+ <member type="way" ref="78256140" role="backward"/>
+ <member type="way" ref="259120857" role="backward"/>
+ <member type="way" ref="259120856" role="backward"/>
+ <member type="way" ref="273525362" role="backward"/>
+ <member type="way" ref="72450071" role="backward"/>
+ <member type="way" ref="273525367" role="backward"/>
+ <member type="way" ref="209995729" role="backward"/>
+ <member type="way" ref="308472978" role="backward"/>
+ <member type="way" ref="273525375" role="backward"/>
+ <member type="way" ref="37288094" role="backward"/>
+ <member type="way" ref="212474429" role="backward"/>
+ <member type="way" ref="273525370" role="backward"/>
+ <member type="way" ref="291248985" role="backward"/>
+ <member type="way" ref="78032114" role="backward"/>
+ <member type="way" ref="78032081" role="backward"/>
+ <member type="way" ref="27265867" role="backward"/>
+ <member type="way" ref="28718331" role="backward"/>
+ <member type="way" ref="93997861" role="backward"/>
+ <member type="way" ref="361956627" role="forward"/>
+ <member type="way" ref="361956628" role="forward"/>
+ <member type="way" ref="110375811" role=""/>
+ <member type="way" ref="317110547" role=""/>
+ <member type="way" ref="337607834" role=""/>
+ <member type="way" ref="317110546" role=""/>
+ <member type="way" ref="395653344" role=""/>
+ <member type="way" ref="337601072" role=""/>
+ <member type="way" ref="177914702" role=""/>
+ <member type="way" ref="177914703" role=""/>
+ <tag k="ref" v="B 169"/>
+ <tag k="TMC:cid_58:tabcd_1:Class" v="Segment"/>
+ <tag k="TMC:cid_58:tabcd_1:Direction" v="both"/>
+ <tag k="TMC:cid_58:tabcd_1:LCLversion" v="9.00"/>
+ <tag k="TMC:cid_58:tabcd_1:LocationCode" v="51125"/>
+ <tag k="TMC:cid_58:tabcd_1:NextLocationCode" v="52444"/>
+ <tag k="TMC:cid_58:tabcd_1:PrevLocationCode" v="8514"/>
+ <tag k="type" v="TMC"/>
+ </relation>
+</osm>
diff --git a/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java b/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
index d3a031e..2f5a6c9 100644
--- a/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
+++ b/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
@@ -2,6 +2,8 @@
package org.openstreetmap.josm.data.osm;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
@@ -76,19 +78,19 @@ public class KeyValuePerformanceTest {
timer = PerformanceTestUtils.startTimer("str1 == str2 succeeds");
for (int i = 0; i < STRING_INTERN_TESTS; i++) {
- assertTrue(str1Interned == str1InternedB);
+ assertSame(str1Interned, str1InternedB);
}
timer.done();
timer = PerformanceTestUtils.startTimer("str1 == str2.intern() succeeds");
for (int i = 0; i < STRING_INTERN_TESTS; i++) {
- assertTrue(str1Interned == str1.intern());
+ assertSame(str1Interned, str1.intern());
}
timer.done();
timer = PerformanceTestUtils.startTimer("str1 == str2.intern() succeeds for interned string");
for (int i = 0; i < STRING_INTERN_TESTS; i++) {
- assertTrue(str1Interned == str1InternedB.intern());
+ assertSame(str1Interned, str1InternedB.intern());
}
timer.done();
@@ -100,13 +102,13 @@ public class KeyValuePerformanceTest {
timer = PerformanceTestUtils.startTimer("str1 == str2 fails");
for (int i = 0; i < STRING_INTERN_TESTS; i++) {
- assertFalse(str1Interned == str2Interned);
+ assertNotSame(str1Interned, str2Interned);
}
timer.done();
timer = PerformanceTestUtils.startTimer("str1 == str2.intern() fails");
for (int i = 0; i < STRING_INTERN_TESTS; i++) {
- assertFalse(str1Interned == str2.intern());
+ assertNotSame(str1Interned, str2.intern());
}
timer.done();
}
diff --git a/test/unit/org/openstreetmap/josm/JOSMFixture.java b/test/unit/org/openstreetmap/josm/JOSMFixture.java
index d946a1a..d80f69f 100644
--- a/test/unit/org/openstreetmap/josm/JOSMFixture.java
+++ b/test/unit/org/openstreetmap/josm/JOSMFixture.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm;
import static org.junit.Assert.fail;
import java.io.File;
+import java.io.IOException;
import java.nio.file.Paths;
import java.text.MessageFormat;
@@ -11,6 +12,7 @@ import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
+import org.openstreetmap.josm.io.CertificateAmendment;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.I18n;
@@ -92,6 +94,12 @@ public class JOSMFixture {
Main.pref.init(false);
I18n.set(Main.pref.get("language", "en"));
+ try {
+ CertificateAmendment.addMissingCertificates();
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
+
// init projection
Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
diff --git a/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java b/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java
index bf30261..89bd4b1 100644
--- a/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java
@@ -43,10 +43,10 @@ public class OrthogonalizeActionTest {
public void testClosedWay() throws Exception {
final DataSet ds = performTest("name=ClosedWay");
final Way way = ds.getSelectedWays().iterator().next();
- assertEquals(new LatLon(8.538808176881814, 55.72978898396922), way.getNode(0).getCoor());
- assertEquals(new LatLon(8.539618224318104, 55.73039799489563), way.getNode(1).getCoor());
- assertEquals(new LatLon(8.538993302766201, 55.73124794515577), way.getNode(2).getCoor());
- assertEquals(new LatLon(8.538183254003354, 55.730638934229376), way.getNode(3).getCoor());
+ assertEquals(new LatLon(8.5388082, 55.7297890), way.getNode(0).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5396182, 55.7303980), way.getNode(1).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5389933, 55.7312479), way.getNode(2).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5381833, 55.7306389), way.getNode(3).getCoor().getRoundedToOsmPrecision());
verifyRectangleClockwise(way);
}
@@ -64,10 +64,10 @@ public class OrthogonalizeActionTest {
public void testClosedWayWithReferenceNodes() throws Exception {
final DataSet ds = performTest("name=ClosedWayWithReferenceNodes");
final Way way = ds.getSelectedWays().iterator().next();
- assertEquals(new LatLon(8.534711427, 55.73000670312), way.getNode(0).getCoor());
- assertEquals(new LatLon(8.53547720918594, 55.73067141759374), way.getNode(1).getCoor());
- assertEquals(new LatLon(8.534835495633061, 55.73142735279376), way.getNode(2).getCoor());
- assertEquals(new LatLon(8.53406971216, 55.73076263832), way.getNode(3).getCoor());
+ assertEquals(new LatLon(8.5347114, 55.7300067), way.getNode(0).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5354772, 55.7306714), way.getNode(1).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5348355, 55.7314274), way.getNode(2).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5340697, 55.7307626), way.getNode(3).getCoor().getRoundedToOsmPrecision());
verifyRectangleClockwise(way);
}
@@ -76,10 +76,10 @@ public class OrthogonalizeActionTest {
final DataSet ds = performTest(
"name=NodeToRectify-01", "name=NodeToRectify-02", "name=NodeToRectify-03", "name=NodeToRectify-04");
final List<Node> nodes = new ArrayList<>(ds.getSelectedNodes());
- assertEquals(new LatLon(8.532735415272217, 55.72986948949525), nodes.get(0).getCoor());
- assertEquals(new LatLon(8.533520827858515, 55.73043325105434), nodes.get(1).getCoor());
- assertEquals(new LatLon(8.532914283300173, 55.73129729115582), nodes.get(2).getCoor());
- assertEquals(new LatLon(8.532055019939826, 55.73068052126457), nodes.get(3).getCoor());
+ assertEquals(new LatLon(8.5327354, 55.7298695), nodes.get(0).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5335208, 55.7304333), nodes.get(1).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5329143, 55.7312973), nodes.get(2).getCoor().getRoundedToOsmPrecision());
+ assertEquals(new LatLon(8.5320550, 55.7306805), nodes.get(3).getCoor().getRoundedToOsmPrecision());
}
DataSet performTest(String... search) throws Exception {
diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTaskTest.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTaskTest.java
new file mode 100644
index 0000000..ed96da4
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTaskTest.java
@@ -0,0 +1,53 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+
+/**
+ * Unit tests for class {@link DownloadReferrersTask}.
+ */
+public class DownloadReferrersTaskTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@code DownloadReferrersTask#DownloadReferrersTask}.
+ */
+ @Test
+ public void testDownloadReferrersTask() {
+ DataSet ds = new DataSet();
+ Node n1 = (Node) OsmPrimitiveType.NODE.newInstance(-1, true);
+ n1.setCoor(LatLon.ZERO);
+ Node n2 = new Node(1);
+ n2.setCoor(LatLon.ZERO);
+ ds.addPrimitive(n1);
+ ds.addPrimitive(n2);
+ OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
+ assertNotNull(new DownloadReferrersTask(layer, null));
+ assertNotNull(new DownloadReferrersTask(layer, ds.allPrimitives()));
+ try {
+ new DownloadReferrersTask(layer, n1.getPrimitiveId(), null);
+ fail();
+ } catch (IllegalArgumentException e) {
+ assertEquals("Cannot download referrers for new primitives (ID -1)", e.getMessage());
+ }
+ assertNotNull(new DownloadReferrersTask(layer, n2.getPrimitiveId(), null));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskListTest.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskListTest.java
new file mode 100644
index 0000000..c865f3a
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskListTest.java
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests for class {@link DownloadTaskList}.
+ */
+public class DownloadTaskListTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@code DownloadTaskList#DownloadTaskList}.
+ */
+ @Test
+ public void testDownloadTaskList() {
+ assertTrue(new DownloadTaskList().getDownloadedPrimitives().isEmpty());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java b/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java
new file mode 100644
index 0000000..cd6322c
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java
@@ -0,0 +1,38 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.notes;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Date;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests for class {@link NoteComment}.
+ */
+public class NoteCommentTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void init() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link NoteComment} class.
+ */
+ @Test
+ public void testNoteComment() {
+ NoteComment comment = new NoteComment(new Date(), null, "foo", null, true);
+ assertEquals("foo", comment.toString());
+ assertTrue(comment.isNew());
+ comment.setNew(false);
+ assertFalse(comment.isNew());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java b/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java
new file mode 100644
index 0000000..c708faa
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java
@@ -0,0 +1,69 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.notes;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.Date;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
+/**
+ * Unit tests for class {@link NoteComment}.
+ */
+public class NoteTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void init() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link Note#toString} method.
+ */
+ @Test
+ public void testToString() {
+ Note note = new Note(LatLon.ZERO);
+ assertEquals("Note 0: null", note.toString());
+ note.addComment(new NoteComment(new Date(), null, "foo", null, true));
+ assertEquals("Note 0: foo", note.toString());
+ }
+
+ /**
+ * Unit test of {@link Note#updateWith} method.
+ */
+ @Test
+ public void testUpdateWith() {
+ Note n1 = new Note(LatLon.ZERO);
+ n1.setId(1);
+ Note n2 = new Note(LatLon.ZERO);
+ n1.setId(2);
+ assertNotEquals(n1, n2);
+ n1.updateWith(n2);
+ assertEquals(n1, n2);
+ }
+
+ /**
+ * Unit test of methods {@link Note#equals} and {@link Note#hashCode}.
+ */
+ @Test
+ public void equalsContract() {
+ EqualsVerifier.forClass(Note.class).usingGetClass()
+ .withIgnoredFields("latLon", "createdAt", "closedAt", "state", "comments")
+ .suppress(Warning.NONFINAL_FIELDS)
+ .withPrefabValues(LatLon.class, LatLon.ZERO, new LatLon(1, 1))
+ .withPrefabValues(NoteComment.class,
+ new NoteComment(new Date(), null, "foo", null, true),
+ new NoteComment(new Date(), null, "bar", null, false))
+ .verify();
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java b/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java
new file mode 100644
index 0000000..b36bc57
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+public class NodeDataTest {
+ @Test
+ public void testSerializationForDragAndDrop() throws Exception {
+ final NodeData data = new NodeData();
+ data.setCoor(new LatLon(31.14, 15.9));
+ data.setId(314);
+ data.setVersion(14);
+ data.setChangesetId(314159);
+ final Object readData;
+ try (final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ final ObjectOutputStream out = new ObjectOutputStream(bytes)) {
+ out.writeObject(data);
+ try (final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
+ readData = in.readObject();
+ }
+ }
+ Assert.assertEquals(data.toString(), readData.toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java b/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java
new file mode 100644
index 0000000..4e0b2c3
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class WayDataTest {
+ @Test
+ public void testSerializationForDragAndDrop() throws Exception {
+ final WayData data = new WayData();
+ data.setNodes(Arrays.asList(1415L, 9265L, 3589L, 7932L, 3846L));
+ data.setId(314);
+ data.setVersion(14);
+ data.setChangesetId(314159);
+ final Object readData;
+ try (final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ final ObjectOutputStream out = new ObjectOutputStream(bytes)) {
+ out.writeObject(data);
+ try (final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
+ readData = in.readObject();
+ }
+ }
+ Assert.assertEquals(data.toString(), readData.toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
index 42aff39..484154a 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
@@ -43,7 +43,6 @@ import org.openstreetmap.josm.tools.Pair;
public class ProjectionRegressionTest {
private static final String PROJECTION_DATA_FILE = "data_nodist/projection/projection-regression-test-data";
- private static final String PROJECTION_DATA_FILE_JAVA_9 = "data_nodist/projection/projection-regression-test-data-java9";
private static class TestData {
public String code;
@@ -52,10 +51,6 @@ public class ProjectionRegressionTest {
public LatLon ll2;
}
- private static String getProjectionDataFile() {
- return TestUtils.getJavaVersion() >= 9 ? PROJECTION_DATA_FILE_JAVA_9 : PROJECTION_DATA_FILE;
- }
-
/**
* Program entry point to update reference projection file.
* @param args not used
@@ -70,7 +65,7 @@ public class ProjectionRegressionTest {
}
List<TestData> prevData = new ArrayList<>();
- if (new File(getProjectionDataFile()).exists()) {
+ if (new File(PROJECTION_DATA_FILE).exists()) {
prevData = readData();
}
Map<String, TestData> prevCodesMap = new HashMap<>();
@@ -92,7 +87,7 @@ public class ProjectionRegressionTest {
Random rand = new Random();
try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
- new FileOutputStream(getProjectionDataFile()), StandardCharsets.UTF_8))) {
+ new FileOutputStream(PROJECTION_DATA_FILE), StandardCharsets.UTF_8))) {
out.write("# Data for test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java\n");
out.write("# Format: 1. Projection code; 2. lat/lon; 3. lat/lon projected -> east/north; 4. east/north (3.) inverse projected\n");
for (String code : codesToWrite) {
@@ -116,8 +111,12 @@ public class ProjectionRegressionTest {
System.out.println("Update successful.");
}
+ private static EastNorth getRoundedToOsmPrecision(double east, double north) {
+ return new EastNorth(LatLon.roundToOsmPrecision(east), LatLon.roundToOsmPrecision(north));
+ }
+
private static List<TestData> readData() throws IOException, FileNotFoundException {
- try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(getProjectionDataFile()),
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE),
StandardCharsets.UTF_8))) {
List<TestData> result = new ArrayList<>();
String line;
@@ -186,6 +185,13 @@ public class ProjectionRegressionTest {
continue;
}
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)) {
String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
" expected: eastnorth(%s,%s),%n" +
@@ -193,7 +199,6 @@ public class ProjectionRegressionTest {
proj.toString(), data.code, data.ll.lat(), data.ll.lon(), data.en.east(), data.en.north(), en.east(), en.north());
fail.append(error);
}
- LatLon ll2 = proj.eastNorth2latlon(data.en);
if (!ll2.equals(data.ll2)) {
String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
" expected: latlon(%s,%s),%n" +
diff --git a/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java b/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java
index 238ea63..53ab7cd 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java
@@ -19,6 +19,7 @@ package org.openstreetmap.josm.data.validation.routines;
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 static org.junit.Assert.fail;
@@ -477,4 +478,12 @@ public class DomainValidatorTest {
}
return sorted && strictlySorted && lowerCase;
}
+
+ /**
+ * Unit test of {@link DomainValidator#getValidatorName}.
+ */
+ @Test
+ public void testValidatorName() {
+ assertNull(DomainValidator.getInstance().getValidatorName());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java b/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java
index bca3e7d..d151d01 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java
@@ -573,4 +573,12 @@ public class EmailValidatorTest {
public void testValidator374() {
assertTrue(validator.isValid("abc at school.school"));
}
+
+ /**
+ * Unit test of {@link EmailValidator#getValidatorName}.
+ */
+ @Test
+ public void testValidatorName() {
+ assertEquals("Email validator", EmailValidator.getInstance().getValidatorName());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java b/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java
index c42bcde..b76d4b6 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java
@@ -18,6 +18,7 @@
package org.openstreetmap.josm.data.validation.routines;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
@@ -614,4 +615,12 @@ public class InetAddressValidatorTest {
// CHECKSTYLE.ON: ExecutableStatementCount
// CHECKSTYLE.ON: MethodLengthCheck
// CHECKSTYLE.ON: LineLength
+
+ /**
+ * Unit test of {@link InetAddressValidator#getValidatorName}.
+ */
+ @Test
+ public void testValidatorName() {
+ assertNull(new InetAddressValidator().getValidatorName());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java b/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java
index dc2be10..f288446 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java
@@ -256,6 +256,14 @@ public class RegexValidatorTest {
}
/**
+ * Unit test of {@link RegexValidator#getValidatorName}.
+ */
+ @Test
+ public void testValidatorName() {
+ assertNull(new RegexValidator(".*").getValidatorName());
+ }
+
+ /**
* Compare two arrays
* @param label Label for the test
* @param expect Expected array
diff --git a/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java b/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java
index cefd487..c0f3b29 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java
@@ -545,6 +545,14 @@ public class UrlValidatorTest {
assertTrue(validator.isValid("http://www.apache.org:/path"));
}
+ /**
+ * Unit test of {@link UrlValidator#getValidatorName}.
+ */
+ @Test
+ public void testValidatorName() {
+ assertEquals("URL validator", UrlValidator.getInstance().getValidatorName());
+ }
+
//-------------------- Test data for creating a composite URL
/**
* The data given below approximates the 4 parts of a URL
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/LongSegmentTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/LongSegmentTest.java
new file mode 100644
index 0000000..da1c6fe
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/LongSegmentTest.java
@@ -0,0 +1,59 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+
+/**
+ * JUnit Test of "Long Segment" validation test.
+ */
+public class LongSegmentTest {
+
+ /**
+ * Setup test.
+ */
+ @Before
+ public void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ private static int test(Way w) throws Exception {
+ LongSegment test = new LongSegment();
+ test.initialize();
+ test.startTest(null);
+ test.visit(w);
+ test.endTest();
+ return test.getErrors().size();
+ }
+
+ /**
+ * Unit test
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testLongSegment() throws Exception {
+ // Long way
+ Way w = new Way();
+ // https://www.openstreetmap.org/node/798475224
+ w.addNode(new Node(new LatLon(54.1523672, 12.0979025)));
+ // https://www.openstreetmap.org/node/468120683
+ w.addNode(new Node(new LatLon(54.5737391, 11.9246324)));
+ assertEquals(1, test(w));
+
+ // Ferry route
+ w.put("route", "ferry");
+ assertEquals(0, test(w));
+
+ // Short way
+ w = new Way();
+ w.addNode(new Node(new LatLon(54.152, 12.097)));
+ w.addNode(new Node(new LatLon(54.153, 12.098)));
+ assertEquals(0, test(w));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java
index f2b596d..2054401 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java
@@ -66,5 +66,14 @@ public class PublicTransportRouteTestTest {
assertEquals(1, test.getErrors().size());
assertEquals("Route relation contains a gap", test.getErrors().get(0).getMessage());
+ final Relation r5 = TestUtils.newRelation("type=route route=tram public_transport:version=2",
+ new RelationMember("", w1), new RelationMember("", w2), new RelationMember("", w3),
+ new RelationMember("stop", w1.firstNode()), new RelationMember("stop", w4.lastNode()));
+ test.startTest(null);
+ test.visit(r5);
+ assertEquals(1, test.getErrors().size());
+ assertEquals("Stop position not part of route", test.getErrors().get(0).getMessage());
+ assertEquals(w4.lastNode(), test.getErrors().get(0).getPrimitives().iterator().next());
+
}
}
diff --git a/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
new file mode 100644
index 0000000..1834362
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
@@ -0,0 +1,78 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
+import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.plugins.PluginHandlerTestIT;
+import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.PluginListParseException;
+import org.openstreetmap.josm.plugins.PluginListParser;
+
+/**
+ * Unit tests of {@link MainApplication} class.
+ */
+public class MainApplicationTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ /**
+ * Test of {@link MainApplication#updateAndLoadEarlyPlugins} and {@link MainApplication#loadLatePlugins} methods.
+ * @throws PluginListParseException if an error occurs
+ */
+ @Test
+ public void testUpdateAndLoadPlugins() throws PluginListParseException {
+ final String old = System.getProperty("josm.plugins");
+ try {
+ System.setProperty("josm.plugins", "buildings_tools,plastic_laf");
+ SplashProgressMonitor monitor = new SplashProgressMonitor("foo", new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ // Do nothing
+ }
+ });
+ Collection<PluginInformation> plugins = MainApplication.updateAndLoadEarlyPlugins(null, monitor);
+ if (plugins.isEmpty()) {
+ PluginHandlerTestIT.downloadPlugins(Arrays.asList(
+ newPluginInformation("buildings_tools"),
+ newPluginInformation("plastic_laf")));
+ plugins = MainApplication.updateAndLoadEarlyPlugins(null, monitor);
+ }
+ assertEquals(2, plugins.size());
+ assertNotNull(PluginHandler.getPlugin("plastic_laf"));
+ assertNull(PluginHandler.getPlugin("buildings_tools"));
+ MainApplication.loadLatePlugins(null, monitor, plugins);
+ assertNotNull(PluginHandler.getPlugin("buildings_tools"));
+ } finally {
+ if (old != null) {
+ System.setProperty("josm.plugins", old);
+ } else {
+ System.clearProperty("josm.plugins");
+ }
+ }
+ }
+
+ private static PluginInformation newPluginInformation(String plugin) throws PluginListParseException {
+ //return new PluginInformation(new File(TestUtils.getTestDataRoot()+File.separator+"plugin"+File.separator+plugin+".jar"));
+ return PluginListParser.createInfo(plugin+".jar", "https://svn.openstreetmap.org/applications/editors/josm/dist/"+plugin+".jar",
+ "");
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java b/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java
new file mode 100644
index 0000000..f1cb017
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java
@@ -0,0 +1,116 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Set;
+
+import javax.swing.JTable;
+import javax.swing.table.TableCellRenderer;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.reflections.Reflections;
+
+/**
+ * Checks if all classes implementing the {@link TableCellRenderer} interface do
+ * accept a null value as second parameter for
+ * {@link TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable,
+ * java.lang.Object, boolean, boolean, int, int)}.
+ *
+ * For unknown reason java sometimes call getTableCellRendererComponent method
+ * with value = null. Every implementation of {@code getTableCellRendererComponent}
+ * must fail gracefully when null is passed as value parameter.
+ *
+ * This test scans the classpath for classes implementing {@code TableCellRenderer},
+ * creates an instance and calls {@code getTableCellRendererComponent} with null
+ * value to check if a NPE is thrown.
+ *
+ * @see <a href="https://josm.openstreetmap.de/ticket/6301">#6301</a>
+ */
+public class TableCellRendererTest {
+
+ // list of classes that cannot be easily tested and are verified either manually or another unit tests
+ private static final Collection<String> SKIP_TEST = Arrays.asList(
+ "org.openstreetmap.josm.gui.dialogs.FilterDialog$BooleanRenderer",
+ "org.openstreetmap.josm.gui.dialogs.relation.SelectionTableCellRenderer"
+ );
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createFunctionalTestFixture().init(true);
+ }
+
+ /**
+ * Unit test of all table cell renderers against null values.
+ */
+ @Test
+ public void tableCellRendererTest() {
+ Reflections reflections = new Reflections("org.openstreetmap.josm");
+ Set<Class<? extends TableCellRenderer>> renderers = reflections.getSubTypesOf(TableCellRenderer.class);
+ Assert.assertTrue(renderers.size() >= 10); // if it finds less than 10 classes, something is broken
+ JTable tbl = new JTable(2, 2);
+ for (Class<? extends TableCellRenderer> klass : renderers) {
+ if (Modifier.isAbstract(klass.getModifiers()) || SKIP_TEST.contains(klass.getName())) {
+ continue;
+ }
+ if (klass.isAnonymousClass()) {
+ continue;
+ }
+ TableCellRenderer tcr = createInstance(klass);
+ try {
+ tcr.getTableCellRendererComponent(tbl, null, false, false, 0, 0);
+ } catch (NullPointerException npe) {
+ npe.printStackTrace();
+ Assert.fail("NPE in getTableCellRendererComponent");
+ }
+ }
+ }
+
+ /**
+ * Create an instance of a class assuming it has a no-args constructor.
+ * @param <T> the class or a super-type of the class
+ * @param klass the class
+ * @return an instance of the class
+ */
+ private static <T> T createInstance(Class<? extends T> klass) {
+ boolean needOuterClass = klass.isMemberClass() && !Modifier.isStatic(klass.getModifiers());
+ Constructor<? extends T> c;
+ try {
+ if (needOuterClass) {
+ c = klass.getDeclaredConstructor(klass.getDeclaringClass());
+ } else {
+ c = klass.getDeclaredConstructor();
+ }
+ } catch (NoSuchMethodException ex) {
+ // no default constructor - to fix this, add a default constructor
+ // to the class or add the class to the SKIP_TEST list above
+ Assert.fail("No default constructor - cannot test TableCellRenderer: " + ex);
+ return null;
+ } catch (SecurityException ex) {
+ throw new RuntimeException(ex);
+ }
+ c.setAccessible(true);
+ T o;
+ try {
+ if (needOuterClass) {
+ Object outerInstance = createInstance(klass.getDeclaringClass());
+ o = c.newInstance(outerInstance);
+ } else {
+ o = c.newInstance();
+ }
+ } catch (InstantiationException | IllegalArgumentException | IllegalAccessException | InvocationTargetException ex) {
+ throw new RuntimeException(ex);
+ }
+ return o;
+ }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java b/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java
new file mode 100644
index 0000000..3d688a5
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/correction/RoleCorrectionTableTest.java
@@ -0,0 +1,77 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.correction;
+
+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.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.correction.RoleCorrection;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+
+/**
+ * Unit tests of {@link RoleCorrectionTable} class.
+ */
+public class RoleCorrectionTableTest {
+
+ /**
+ * Setup tests
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Test of {@link RoleCorrectionTable#RoleCorrectionTable}.
+ */
+ @Test
+ public void testRoleCorrectionTable() {
+ Relation r = new Relation();
+ RelationMember member = new RelationMember("foo", new Node());
+ r.addMember(member);
+ RoleCorrection rc = new RoleCorrection(r, 0, member, "bar");
+ RoleCorrectionTable t = new RoleCorrectionTable(Arrays.asList(rc));
+ assertNotNull(t.getCellRenderer(0, 0));
+ assertNotNull(t.getCellRenderer(0, 1));
+ assertNotNull(t.getCellRenderer(0, 2));
+ assertNotNull(t.getCellRenderer(0, 3));
+ RoleCorrectionTableModel model = t.getCorrectionTableModel();
+ assertEquals(1, model.getCorrections().size());
+ assertEquals(1, model.getRowCount());
+ assertEquals(3, model.getApplyColumn());
+ assertTrue(model.getApply(0));
+ assertEquals(String.class, model.getColumnClass(0));
+ assertEquals(Boolean.class, model.getColumnClass(3));
+ assertEquals("Relation", model.getColumnName(0));
+ assertEquals("Old role", model.getColumnName(1));
+ assertEquals("New role", model.getColumnName(2));
+ assertEquals("Apply?", model.getColumnName(3));
+ assertNull(model.getColumnName(4));
+ assertFalse(model.isCellEditable(0, 0));
+ assertTrue(model.isCellEditable(0, 3));
+ assertEquals("relation (0, 1 member)", model.getValueAt(0, 0));
+ assertEquals("foo", model.getValueAt(0, 1));
+ assertEquals("bar", model.getValueAt(0, 2));
+ assertEquals(Boolean.TRUE, model.getValueAt(0, 3));
+ assertNull(model.getValueAt(0, 4));
+ model.setValueAt("", 0, 0);
+ assertEquals("relation (0, 1 member)", model.getValueAt(0, 0));
+ model.setValueAt("", 0, 3);
+ assertEquals(Boolean.TRUE, model.getValueAt(0, 3));
+ model.setValueAt(Boolean.FALSE, 0, 3);
+ assertEquals(Boolean.FALSE, model.getValueAt(0, 3));
+ RoleCorrection[] array = new RoleCorrection[15];
+ Arrays.fill(array, rc);
+ t = new RoleCorrectionTable(Arrays.asList(array));
+ assertEquals(array.length, t.getCorrectionTableModel().getCorrections().size());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java b/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java
new file mode 100644
index 0000000..6fcca46
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/correction/TagCorrectionTableTest.java
@@ -0,0 +1,88 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.correction;
+
+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.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.correction.TagCorrection;
+
+/**
+ * Unit tests of {@link TagCorrectionTable} class.
+ */
+public class TagCorrectionTableTest {
+
+ /**
+ * Setup tests
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Test of {@link TagCorrectionTable#TagCorrectionTable}.
+ */
+ @Test
+ public void testTagCorrectionTable() {
+ TagCorrection tc1 = new TagCorrection("foo", "bar", "foo", "baz");
+ TagCorrection tc2 = new TagCorrection("bar", "foo", "baz", "foo");
+ TagCorrectionTable t = new TagCorrectionTable(Arrays.asList(tc1, tc2));
+ assertNotNull(t.getCellRenderer(0, 0));
+ assertNotNull(t.getCellRenderer(0, 1));
+ assertNotNull(t.getCellRenderer(0, 2));
+ assertNotNull(t.getCellRenderer(0, 3));
+ assertNotNull(t.getCellRenderer(0, 4));
+ assertNotNull(t.getCellRenderer(1, 0));
+ assertNotNull(t.getCellRenderer(1, 1));
+ assertNotNull(t.getCellRenderer(1, 2));
+ assertNotNull(t.getCellRenderer(1, 3));
+ assertNotNull(t.getCellRenderer(1, 4));
+ TagCorrectionTableModel model = t.getCorrectionTableModel();
+ assertEquals(2, model.getCorrections().size());
+ assertEquals(2, model.getRowCount());
+ assertEquals(4, model.getApplyColumn());
+ assertTrue(model.getApply(0));
+ assertEquals(String.class, model.getColumnClass(0));
+ assertEquals(Boolean.class, model.getColumnClass(4));
+ assertEquals("Old key", model.getColumnName(0));
+ assertEquals("Old value", model.getColumnName(1));
+ assertEquals("New key", model.getColumnName(2));
+ assertEquals("New value", model.getColumnName(3));
+ assertEquals("Apply?", model.getColumnName(4));
+ assertNull(model.getColumnName(5));
+ assertFalse(model.isCellEditable(0, 0));
+ assertFalse(model.isCellEditable(1, 0));
+ assertTrue(model.isCellEditable(0, 4));
+ assertTrue(model.isCellEditable(1, 4));
+ assertEquals("foo", model.getValueAt(0, 0));
+ assertEquals("bar", model.getValueAt(0, 1));
+ assertEquals("foo", model.getValueAt(0, 2));
+ assertEquals("baz", model.getValueAt(0, 3));
+ assertEquals(Boolean.TRUE, model.getValueAt(0, 4));
+ assertNull(model.getValueAt(0, 5));
+ assertEquals("bar", model.getValueAt(1, 0));
+ assertEquals("foo", model.getValueAt(1, 1));
+ assertEquals("baz", model.getValueAt(1, 2));
+ assertEquals("foo", model.getValueAt(1, 3));
+ assertEquals(Boolean.TRUE, model.getValueAt(1, 4));
+ assertNull(model.getValueAt(1, 5));
+ model.setValueAt("", 0, 0);
+ assertEquals("foo", model.getValueAt(0, 0));
+ model.setValueAt("", 0, 4);
+ assertEquals(Boolean.TRUE, model.getValueAt(0, 4));
+ model.setValueAt(Boolean.FALSE, 0, 4);
+ assertEquals(Boolean.FALSE, model.getValueAt(0, 4));
+ TagCorrection[] array = new TagCorrection[15];
+ Arrays.fill(array, tc1);
+ t = new TagCorrectionTable(Arrays.asList(array));
+ assertEquals(array.length, t.getCorrectionTableModel().getCorrections().size());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/LayerListDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/LayerListDialogTest.java
deleted file mode 100644
index 74100c7..0000000
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/LayerListDialogTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs;
-
-import static org.junit.Assert.assertEquals;
-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.gui.dialogs.LayerListDialog.LayerGammaAction;
-import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
-import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerOpacityAction;
-import org.openstreetmap.josm.gui.layer.TMSLayer;
-import org.openstreetmap.josm.gui.layer.TMSLayerTest;
-
-/**
- * Unit tests of {@link LayerListDialog} class.
- */
-public class LayerListDialogTest {
-
- /**
- * Setup tests
- */
- @BeforeClass
- public static void setUpBeforeClass() {
- JOSMFixture.createUnitTestFixture().init(true);
- }
-
- /**
- * Unit test of {@link LayerGammaAction} class.
- */
- @Test
- public void testLayerGammaAction() {
- TMSLayer layer = TMSLayerTest.createTmsLayer();
- try {
- Main.map.mapView.addLayer(layer);
- LayerListModel model = LayerListDialog.getInstance().getModel();
- LayerGammaAction action = new LayerGammaAction(model);
- action.updateEnabledState();
- assertTrue(action.isEnabled());
- assertTrue(action.supportLayers(model.getSelectedLayers()));
- assertEquals(1.0, action.getValue(), 1e-15);
- action.setValue(0.5);
- assertEquals(0.5, action.getValue(), 1e-15);
- } finally {
- Main.map.mapView.removeLayer(layer);
- }
- }
-
- /**
- * Unit test of {@link LayerOpacityAction} class.
- */
- @Test
- public void testLayerOpacityAction() {
- TMSLayer layer = TMSLayerTest.createTmsLayer();
- try {
- Main.map.mapView.addLayer(layer);
- LayerListModel model = LayerListDialog.getInstance().getModel();
- LayerOpacityAction action = new LayerOpacityAction(model);
- action.updateEnabledState();
- assertTrue(action.isEnabled());
- assertTrue(action.supportLayers(model.getSelectedLayers()));
- assertEquals(1.0, action.getValue(), 1e-15);
- action.setValue(0.5);
- assertEquals(0.5, action.getValue(), 1e-15);
- } finally {
- Main.map.mapView.removeLayer(layer);
- }
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java
new file mode 100644
index 0000000..f1ba16a
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java
@@ -0,0 +1,29 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+
+/**
+ * Unit tests of {@link MapPaintDialog} class.
+ */
+public class MapPaintDialogTest {
+
+ /**
+ * Setup tests
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ /**
+ * Unit test of {@link MapPaintDialog.InfoAction} class.
+ */
+ @Test
+ public void testInfoAction() {
+ Main.map.mapPaintDialog.new InfoAction().actionPerformed(null);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java
new file mode 100644
index 0000000..5ed2933
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java
@@ -0,0 +1,90 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.layer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+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.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.gui.layer.TMSLayer;
+import org.openstreetmap.josm.gui.layer.TMSLayerTest;
+
+/**
+ * Unit tests of {@link LayerVisibilityAction} class.
+ */
+public class LayerVisibilityActionTest {
+
+ /**
+ * Setup tests
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ /**
+ * Unit test of {@link LayerVisibilityAction} class.
+ */
+ @Test
+ public void testLayerVisibilityAction() {
+ TMSLayer layer = TMSLayerTest.createTmsLayer();
+ try {
+ LayerListModel model = LayerListDialog.getInstance().getModel();
+ LayerVisibilityAction action = new LayerVisibilityAction(model);
+ action.updateEnabledState();
+ assertFalse(action.isEnabled());
+
+ Main.map.mapView.addLayer(layer);
+ action.updateEnabledState();
+ assertTrue(action.isEnabled());
+ assertTrue(action.supportLayers(model.getSelectedLayers()));
+
+ // now check values
+ action.updateValues();
+ assertEquals(1.0, action.opacitySlider.getRealValue(), 1e-15);
+
+ action.opacitySlider.setRealValue(.5);
+ action.updateValues();
+
+ assertEquals(0.5, action.opacitySlider.getRealValue(), 1e-15);
+
+ action.setVisibleFlag(false);
+ action.updateValues();
+ assertFalse(layer.isVisible());
+
+ action.setVisibleFlag(true);
+ action.updateValues();
+ assertTrue(layer.isVisible());
+
+ // layer stays visible during adjust
+ action.opacitySlider.setValueIsAdjusting(true);
+ action.opacitySlider.setRealValue(0);
+ assertEquals(0, layer.getOpacity(), 1e-15);
+ layer.setOpacity(.1); // to make layer.isVisible work
+ assertTrue(layer.isVisible());
+ layer.setOpacity(0);
+
+ action.opacitySlider.setValueIsAdjusting(false);
+ action.opacitySlider.setRealValue(0);
+ assertEquals(0, layer.getOpacity(), 1e-15);
+ layer.setOpacity(.1); // to make layer.isVisible work
+ assertFalse(layer.isVisible());
+ layer.setOpacity(0);
+ action.updateValues();
+
+ // Opacity reset when it was 0 and user set layer to visible.
+ action.setVisibleFlag(true);
+ action.updateValues();
+ assertEquals(1.0, action.opacitySlider.getRealValue(), 1e-15);
+ assertEquals(1.0, layer.getOpacity(), 1e-15);
+
+ } finally {
+ Main.map.mapView.removeLayer(layer);
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java
index 09db58d..cd5ba13 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java
@@ -3,12 +3,18 @@ package org.openstreetmap.josm.gui.dialogs.properties;
import static org.junit.Assert.assertEquals;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
import org.junit.BeforeClass;
import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator;
import org.openstreetmap.josm.data.osm.Way;
/**
@@ -24,6 +30,12 @@ public class PropertiesDialogTest {
JOSMFixture.createUnitTestFixture().init();
}
+ private static String createSearchSetting(DataSet ds, boolean sameType) {
+ List<OsmPrimitive> sel = new ArrayList<>(ds.allPrimitives());
+ Collections.sort(sel, new OsmPrimitiveComparator(true, false));
+ return PropertiesDialog.createSearchSetting("foo", sel, sameType).text;
+ }
+
/**
* Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12504">#12504</a>.
*/
@@ -38,15 +50,13 @@ public class PropertiesDialogTest {
}
ds.addPrimitive(n);
}
- assertEquals("(\"foo\"=\"bar\")",
- PropertiesDialog.createSearchSetting("foo", ds.allPrimitives(), false).text);
+ assertEquals("(\"foo\"=\"bar\")", createSearchSetting(ds, false));
Node n = new Node(LatLon.ZERO);
n.put("foo", "baz");
ds.addPrimitive(n);
- assertEquals("(\"foo\"=\"bar\") OR (\"foo\"=\"baz\")",
- PropertiesDialog.createSearchSetting("foo", ds.allPrimitives(), false).text);
+ assertEquals("(\"foo\"=\"baz\") OR (\"foo\"=\"bar\")", createSearchSetting(ds, false));
ds.removePrimitive(n);
@@ -54,7 +64,6 @@ public class PropertiesDialogTest {
w.put("foo", "bar");
ds.addPrimitive(w);
- assertEquals("(type:node \"foo\"=\"bar\") OR (type:way \"foo\"=\"bar\")",
- PropertiesDialog.createSearchSetting("foo", ds.allPrimitives(), true).text);
+ assertEquals("(type:way \"foo\"=\"bar\") OR (type:node \"foo\"=\"bar\")", createSearchSetting(ds, true));
}
}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
index e2dbf64..2a5bc49 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
@@ -6,13 +6,27 @@ import static org.junit.Assert.assertNull;
import java.util.Collections;
+import javax.swing.JPanel;
+
import org.junit.BeforeClass;
import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
+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.Relation;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.LeftButtonToolbar;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.ApplyAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.CancelAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.DeleteCurrentRelationAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.DuplicateRelationAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.OKAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.RefreshAction;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.tagging.TagEditorModel;
+import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
/**
* Unit tests of {@link GenericRelationEditor} class.
@@ -24,7 +38,49 @@ public class GenericRelationEditorTest {
*/
@BeforeClass
public static void setUpBeforeClass() {
- JOSMFixture.createUnitTestFixture().init();
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ /**
+ * Returns a new relation editor for unit tests.
+ * @param orig relation
+ * @param layer data layer
+ * @return new relation editor for unit tests
+ */
+ public static IRelationEditor newRelationEditor(final Relation orig, final OsmDataLayer layer) {
+ return new IRelationEditor() {
+ private Relation r = orig;
+
+ @Override
+ public void setRelation(Relation relation) {
+ r = relation;
+ }
+
+ @Override
+ public boolean isDirtyRelation() {
+ return false;
+ }
+
+ @Override
+ public Relation getRelationSnapshot() {
+ return r;
+ }
+
+ @Override
+ public Relation getRelation() {
+ return r;
+ }
+
+ @Override
+ public void reloadDataFromRelation() {
+ // Do nothing
+ }
+
+ @Override
+ public OsmDataLayer getLayer() {
+ return layer;
+ }
+ };
}
/**
@@ -40,4 +96,50 @@ public class GenericRelationEditorTest {
assertNotNull(GenericRelationEditor.addPrimitivesToRelation(new Relation(1), Collections.singleton(new Relation(2))));
}
+ /**
+ * Unit test of {@code GenericRelationEditor#build*} methods.
+ */
+ @Test
+ public void testBuild() {
+ DataSet ds = new DataSet();
+ Relation relation = new Relation(1);
+ ds.addPrimitive(relation);
+ OsmDataLayer layer = new OsmDataLayer(ds, "test", null);
+ IRelationEditor re = newRelationEditor(relation, layer);
+
+ MemberTableModel memberTableModel = new MemberTableModel(relation, layer, null);
+ MemberTable memberTable = new MemberTable(layer, relation, memberTableModel);
+
+ SelectionTableModel selectionTableModel = new SelectionTableModel(layer);
+ SelectionTable selectionTable = new SelectionTable(selectionTableModel, memberTableModel);
+
+ LeftButtonToolbar leftButtonToolbar = new LeftButtonToolbar(memberTable, memberTableModel, re);
+ assertNotNull(leftButtonToolbar.sortBelowButton);
+
+ AutoCompletingTextField tfRole = GenericRelationEditor.buildRoleTextField(re);
+ assertNotNull(tfRole);
+
+ TagEditorPanel tagEditorPanel = new TagEditorPanel(relation, null);
+
+ JPanel top = GenericRelationEditor.buildTagEditorPanel(tagEditorPanel);
+ JPanel bottom = GenericRelationEditor.buildMemberEditorPanel(
+ memberTable, memberTableModel, selectionTable, selectionTableModel, re, leftButtonToolbar, tfRole);
+ assertNotNull(top);
+ assertNotNull(bottom);
+ assertNotNull(GenericRelationEditor.buildSplitPane(top, bottom, re));
+
+ TagEditorModel tagModel = tagEditorPanel.getModel();
+
+ assertNotNull(GenericRelationEditor.buildOkCancelButtonPanel(
+ new OKAction(memberTable, memberTableModel, tagModel, layer, re, tfRole),
+ new CancelAction(memberTable, memberTableModel, tagModel, layer, re, tfRole)));
+ assertNotNull(GenericRelationEditor.buildSelectionControlButtonToolbar(memberTable, memberTableModel, selectionTableModel, re));
+ assertNotNull(GenericRelationEditor.buildSelectionTablePanel(selectionTable));
+
+ assertNotNull(GenericRelationEditor.buildToolBar(
+ new RefreshAction(memberTable, memberTableModel, tagModel, layer, re),
+ new ApplyAction(memberTable, memberTableModel, tagModel, layer, re),
+ new DuplicateRelationAction(memberTableModel, tagModel, layer),
+ new DeleteCurrentRelationAction(layer, re)));
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRendererTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRendererTest.java
index f14d57f..b497dbb 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRendererTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRendererTest.java
@@ -29,8 +29,7 @@ public class SelectionTableCellRendererTest {
@Test
public void testSelectionTableCellRenderer() {
MemberTableModel model = new MemberTableModel(null, null, null);
- SelectionTableCellRenderer r = new SelectionTableCellRenderer();
- r.setMemberTableModel(model);
+ SelectionTableCellRenderer r = new SelectionTableCellRenderer(model);
assertEquals(r, r.getTableCellRendererComponent(null, null, false, false, 0, 0));
assertEquals(r, r.getTableCellRendererComponent(new JTable(model), new Node(), false, false, 0, 0));
}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java
new file mode 100644
index 0000000..a5eb61e
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java
@@ -0,0 +1,89 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.relation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.dialogs.relation.SelectionTable.DoubleClickAdapter;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+
+/**
+ * Unit tests of {@link SelectionTable} class.
+ */
+public class SelectionTableTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ /**
+ * Unit test of {@link SelectionTable#SelectionTable}.
+ */
+ @Test
+ public void testSelectionTable() {
+ // Constructs a relation with a member
+ DataSet ds = new DataSet();
+ Node n = new Node(LatLon.ZERO);
+ Relation r = new Relation();
+ r.addMember(new RelationMember(null, n));
+ // Add it to dataset
+ ds.addPrimitive(n);
+ ds.addPrimitive(r);
+ // Add a new layer as active one
+ OsmDataLayer layer = new OsmDataLayer(ds, "", null);
+ try {
+ Main.main.addLayer(layer);
+ // Constructs models and table
+ MemberTableModel memberTableModel = new MemberTableModel(r, layer, null);
+ memberTableModel.populate(r);
+ memberTableModel.register();
+ SelectionTableModel selectionTableModel = new SelectionTableModel(layer);
+ selectionTableModel.register();
+ try {
+ SelectionTable t = new SelectionTable(selectionTableModel, memberTableModel);
+ DoubleClickAdapter adapter = null;
+ for (MouseListener listener : t.getMouseListeners()) {
+ if (listener instanceof DoubleClickAdapter) {
+ adapter = (DoubleClickAdapter) listener;
+ }
+ }
+ assertNotNull(adapter);
+ // Select member, trigger selection change events
+ ds.setSelected(n);
+ // Simple left click, do nothing
+ adapter.mouseClicked(new MouseEvent(t, MouseEvent.MOUSE_CLICKED, System.currentTimeMillis(), 0, 0, 0,
+ 1, false, MouseEvent.BUTTON1));
+ assertEquals(-1, memberTableModel.getSelectionModel().getMinSelectionIndex());
+ // Double right click, do nothing
+ adapter.mouseClicked(new MouseEvent(t, MouseEvent.MOUSE_CLICKED, System.currentTimeMillis(), 0, 0, 0,
+ 2, false, MouseEvent.BUTTON2));
+ assertEquals(-1, memberTableModel.getSelectionModel().getMinSelectionIndex());
+ // Double left click, select member
+ adapter.mouseClicked(new MouseEvent(t, MouseEvent.MOUSE_CLICKED, System.currentTimeMillis(), 0, 0, 0,
+ 2, false, MouseEvent.BUTTON1));
+ assertEquals(0, memberTableModel.getSelectionModel().getMinSelectionIndex());
+ } finally {
+ selectionTableModel.unregister();
+ memberTableModel.unregister();
+ }
+ } finally {
+ Main.main.removeLayer(layer);
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java
index 8dc69af..f44f7fb 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditorTest;
import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
@@ -35,38 +36,11 @@ public class RelationEditorActionsTest {
final DataSet ds = new DataSet();
final Relation orig = new Relation(1);
ds.addPrimitive(orig);
- OsmDataLayer layer = new OsmDataLayer(new DataSet(), "test", null);
+ final OsmDataLayer layer = new OsmDataLayer(ds, "test", null);
MemberTableModel memberTableModel = new MemberTableModel(orig, layer, null);
SelectionTableModel selectionTableModel = new SelectionTableModel(layer);
- IRelationEditor editor = new IRelationEditor() {
- private Relation r = orig;
-
- @Override
- public void setRelation(Relation relation) {
- r = relation;
- }
-
- @Override
- public boolean isDirtyRelation() {
- return false;
- }
-
- @Override
- public Relation getRelationSnapshot() {
- return r;
- }
-
- @Override
- public Relation getRelation() {
- return r;
- }
-
- @Override
- public void reloadDataFromRelation() {
- // Do nothing
- }
- };
+ IRelationEditor editor = GenericRelationEditorTest.newRelationEditor(orig, layer);
MemberTable memberTable = new MemberTable(layer, editor.getRelation(), memberTableModel);
TagEditorModel tagModel = new TagEditorModel();
diff --git a/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java b/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java
index 120e677..a39b41a 100644
--- a/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java
@@ -14,9 +14,9 @@ import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
*/
public class HelpBrowserTest {
- private static final String URL_1 = "https://josm.openstreetmap.de/wiki/Help";
- private static final String URL_2 = "https://josm.openstreetmap.de/wiki/Introduction";
- private static final String URL_3 = "https://josm.openstreetmap.de/javadoc";
+ static final String URL_1 = "https://josm.openstreetmap.de/wiki/Help";
+ static final String URL_2 = "https://josm.openstreetmap.de/wiki/Introduction";
+ static final String URL_3 = "https://josm.openstreetmap.de/javadoc";
/**
* Setup tests
diff --git a/test/unit/org/openstreetmap/josm/gui/help/HelpContentReaderTest.java b/test/unit/org/openstreetmap/josm/gui/help/HelpContentReaderTest.java
new file mode 100644
index 0000000..b428430
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/help/HelpContentReaderTest.java
@@ -0,0 +1,41 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.help;
+
+import static org.junit.Assert.assertFalse;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests of {@link HelpContentReader} class.
+ */
+public class HelpContentReaderTest {
+
+ /**
+ * Setup tests
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link HelpContentReader#fetchHelpTopicContent} - null case.
+ * @throws HelpContentReaderException always
+ */
+ @Test(expected = HelpContentReaderException.class)
+ public void testFetchHelpTopicContentNull() throws HelpContentReaderException {
+ new HelpContentReader(null).fetchHelpTopicContent(null, false);
+ }
+
+ /**
+ * Unit test of {@link HelpContentReader#fetchHelpTopicContent} - nominal case.
+ * @throws HelpContentReaderException never
+ */
+ @Test
+ public void testFetchHelpTopicContentNominal() throws HelpContentReaderException {
+ String res = new HelpContentReader(HelpUtil.getWikiBaseUrl()).fetchHelpTopicContent(HelpBrowserTest.URL_1, false);
+ assertFalse(res.trim().isEmpty());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/history/CoordinateInfoViewerTest.java b/test/unit/org/openstreetmap/josm/gui/history/CoordinateInfoViewerTest.java
index 8538123..c17cf7c 100644
--- a/test/unit/org/openstreetmap/josm/gui/history/CoordinateInfoViewerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/history/CoordinateInfoViewerTest.java
@@ -3,7 +3,9 @@ package org.openstreetmap.josm.gui.history;
import static org.junit.Assert.assertNotNull;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
/**
* Unit tests of {@link CoordinateInfoViewer} class.
@@ -11,6 +13,14 @@ import org.junit.Test;
public class CoordinateInfoViewerTest {
/**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
* Test for {@link CoordinateInfoViewer#CoordinateInfoViewer} - {@code null} handling.
*/
@Test(expected = IllegalArgumentException.class)
diff --git a/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java b/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java
index e6ec5e7..097957d 100644
--- a/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java
@@ -5,7 +5,9 @@ import static org.junit.Assert.assertEquals;
import java.util.Date;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
@@ -20,6 +22,14 @@ import org.openstreetmap.josm.tools.date.DateUtils;
public class HistoryBrowserDialogTest {
/**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
* Test for {@link HistoryBrowserDialog#buildTitle}.
*/
@Test
diff --git a/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java b/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java
new file mode 100644
index 0000000..1794f36
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java
@@ -0,0 +1,91 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.history;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.history.History;
+import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
+import org.openstreetmap.josm.data.osm.history.HistoryNode;
+import org.openstreetmap.josm.gui.history.HistoryBrowserModel.TagTableModel;
+
+/**
+ * Unit tests of {@link HistoryBrowserModel} class.
+ */
+public class HistoryBrowserModelTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ /**
+ * Test for {@link HistoryBrowserModel#HistoryBrowserModel}.
+ */
+ @Test
+ public void testHistoryBrowserModel() {
+ HistoryBrowserModel model = new HistoryBrowserModel();
+ assertNotNull(model.getVersionTableModel());
+ assertNull(model.getHistory());
+ Node n = new Node(1, 1);
+ n.setUser(User.getAnonymous());
+ n.setChangesetId(1);
+ HistoryDataSet.getInstance().put(new HistoryNode(n));
+ History history = HistoryDataSet.getInstance().getHistory(1, OsmPrimitiveType.NODE);
+ assertNotNull(history);
+ model.setHistory(history);
+ assertEquals(history, model.getHistory());
+ model = new HistoryBrowserModel(history);
+ assertEquals(history, model.getHistory());
+ }
+
+ /**
+ * Unit test of {@link HistoryBrowserModel#getTagTableModel}.
+ */
+ @Test
+ public void testGetTagTableModel() {
+ HistoryBrowserModel model = new HistoryBrowserModel();
+ TagTableModel t1 = model.getTagTableModel(PointInTimeType.CURRENT_POINT_IN_TIME);
+ TagTableModel t2 = model.getTagTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME);
+ assertNotNull(t1);
+ assertNotNull(t2);
+ assertNotEquals(t1, t2);
+ }
+
+ /**
+ * Unit test of {@link HistoryBrowserModel#getNodeListTableModel}.
+ */
+ @Test
+ public void testGetNodeListTableModel() {
+ HistoryBrowserModel model = new HistoryBrowserModel();
+ DiffTableModel t1 = model.getNodeListTableModel(PointInTimeType.CURRENT_POINT_IN_TIME);
+ DiffTableModel t2 = model.getNodeListTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME);
+ assertNotNull(t1);
+ assertNotNull(t2);
+ assertNotEquals(t1, t2);
+ }
+
+ /**
+ * Unit test of {@link HistoryBrowserModel#getRelationMemberTableModel}.
+ */
+ @Test
+ public void testGetRelationMemberTableModel() {
+ HistoryBrowserModel model = new HistoryBrowserModel();
+ DiffTableModel t1 = model.getRelationMemberTableModel(PointInTimeType.CURRENT_POINT_IN_TIME);
+ DiffTableModel t2 = model.getRelationMemberTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME);
+ assertNotNull(t1);
+ assertNotNull(t2);
+ assertNotEquals(t1, t2);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/history/HistoryLoadTaskTest.java b/test/unit/org/openstreetmap/josm/gui/history/HistoryLoadTaskTest.java
new file mode 100644
index 0000000..3e1491c
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/history/HistoryLoadTaskTest.java
@@ -0,0 +1,73 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.history;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.history.History;
+import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.OsmHistoryReader;
+import org.openstreetmap.josm.io.OsmServerHistoryReader;
+import org.openstreetmap.josm.io.OsmTransferException;
+import org.xml.sax.SAXException;
+
+/**
+ * Unit tests of {@link HistoryLoadTask} class.
+ */
+public class HistoryLoadTaskTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link HistoryLoadTask#getLoadingMessage}
+ */
+ @Test
+ public void testGetLoadingMessage() {
+ assertEquals("Loading history for node {0}", HistoryLoadTask.getLoadingMessage(new Node().getPrimitiveId()));
+ assertEquals("Loading history for way {0}", HistoryLoadTask.getLoadingMessage(new Way().getPrimitiveId()));
+ assertEquals("Loading history for relation {0}", HistoryLoadTask.getLoadingMessage(new Relation().getPrimitiveId()));
+
+ assertEquals("", HistoryLoadTask.getLoadingMessage(new SimplePrimitiveId(1, OsmPrimitiveType.CLOSEDWAY)));
+ assertEquals("", HistoryLoadTask.getLoadingMessage(new SimplePrimitiveId(1, OsmPrimitiveType.MULTIPOLYGON)));
+ }
+
+ /**
+ * Unit test of {@link HistoryLoadTask#loadHistory}
+ * @throws OsmTransferException if an error occurs
+ */
+ @Test
+ public void testLoadHistory() throws OsmTransferException {
+ HistoryDataSet ds = HistoryLoadTask.loadHistory(new OsmServerHistoryReader(OsmPrimitiveType.NODE, 0) {
+ @Override
+ public HistoryDataSet parseHistory(ProgressMonitor progressMonitor) throws OsmTransferException {
+ try (InputStream in = TestUtils.getRegressionDataStream(12639, "history.xml")) {
+ return new OsmHistoryReader(in).parse(NullProgressMonitor.INSTANCE);
+ } catch (IOException | SAXException e) {
+ throw new OsmTransferException(e);
+ }
+ }
+ }, NullProgressMonitor.INSTANCE);
+ assertEquals(113, ds.getChangesetIds().size());
+ History h = ds.getHistory(1350901, OsmPrimitiveType.RELATION);
+ assertEquals(115, h.getNumVersions());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRendererTest.java b/test/unit/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRendererTest.java
new file mode 100644
index 0000000..fe63b81
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRendererTest.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.io;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.beans.PropertyChangeEvent;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.gui.io.SaveLayersModel.Mode;
+
+/**
+ * Unit tests of {@link UploadAndSaveProgressRenderer} class.
+ */
+public class UploadAndSaveProgressRendererTest {
+
+ /**
+ * Setup tests
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link UploadAndSaveProgressRenderer#UploadAndSaveProgressRenderer}.
+ */
+ @Test
+ public void testUploadAndSaveProgressRenderer() {
+ JPanel parent = new JPanel();
+ UploadAndSaveProgressRenderer r = new UploadAndSaveProgressRenderer();
+ parent.add(r);
+ r.setCustomText(null);
+ r.setIndeterminate(true);
+ r.setMaximum(10);
+ r.setTaskTitle(null);
+ r.setValue(5);
+ r.propertyChange(new PropertyChangeEvent(this, "", null, null));
+ r.propertyChange(new PropertyChangeEvent(this, SaveLayersModel.MODE_PROP, null, Mode.UPLOADING_AND_SAVING));
+ assertTrue(r.isVisible());
+ r.propertyChange(new PropertyChangeEvent(this, SaveLayersModel.MODE_PROP, null, Mode.EDITING_DATA));
+ assertFalse(r.isVisible());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java b/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java
index d5dfefd..451c667 100644
--- a/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java
@@ -1,6 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.io;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -89,4 +92,18 @@ public class UploadDialogTest {
new UploadDialog.UploadAction(newUploadDialog("comment", "")).actionPerformed(null);
new UploadDialog.UploadAction(newUploadDialog("a comment long enough", "a source long enough")).actionPerformed(null);
}
+
+ /**
+ * Test of {@link UploadDialog.UploadAction#isUploadCommentTooShort} method.
+ */
+ @Test
+ public void testIsUploadCommentTooShort() {
+ assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort(""));
+ assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort("test"));
+ assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort("测试"));
+ assertFalse(UploadDialog.UploadAction.isUploadCommentTooShort("geometric corrections"));
+ assertFalse(UploadDialog.UploadAction.isUploadCommentTooShort("几何校正"));
+ // test with unassigned unicode characters ==> no unicode block
+ assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort("\u0860"));
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java
new file mode 100644
index 0000000..30fd8f9
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java
@@ -0,0 +1,67 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.markerlayer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.awt.Color;
+import java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
+import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxLink;
+import org.openstreetmap.josm.data.gpx.WayPoint;
+
+/**
+ * Unit tests of {@link MarkerLayer} class.
+ */
+public class MarkerLayerTest {
+
+ /**
+ * Setup tests
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ Main.pref.put("marker.traceaudio", true);
+ }
+
+ /**
+ * Unit test of {@link MarkerLayer#MarkerLayer}.
+ */
+ @Test
+ public void testMarkerLayer() {
+ assertEquals(Color.magenta, MarkerLayer.getGenericColor());
+ MarkerLayer layer = new MarkerLayer(new GpxData(), "foo", null, null);
+
+ assertEquals("foo", layer.getName());
+ assertEquals(Color.magenta, layer.getColor(false));
+ assertNotNull(layer.getIcon());
+ assertEquals("0 markers", layer.getToolTipText());
+ assertEquals("<html>foo consists of 0 markers</html>", layer.getInfoComponent());
+ assertTrue(layer.getMenuEntries().length > 10);
+
+ GpxData gpx = new GpxData();
+ WayPoint wpt = new WayPoint(LatLon.ZERO);
+ wpt.attr.put(GpxConstants.META_LINKS, Arrays.asList(new GpxLink("https://josm.openstreetmap.de")));
+ wpt.addExtension("offset", "1.0");
+ gpx.waypoints.add(wpt);
+ wpt = new WayPoint(LatLon.ZERO);
+ wpt.addExtension("offset", "NaN");
+ gpx.waypoints.add(wpt);
+ layer = new MarkerLayer(gpx, "bar", null, null);
+
+ assertEquals("bar", layer.getName());
+ assertEquals(Color.magenta, layer.getColor(false));
+ assertNotNull(layer.getIcon());
+ assertEquals("3 markers", layer.getToolTipText());
+ assertEquals("<html>bar consists of 3 markers</html>", layer.getInfoComponent());
+ assertTrue(layer.getMenuEntries().length > 10);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java b/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java
index 122c7d1..9b4fbce 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/PreferencesTestUtils.java
@@ -39,5 +39,6 @@ public final class PreferencesTestUtils {
assertEquals(tabs + increment, tabPane.getSetting(parentClass).getTabPane().getTabCount());
assertEquals(tabPane.getSetting(parentClass), ((SubPreferenceSetting) setting).getTabPreferenceSetting(tabPane));
}
+ setting.ok();
}
}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java
new file mode 100644
index 0000000..233b5f9
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences.advanced;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.gui.preferences.advanced.ListEditor.ListSettingTableModel;
+
+/**
+ * Unit tests of {@link ListEditor} class.
+ */
+public class ListEditorTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link ListSettingTableModel} class.
+ */
+ @Test
+ public void testListSettingTableModel() {
+ ListSettingTableModel model = new ListSettingTableModel(null);
+ assertNotNull(model.getData());
+ model = new ListSettingTableModel(Arrays.asList("foo"));
+ assertTrue(model.getData().contains("foo"));
+ assertEquals(2, model.getRowCount());
+ assertEquals(1, model.getColumnCount());
+ assertEquals("foo", model.getValueAt(0, 0));
+ assertEquals("", model.getValueAt(1, 0));
+ assertTrue(model.isCellEditable(0, 0));
+ model.setValueAt("bar", 0, 0);
+ assertEquals("bar", model.getValueAt(0, 0));
+ model.setValueAt("test", 1, 0);
+ assertEquals("test", model.getValueAt(1, 0));
+ assertEquals(3, model.getRowCount());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java
new file mode 100644
index 0000000..c658a9a
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java
@@ -0,0 +1,68 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences.advanced;
+
+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 java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.preferences.StringSetting;
+import org.openstreetmap.josm.gui.preferences.advanced.PreferencesTable.AllSettingsTableModel;
+
+/**
+ * Unit tests of {@link PreferencesTable} class.
+ */
+public class PreferencesTableTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ private static PrefEntry newPrefEntry(String value) {
+ StringSetting val = new StringSetting(value);
+ StringSetting def = new StringSetting("defaultValue");
+ return new PrefEntry("key", val, def, false);
+ }
+
+ private static PreferencesTable newTable() {
+ return new PreferencesTable(Arrays.asList(newPrefEntry("value")));
+ }
+
+ /**
+ * Unit test of {@link PreferencesTable#PreferencesTable}.
+ */
+ @Test
+ public void testPreferencesTable() {
+ PreferencesTable t = newTable();
+ t.fireDataChanged();
+ assertTrue(t.getSelectedItems().isEmpty());
+ assertFalse(t.editPreference(null));
+ assertNull(t.addPreference(null));
+ t.resetPreferences(null);
+ }
+
+ /**
+ * Unit test of {@link PreferencesTable.AllSettingsTableModel} class.
+ */
+ @Test
+ public void testAllSettingsTableModel() {
+ AllSettingsTableModel model = (AllSettingsTableModel) newTable().getModel();
+ assertEquals(1, model.getRowCount());
+ assertFalse(model.isCellEditable(0, 0));
+ assertTrue(model.isCellEditable(0, 1));
+ assertEquals("key", model.getValueAt(0, 0));
+ assertEquals(newPrefEntry("value"), model.getValueAt(0, 1));
+ String foobar = "foobar";
+ model.setValueAt(foobar, 0, 1);
+ assertEquals(newPrefEntry(foobar), model.getValueAt(0, 1));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java
index c60a9f3..b92f072 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java
@@ -6,6 +6,7 @@ import static org.junit.Assert.assertNotNull;
import org.junit.BeforeClass;
import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
/**
@@ -34,6 +35,9 @@ public class AudioPreferenceTest {
*/
@Test
public void testAddGui() {
+ Main.pref.put("audio.menuinvisible", true);
+ PreferencesTestUtils.doTestPreferenceSettingAddGui(new AudioPreference.Factory(), null);
+ Main.pref.put("audio.menuinvisible", false);
PreferencesTestUtils.doTestPreferenceSettingAddGui(new AudioPreference.Factory(), null);
}
}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java
new file mode 100644
index 0000000..d4d20a3
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link CheckGroup} class.
+ */
+public class CheckGroupTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link CheckGroup#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ CheckGroup cg = new CheckGroup();
+ cg.columns = "1";
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertFalse(cg.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java
new file mode 100644
index 0000000..d904710
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Check} class.
+ */
+public class CheckTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Check#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertTrue(new Check().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java
new file mode 100644
index 0000000..f4700cf
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Combo} class.
+ */
+public class ComboTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Combo#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertTrue(new Combo().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java
new file mode 100644
index 0000000..86e6b38
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link ItemSeparator} class.
+ */
+public class ItemSeparatorTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link ItemSeparator#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertFalse(new ItemSeparator().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java
new file mode 100644
index 0000000..de895e3
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Key} class.
+ */
+public class KeyTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Key#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertFalse(new Key().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertEquals(0, p.getComponentCount());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java
new file mode 100644
index 0000000..622e434
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Label} class.
+ */
+public class LabelTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Label#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertTrue(new Label().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java
new file mode 100644
index 0000000..889dde4
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java
@@ -0,0 +1,50 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Link} class.
+ */
+public class LinkTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Link#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ Link l = new Link();
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertFalse(l.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertEquals(0, p.getComponentCount());
+
+ l.href = Main.getJOSMWebsite();
+ assertFalse(l.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+
+ l.locale_href = Main.getJOSMWebsite();
+ assertFalse(l.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java
new file mode 100644
index 0000000..02d8b89
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link MultiSelect} class.
+ */
+public class MultiSelectTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link MultiSelect#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertTrue(new MultiSelect().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java
new file mode 100644
index 0000000..e68c07b
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Optional} class.
+ */
+public class OptionalTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Optional#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertFalse(new Optional().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetLinkTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetLinkTest.java
new file mode 100644
index 0000000..aea6c68
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetLinkTest.java
@@ -0,0 +1,44 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
+
+/**
+ * Unit tests of {@link PresetLink} class.
+ */
+public class PresetLinkTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ TaggingPresets.readFromPreferences();
+ }
+
+ /**
+ * Unit test for {@link PresetLink#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ PresetLink l = new PresetLink();
+ l.preset_name = "River";
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertFalse(l.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java
new file mode 100644
index 0000000..0d07448
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Roles} class.
+ */
+public class RolesTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Roles#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertFalse(new Roles().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java
new file mode 100644
index 0000000..07cbc9c
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Space} class.
+ */
+public class SpaceTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Space#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertFalse(new Space().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java
new file mode 100644
index 0000000..18e8e1d
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java
@@ -0,0 +1,39 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import javax.swing.JPanel;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Unit tests of {@link Text} class.
+ */
+public class TextTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link Text#addToPanel}.
+ */
+ @Test
+ public void testAddToPanel() {
+ JPanel p = new JPanel();
+ assertEquals(0, p.getComponentCount());
+ assertTrue(new Text().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+ assertTrue(p.getComponentCount() > 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java b/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java
new file mode 100644
index 0000000..0b64c42
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java
@@ -0,0 +1,98 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests of {@link CertificateAmendment} class.
+ */
+public class CertificateAmendmentTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Test a well-known certificate.
+ * @throws IOException in case of I/O error
+ */
+ @Test
+ public void testDefault() throws IOException {
+ // something that is neither DST nor StartSSL
+ connect("https://google.com", true);
+ }
+
+ /**
+ * Test <a href="https://letsencrypt.org">Let's Encrypt</a>.
+ * @throws IOException in case of I/O error
+ */
+ @Test
+ public void testLetsEncrypt() throws IOException {
+ // signed by letsencrypt's own ISRG root
+ // (not included yet)
+ connect("https://helloworld.letsencrypt.org", false);
+ // signed by letsencrypt's cross-sign CA
+ connect("https://letsencrypt.org", true);
+ // signed by letsencrypt's cross-sign CA, requires SNI
+ connect("https://acme-v01.api.letsencrypt.org", true);
+ }
+
+ /**
+ * 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
+ */
+ @Test
+ public void testBrokenCert() throws IOException {
+ // broken at the moment (may get fixed some day)
+ connect("https://www.pcwebshop.co.uk", false);
+ }
+
+ /**
+ * Test overpass API.
+ * @throws IOException in case of I/O error
+ */
+ @Test
+ public void testOverpass() throws IOException {
+ connect("https://overpass-api.de", true);
+ }
+
+ private static void connect(String url, boolean shouldWork) throws IOException {
+ URLConnection connection = new URL(url).openConnection();
+ try {
+ connection.connect();
+ } catch (SSLHandshakeException e) {
+ if (shouldWork) {
+ e.printStackTrace();
+ Assert.fail("Untrusted: " + url);
+ } else {
+ return;
+ }
+ }
+ if (!shouldWork) {
+ Assert.fail("Expected error: " + url);
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java b/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java
index 513edb0..012f095 100644
--- a/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java
+++ b/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java
@@ -9,6 +9,7 @@ import java.io.File;
import org.junit.Test;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.layer.Layer;
/**
* Unit tests of {@link NoteImporter} class.
@@ -17,10 +18,15 @@ public class NoteImporterTest {
/**
* Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12531">Bug #12531</a>.
- * @throws Exception if any error occurs
*/
@Test
- public void testTicket12531() throws Exception {
+ public void testTicket12531() {
+ if (Main.map != null) {
+ for (Layer l: Main.map.mapView.getAllLayers()) {
+ Main.map.mapView.removeLayer(l);
+ }
+ Main.main.setMapFrame(null);
+ }
assertNull(Main.map);
assertTrue(new NoteImporter().importDataHandleExceptions(
new File(TestUtils.getRegressionDataFile(12531, "notes.osn")), null));
diff --git a/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java b/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java
index d97c0cb..b926112 100644
--- a/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java
@@ -67,19 +67,19 @@ public class NoteReaderTest {
assertEquals(DateUtils.fromString("2013-04-24 08:07:02 UTC"), n.getCreatedAt());
assertEquals(4, n.getId());
assertEquals(new LatLon(36.7232991, 68.86415), n.getLatLon());
- assertEquals(State.closed, n.getState());
+ assertEquals(State.CLOSED, n.getState());
List<NoteComment> comments = n.getComments();
assertEquals(2, comments.size());
NoteComment c1 = comments.get(0);
assertEquals(c1, n.getFirstComment());
assertEquals(DateUtils.fromString("2013-04-24 08:07:02 UTC"), c1.getCommentTimestamp());
- assertEquals(Action.opened, c1.getNoteAction());
+ assertEquals(Action.OPENED, c1.getNoteAction());
assertEquals("test", c1.getText());
assertEquals(User.createOsmUser(1626, "FredB"), c1.getUser());
NoteComment c2 = comments.get(1);
- assertEquals(Action.closed, c2.getNoteAction());
+ assertEquals(Action.CLOSED, c2.getNoteAction());
assertEquals("", c2.getText());
}
diff --git a/test/unit/org/openstreetmap/josm/io/OsmApiTest.java b/test/unit/org/openstreetmap/josm/io/OsmApiTest.java
new file mode 100644
index 0000000..d313124
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/OsmApiTest.java
@@ -0,0 +1,50 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+
+/**
+ * Unit tests of {@link OsmApi} class.
+ */
+public class OsmApiTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12675">Bug #12675</a>.
+ * @throws IllegalDataException if an error occurs
+ */
+ @Test
+ public void testTicket12675() throws IllegalDataException {
+ OsmApi api = OsmApi.getOsmApi();
+ Changeset cs = new Changeset();
+ cs.setUser(User.getAnonymous());
+ cs.setId(38038262);
+ String xml = api.toXml(cs);
+ assertEquals("<?xml version='1.0' encoding='UTF-8'?>\n"+
+ "<osm version='0.6' generator='JOSM'>\n"+
+ " <changeset id='38038262' user='<anonymous>' uid='-1' open='false'>\n"+
+ " </changeset>\n"+
+ "</osm>\n", xml.replace("\r", ""));
+ Changeset cs2 = OsmChangesetParser.parse(
+ new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)),
+ NullProgressMonitor.INSTANCE).iterator().next();
+ assertEquals(User.getAnonymous(), cs2.getUser());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java
new file mode 100644
index 0000000..fcc4ea6
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java
@@ -0,0 +1,104 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
+
+/**
+ * Unit tests of {@link AddWayHandler} class.
+ */
+public class AddWayHandlerTest {
+
+ /**
+ * Rule used for tests throwing exceptions.
+ */
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ private static AddWayHandler newHandler(String url) {
+ AddWayHandler req = new AddWayHandler();
+ if (url != null)
+ req.setUrl(url);
+ return req;
+ }
+
+ /**
+ * Unit test for bad request - no layer.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestNoLayer() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("There is no layer opened to add way");
+ newHandler("https://localhost?way=0,0;1,1").handle();
+ }
+
+ /**
+ * Unit test for bad request - no param.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestNoParam() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("Invalid coordinates: []");
+ OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
+ try {
+ Main.main.addLayer(layer);
+ newHandler(null).handle();
+ } finally {
+ Main.main.removeLayer(layer);
+ }
+ }
+
+ /**
+ * Unit test for bad request - invalid URL.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestInvalidUrl() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("The following keys are mandatory, but have not been provided: way");
+ newHandler("invalid_url").handle();
+ }
+
+ /**
+ * Unit test for bad request - incomplete URL.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestIncompleteUrl() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("The following keys are mandatory, but have not been provided: way");
+ newHandler("https://localhost").handle();
+ }
+
+ /**
+ * Unit test for nominal request - local data file.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testNominalRequest() throws Exception {
+ OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
+ try {
+ Main.main.addLayer(layer);
+ newHandler("https://localhost?way=0,0;1,1").handle();
+ } finally {
+ Main.main.removeLayer(layer);
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java
new file mode 100644
index 0000000..9ede29f
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java
@@ -0,0 +1,78 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
+
+/**
+ * Unit tests of {@link ImageryHandler} class.
+ */
+public class ImageryHandlerTest {
+
+ /**
+ * Rule used for tests throwing exceptions.
+ */
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ private static ImageryHandler newHandler(String url) {
+ ImageryHandler req = new ImageryHandler();
+ if (url != null)
+ req.setUrl(url);
+ return req;
+ }
+
+ /**
+ * Unit test for bad request - no param.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestNoParam() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("Parameter must not be null");
+ newHandler(null).handle();
+ }
+
+ /**
+ * Unit test for bad request - invalid URL.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestInvalidUrl() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("The following keys are mandatory, but have not been provided: url");
+ newHandler("invalid_url").handle();
+ }
+
+ /**
+ * Unit test for bad request - incomplete URL.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestIncompleteUrl() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("The following keys are mandatory, but have not been provided: url");
+ newHandler("https://localhost").handle();
+ }
+
+ /**
+ * Unit test for nominal request - local data file.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testNominalRequest() throws Exception {
+ newHandler("https://localhost?url=foo").handle();
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java
new file mode 100644
index 0000000..29c779a
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java
@@ -0,0 +1,78 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
+
+/**
+ * Unit tests of {@link LoadAndZoomHandler} class.
+ */
+public class LoadAndZoomHandlerTest {
+
+ /**
+ * Rule used for tests throwing exceptions.
+ */
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ private static LoadAndZoomHandler newHandler(String url) {
+ LoadAndZoomHandler req = new LoadAndZoomHandler();
+ if (url != null)
+ req.setUrl(url);
+ return req;
+ }
+
+ /**
+ * Unit test for bad request - no param.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestNoParam() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("NumberFormatException (empty String)");
+ newHandler(null).handle();
+ }
+
+ /**
+ * Unit test for bad request - invalid URL.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestInvalidUrl() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("The following keys are mandatory, but have not been provided: bottom, top, left, right");
+ newHandler("invalid_url").handle();
+ }
+
+ /**
+ * Unit test for bad request - incomplete URL.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestIncompleteUrl() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("The following keys are mandatory, but have not been provided: bottom, top, left, right");
+ newHandler("https://localhost").handle();
+ }
+
+ /**
+ * Unit test for nominal request - local data file.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testNominalRequest() throws Exception {
+ newHandler("https://localhost?bottom=0&top=0&left=1&right=1").handle();
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java
new file mode 100644
index 0000000..26c281f
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java
@@ -0,0 +1,76 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
+
+/**
+ * Unit tests of {@link LoadObjectHandler} class.
+ */
+public class LoadObjectHandlerTest {
+
+ /**
+ * Rule used for tests throwing exceptions.
+ */
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ private static LoadObjectHandler newHandler(String url) {
+ LoadObjectHandler req = new LoadObjectHandler();
+ if (url != null)
+ req.setUrl(url);
+ return req;
+ }
+
+ /**
+ * Unit test for bad request - no param.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestNoParam() throws Exception {
+ newHandler(null).handle();
+ }
+
+ /**
+ * Unit test for bad request - invalid URL.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestInvalidUrl() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("The following keys are mandatory, but have not been provided: objects");
+ newHandler("invalid_url").handle();
+ }
+
+ /**
+ * Unit test for bad request - incomplete URL.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testBadRequestIncompleteUrl() throws Exception {
+ thrown.expect(RequestHandlerBadRequestException.class);
+ thrown.expectMessage("The following keys are mandatory, but have not been provided: objects");
+ newHandler("https://localhost").handle();
+ }
+
+ /**
+ * Unit test for nominal request - local data file.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testNominalRequest() throws Exception {
+ newHandler("https://localhost?objects=foo,bar").handle();
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/plugins/PluginDownloadExceptionTest.java b/test/unit/org/openstreetmap/josm/plugins/PluginDownloadExceptionTest.java
new file mode 100644
index 0000000..9c483c4
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/plugins/PluginDownloadExceptionTest.java
@@ -0,0 +1,37 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests of {@link PluginDownloadException} class.
+ */
+public class PluginDownloadExceptionTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link PluginDownloadException#PluginDownloadException}.
+ */
+ @Test
+ public void testPluginDownloadException() {
+ PluginDownloadException ex = new PluginDownloadException("foo");
+ assertEquals("foo", ex.getMessage());
+ NullPointerException npe = new NullPointerException();
+ ex = new PluginDownloadException(npe);
+ assertEquals(npe, ex.getCause());
+ ex = new PluginDownloadException("bar", npe);
+ assertEquals("bar", ex.getMessage());
+ assertEquals(npe, ex.getCause());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/plugins/PluginExceptionTest.java b/test/unit/org/openstreetmap/josm/plugins/PluginExceptionTest.java
new file mode 100644
index 0000000..6728bc8
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/plugins/PluginExceptionTest.java
@@ -0,0 +1,38 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests of {@link PluginException} class.
+ */
+public class PluginExceptionTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link PluginException#PluginException}.
+ */
+ @Test
+ public void testPluginDownloadException() {
+ PluginException ex = new PluginException("foo");
+ assertEquals("foo", ex.getMessage());
+ NullPointerException npe = new NullPointerException();
+ ex = new PluginException("bar", npe);
+ assertEquals("An error occurred in plugin bar", ex.getMessage());
+ assertEquals(npe, ex.getCause());
+ ex = new PluginException(null, "foobar", npe);
+ assertEquals("An error occurred in plugin foobar", ex.getMessage());
+ assertEquals(npe, ex.getCause());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
index 93e11aa..f79ed33 100644
--- a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
@@ -1,15 +1,19 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins;
+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.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.junit.BeforeClass;
import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.plugins.PluginHandler.DeprecatedPlugin;
import org.openstreetmap.josm.tools.Utils;
@@ -57,4 +61,26 @@ public class PluginHandlerTest {
}
}
}
+
+ /**
+ * Unit test of {@link PluginHandler#filterDeprecatedPlugins}.
+ */
+ @Test
+ public void testFilterDeprecatedPlugins() {
+ List<String> plugins = new ArrayList<>(Arrays.asList("foo", "bar", "imagery"));
+ PluginHandler.filterDeprecatedPlugins(Main.parent, plugins);
+ assertEquals(2, plugins.size());
+ assertFalse(plugins.contains("imagery"));
+ }
+
+ /**
+ * Unit test of {@link PluginHandler#filterUnmaintainedPlugins}.
+ */
+ @Test
+ public void testFilterUnmaintainedPlugins() {
+ List<String> plugins = new ArrayList<>(Arrays.asList("foo", "bar", "gpsbabelgui"));
+ PluginHandler.filterUnmaintainedPlugins(Main.parent, plugins);
+ assertEquals(2, plugins.size());
+ assertFalse(plugins.contains("gpsbabelgui"));
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
index 7e2be91..4c66b2c 100644
--- a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
+++ b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
@@ -6,6 +6,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -65,14 +66,8 @@ public class PluginHandlerTestIT {
}
System.out.println("Filtered plugin list contains " + plugins.size() + " plugins");
- // Update the locally installed plugins
- PluginDownloadTask pluginDownloadTask = new PluginDownloadTask(NullProgressMonitor.INSTANCE, plugins, null);
- pluginDownloadTask.run();
- assertTrue(pluginDownloadTask.getFailedPlugins().toString(), pluginDownloadTask.getFailedPlugins().isEmpty());
- assertEquals(plugins.size(), pluginDownloadTask.getDownloadedPlugins().size());
-
- // Update Plugin info for downloaded plugins
- PluginHandler.refreshLocalUpdatedPluginInfo(pluginDownloadTask.getDownloadedPlugins());
+ // Download plugins
+ downloadPlugins(plugins);
// Load early plugins
PluginHandler.loadEarlyPlugins(null, plugins, null);
@@ -82,4 +77,19 @@ public class PluginHandlerTestIT {
assertTrue(PluginHandler.pluginLoadingExceptions.toString(), PluginHandler.pluginLoadingExceptions.isEmpty());
}
+
+ /**
+ * Download plugins
+ * @param plugins plugins to download
+ */
+ public static void downloadPlugins(Collection<PluginInformation> plugins) {
+ // Update the locally installed plugins
+ PluginDownloadTask pluginDownloadTask = new PluginDownloadTask(NullProgressMonitor.INSTANCE, plugins, null);
+ pluginDownloadTask.run();
+ assertTrue(pluginDownloadTask.getFailedPlugins().toString(), pluginDownloadTask.getFailedPlugins().isEmpty());
+ assertEquals(plugins.size(), pluginDownloadTask.getDownloadedPlugins().size());
+
+ // Update Plugin info for downloaded plugins
+ PluginHandler.refreshLocalUpdatedPluginInfo(pluginDownloadTask.getDownloadedPlugins());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/plugins/PluginListParseExceptionTest.java b/test/unit/org/openstreetmap/josm/plugins/PluginListParseExceptionTest.java
new file mode 100644
index 0000000..6e587fc
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/plugins/PluginListParseExceptionTest.java
@@ -0,0 +1,35 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests of {@link PluginListParseException} class.
+ */
+public class PluginListParseExceptionTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test of {@link PluginListParseException#PluginListParseException}.
+ */
+ @Test
+ public void testPluginListParseException() {
+ NullPointerException npe = new NullPointerException();
+ PluginListParseException ex = new PluginListParseException(npe);
+ assertEquals(npe, ex.getCause());
+ ex = new PluginListParseException("bar", npe);
+ assertEquals("bar", ex.getMessage());
+ assertEquals(npe, ex.getCause());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/BugReportExceptionHandlerTest.java b/test/unit/org/openstreetmap/josm/tools/BugReportExceptionHandlerTest.java
deleted file mode 100644
index f159fdd..0000000
--- a/test/unit/org/openstreetmap/josm/tools/BugReportExceptionHandlerTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.tools;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.zip.GZIPInputStream;
-
-import javax.xml.bind.DatatypeConverter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.ShowStatusReportAction;
-
-/**
- * Bug report unit tests.
- */
-public class BugReportExceptionHandlerTest {
-
- /**
- * Setup tests.
- */
- @Before
- public void setUp() {
- JOSMFixture.createUnitTestFixture().init();
- }
-
- /**
- * Test method for {@link org.openstreetmap.josm.tools.BugReportExceptionHandler#getBugReportUrl(java.lang.String)}.
- * @throws IOException if any I/O error occurs
- */
- @Test
- public void testGetBugReportUrl() throws IOException {
- String report = ShowStatusReportAction.getReportHeader();
- String url = BugReportExceptionHandler.getBugReportUrl(report).toExternalForm();
- String prefix = Main.getJOSMWebsite()+"/josmticket?gdata=";
- assertTrue(url.startsWith(prefix));
-
- String gdata = url.substring(prefix.length());
- // JAXB only provides support for "base64" decoding while we encode url in "base64url", so switch encoding, only for test purpose
- byte[] data = DatatypeConverter.parseBase64Binary(gdata.replace('-', '+').replace('_', '/'));
- byte[] buff = new byte[8192];
- try (GZIPInputStream is = new GZIPInputStream(new ByteArrayInputStream(data))) {
- StringBuilder sb = new StringBuilder();
- for (int n = is.read(buff); n > 0; n = is.read(buff)) {
- sb.append(new String(buff, 0, n, StandardCharsets.UTF_8));
- }
- assertEquals(report, sb.toString());
- }
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandlerTest.java b/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandlerTest.java
new file mode 100644
index 0000000..b2d2bd3
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandlerTest.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests of {@link BugReportExceptionHandler} class.
+ */
+public class BugReportExceptionHandlerTest {
+
+ /**
+ * Setup tests.
+ */
+ @Before
+ public void setUp() {
+ JOSMFixture.createUnitTestFixture().init(true);
+ }
+
+ /**
+ * Unit test for {@link BugReportExceptionHandler#buildPanel} method.
+ */
+ @Test
+ public void testBuildPanel() {
+ assertNotNull(BugReportExceptionHandler.buildPanel(new Exception("testBuildPanel")));
+ }
+
+ /**
+ * Unit test for {@link BugReportExceptionHandler.BugReporterThread#askForBugReport} method.
+ */
+ @Test
+ public void testAskForBugReport() {
+ BugReportExceptionHandler.BugReporterThread.askForBugReport(new Exception("testAskForBugReport"));
+ }
+
+ /**
+ * Unit test for {@link BugReportExceptionHandler#handleException} method.
+ */
+ @Test
+ public void testHandleException() {
+ BugReportExceptionHandler.handleException(new Exception("testHandleException"));
+ assertFalse(BugReportExceptionHandler.exceptionHandlingInProgress());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSenderTest.java b/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSenderTest.java
new file mode 100644
index 0000000..1be59a9
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSenderTest.java
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.actions.ShowStatusReportAction;
+
+/**
+ * Unit tests of {@link BugReportSender} class.
+ */
+public class BugReportSenderTest {
+
+ /**
+ * Setup tests.
+ */
+ @Before
+ public void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Unit test for {@link BugReportSender#BugReportSender}.
+ * @throws InterruptedException if the thread is interrupted
+ */
+ @Test
+ public void testBugReportSender() throws InterruptedException {
+ BugReportSender sender = BugReportSender.reportBug(ShowStatusReportAction.getReportHeader());
+ assertNotNull(sender);
+ synchronized (sender) {
+ while (sender.isAlive()) {
+ sender.wait();
+ }
+ }
+ assertFalse(sender.isAlive());
+ assertNull(sender.getErrorMessage(), sender.getErrorMessage());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java b/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
index 14b8fcb..6384e6f 100644
--- a/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
@@ -2,11 +2,16 @@
package org.openstreetmap.josm.tools.date;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import java.text.DateFormat;
import java.util.Date;
import java.util.TimeZone;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.tools.UncheckedParseException;
/**
@@ -15,6 +20,14 @@ import org.openstreetmap.josm.tools.UncheckedParseException;
public class DateUtilsTest {
/**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
* Allows to override the timezone used in {@link DateUtils} for unit tests.
* @param zone the timezone to use
*/
@@ -85,4 +98,100 @@ public class DateUtilsTest {
assertEquals(1453694709200L, DateUtils.fromString("2016-01-25T04:05:09.200Z").getTime());
assertEquals(1453694709400L, DateUtils.fromString("2016-01-25T04:05:09.400Z").getTime());
}
+
+ /**
+ * Unit test of {@link DateUtils#fromTimestamp} method.
+ */
+ @Test
+ public void testFromTimestamp() {
+ assertEquals("1970-01-01T00:00:00Z", DateUtils.fromTimestamp(0));
+ assertEquals("2001-09-09T01:46:40Z", DateUtils.fromTimestamp(1000000000));
+ assertEquals("2038-01-19T03:14:07Z", DateUtils.fromTimestamp(Integer.MAX_VALUE));
+ }
+
+ /**
+ * Unit test of {@link DateUtils#formatTime} method.
+ */
+ @Test
+ public void testFormatTime() {
+ assertEquals("1:00 AM", DateUtils.formatTime(new Date(123), DateFormat.SHORT));
+ assertEquals("1:00:00 AM CET", DateUtils.formatTime(new Date(123), DateFormat.LONG));
+ }
+
+ /**
+ * Unit test of {@link DateUtils#formatDate} method.
+ */
+ @Test
+ public void testFormatDate() {
+ assertEquals("1/1/70", DateUtils.formatDate(new Date(123), DateFormat.SHORT));
+ assertEquals("January 1, 1970", DateUtils.formatDate(new Date(123), DateFormat.LONG));
+ }
+
+ /**
+ * Unit test of {@link DateUtils#tsFromString} method.
+ */
+ @Test
+ public void testTsFromString() {
+ // UTC times
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00Z"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03 15:00:00 UTC"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00+00"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00-00"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00+00:00"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00-00:00"));
+
+ // UTC times with millis
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00.000Z"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00.000"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00.000+00:00"));
+ assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00.000-00:00"));
+
+ // Local time
+ assertEquals(1459688400000L, DateUtils.tsFromString("03-APR-16 15:00:00"));
+ }
+
+ /**
+ * Unit test of {@link DateUtils#getDateFormat} method.
+ */
+ @Test
+ public void testGetDateFormat() {
+ Boolean iso = DateUtils.PROP_ISO_DATES.get();
+ try {
+ DateFormat f1 = DateUtils.getDateFormat(DateFormat.SHORT);
+ assertNotNull(f1);
+ DateUtils.PROP_ISO_DATES.put(!iso);
+ DateFormat f2 = DateUtils.getDateFormat(DateFormat.SHORT);
+ assertNotNull(f1);
+ assertNotEquals(f1, f2);
+ } finally {
+ DateUtils.PROP_ISO_DATES.put(iso);
+ }
+ }
+
+ /**
+ * Unit test of {@link DateUtils#getTimeFormat} method.
+ */
+ @Test
+ public void testTimeFormat() {
+ Boolean iso = DateUtils.PROP_ISO_DATES.get();
+ try {
+ DateFormat f1 = DateUtils.getTimeFormat(DateFormat.SHORT);
+ assertNotNull(f1);
+ DateUtils.PROP_ISO_DATES.put(!iso);
+ DateFormat f2 = DateUtils.getTimeFormat(DateFormat.SHORT);
+ assertNotNull(f1);
+ assertNotEquals(f1, f2);
+ } finally {
+ DateUtils.PROP_ISO_DATES.put(iso);
+ }
+ }
+
+ /**
+ * Unit test to reach 100% code coverage.
+ */
+ @Test
+ public void testCoverage() {
+ assertNotNull(new DateUtils());
+ }
}
--
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